diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index fbc3bf60cd..5633e89229 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -141,8 +141,8 @@ event_callback(void *data, ::Eo_Event const* event)
 {
    T wrapper(::eo_ref(event->obj));
    F *f = static_cast<F*>(data);
-   return _detail::really_call_event(wrapper, *f, *event->desc, event->event_info
-                                     , std::is_void<decltype((*f)(wrapper, *event->desc, event->event_info))>());
+   return _detail::really_call_event(wrapper, *f, *event->desc, event->info
+                                     , std::is_void<decltype((*f)(wrapper, *event->desc, event->info))>());
 }
 
 }
diff --git a/src/bindings/js/eo_js/eo_js_event.hh b/src/bindings/js/eo_js/eo_js_event.hh
index b589e5d6cc..3e1ff638c6 100644
--- a/src/bindings/js/eo_js/eo_js_event.hh
+++ b/src/bindings/js/eo_js/eo_js_event.hh
@@ -60,11 +60,11 @@ inline Eina_Bool event_callback(void* data, Eo_Event const* eo_event)
   v8::HandleScope handle_scope(isolate);
   event_callback_information* event = static_cast<event_callback_information*>(data);
   v8::Handle<v8::Value> a[] = {eina::js::compatibility_new<v8::External>(isolate, eo_event->obj)};
-  v8::Local<v8::Object> self = (event->event_info->constructor->handle())->NewInstance(1, a);
+  v8::Local<v8::Object> self = (event->info->constructor->handle())->NewInstance(1, a);
 
   v8::Local<v8::Value> call_args[] = {
     self,
-    get_event_info<T>(eo_event->event_info, isolate, event->event_info->class_name)
+    get_event_info<T>(eo_event->info, isolate, event->info->class_name)
   };
   event->function.handle()->Call(eina::js::compatibility_global(), 2, call_args);
   
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index e9a3739992..f2c5e87860 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -16,7 +16,7 @@ static unsigned int children_count = 0;
 static Eina_Bool
 _event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info;
+   Efl_Model_Load *actual_load = (Efl_Model_Load*)event->info;
    Eina_Array *properties_list;
    Eina_Array_Iterator iterator;
    Eina_Value const* property_value;
@@ -57,7 +57,7 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info;
+   Efl_Model_Load *actual_load = (Efl_Model_Load*)event->info;
    Eina_Accessor *accessor;
    Eo *child = NULL;
    unsigned int i;
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 2463e93bb3..3b4fe5a121 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -50,7 +50,7 @@ static Eina_Bool
 _list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Efl_Model_Test_Filemvc_Data *priv = data;
-   Eo *child = event->event_info;
+   Eo *child = event->info;
    ethumb_client_file_free(elm_thumb_ethumb_client_get());
 
    printf("LIST selected model\n");
@@ -62,7 +62,7 @@ static Eina_Bool
 _tree_selected_cb(void *data, const Eo_Event *event)
 {
    Efl_Model_Test_Filemvc_Data *priv = data;
-   Eo *child = event->event_info;
+   Eo *child = event->info;
    const Eina_Value *vpath;
    Eo *model;
    char *path;
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 4497308b52..5d0034b098 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -84,12 +84,12 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
    Eina_List *meshes = NULL, *l;
    Evas_Canvas3D_Mesh *m;
    Evas_Canvas3D_Node *billboard = NULL;
-   meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->event_info);
+   meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
    EINA_LIST_FOREACH(meshes, l, m)
      {
         evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
      }
-   if (choosed_node != (Evas_Canvas3D_Node *)event->event_info)
+   if (choosed_node != (Evas_Canvas3D_Node *)event->info)
      {
         billboard = evas_canvas3d_node_billboard_target_get(choosed_node);
         if (!billboard)
@@ -100,7 +100,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
                   evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
                }
           }
-        choosed_node = (Evas_Canvas3D_Node *)event->event_info;
+        choosed_node = (Evas_Canvas3D_Node *)event->info;
      }
 
    return EINA_TRUE;
@@ -111,7 +111,7 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Eina_List *meshes = NULL, *l;
    Evas_Canvas3D_Mesh *m;
-   meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->event_info);
+   meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
    EINA_LIST_FOREACH(meshes, l, m)
      {
         evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 21f0193fea..507770fcf0 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -164,7 +164,7 @@ extern Ecore_Con_Socks *_ecore_con_proxy_global;
 static Eina_Bool
 _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Ecore_Con_Event_Url_Complete *e, *f = event->event_info;
+   Ecore_Con_Event_Url_Complete *e, *f = event->info;
 
    e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete));
    if (!e) return EO_CALLBACK_STOP;
@@ -181,7 +181,7 @@ static Eina_Bool
 _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Ecore_Con_Event_Url_Data *e;
-   Efl_Network_Event_Url_Data *f = event->event_info;
+   Efl_Network_Event_Url_Data *f = event->info;
 
    e = malloc(sizeof(Ecore_Con_Event_Url_Data) + sizeof(unsigned char) * f->size);
 
@@ -199,7 +199,7 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Ecore_Con_Event_Url_Progress *e, *f = event->event_info;
+   Ecore_Con_Event_Url_Progress *e, *f = event->info;
 
    e = malloc(sizeof(Ecore_Con_Event_Url_Progress));
    if (!e) return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index a4692ac1f3..2a54555a83 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3143,7 +3143,7 @@ _ecore_evas_animator_fallback(void *data)
 static Eina_Bool
 _check_animator_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->event_info;
+   const Eo_Callback_Array_Item *array = event->info;
    Ecore_Evas *ee = data;
    int i;
 
@@ -3179,7 +3179,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
 static Eina_Bool
 _check_animator_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->event_info;
+   const Eo_Callback_Array_Item *array = event->info;
    Ecore_Evas *ee = data;
    int i;
 
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index c0e08b5cd6..5533ffd558 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -7,7 +7,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
    Edje *ed;
    Edje_Real_Part *rp;
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
@@ -58,7 +58,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
    Edje *ed;
    Edje_Real_Part *rp;
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (rp)
@@ -79,7 +79,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
    Edje *ed;
    Edje_Real_Part *rp;
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (rp)
@@ -102,7 +102,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
    char buf[256];
    int ignored;
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
@@ -173,7 +173,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
    char buf[256];
    int ignored;
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
@@ -247,7 +247,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
    Edje_Real_Part *rp;
    int ignored;
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
@@ -356,7 +356,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
    Edje_Real_Part *rp;
    char buf[256];
 
-   ev = event->event_info;
+   ev = event->info;
    ed = data;
    rp = evas_object_data_get(event->obj, "real_part");
    if (rp)
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 65e82051b8..792017ea60 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -228,7 +228,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
         return EINA_TRUE;
      }
 
-   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->event_info);
+   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
 
    if (sd->count > 0)
      {
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 7f230654d1..79f5e26ae9 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -701,7 +701,7 @@ _populate(Evas_Object *obj,
 static Eina_Bool
 _on_list_expanded(void *data, const Eo_Event *event)
 {
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
    const char *path = elm_object_item_data_get(it);
 
    _populate(data, path, it, NULL);
@@ -712,7 +712,7 @@ _on_list_expanded(void *data, const Eo_Event *event)
 static Eina_Bool
 _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
 
    elm_genlist_item_subitems_clear(it);
 
@@ -722,7 +722,7 @@ _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
 
    elm_genlist_item_expanded_set(it, EINA_TRUE);
 
@@ -732,7 +732,7 @@ _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
 
    elm_genlist_item_expanded_set(it, EINA_FALSE);
 
@@ -784,7 +784,7 @@ static Eina_Bool
 _on_item_activated(void *data, const Eo_Event *event)
 {
    //This event_info could be a list or gengrid item
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
    const char *path;
    Eina_Bool is_dir;
 
@@ -840,7 +840,7 @@ static Eina_Bool
 _on_item_selected(void *data, const Eo_Event *event)
 {
    //This event_info could be a list or gengrid item
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
    const char *path;
    char *parent_path;
    Eina_Bool is_dir;
@@ -931,7 +931,7 @@ _on_item_unselected(void *data, const Eo_Event *event)
    char *path;
    const char *unselected_path;
    Eina_Strbuf *buf;
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
    Eina_Bool first = EINA_TRUE;
 
    ELM_FILESELECTOR_DATA_GET(data, sd);
@@ -1175,7 +1175,7 @@ _on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED)
 static Eina_Bool
 _anchor_clicked(void *data, const Eo_Event *event)
 {
-   Elm_Entry_Anchor_Info *info = event->event_info;
+   Elm_Entry_Anchor_Info *info = event->info;
    Evas_Object *fs = data;
    const char *p;
 
@@ -1200,7 +1200,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
 static Eina_Bool
 _files_key_down(void *data, const Eo_Event *event)
 {
-     Evas_Event_Key_Down *ev = event->event_info;
+     Evas_Event_Key_Down *ev = event->info;
      Evas_Object *par, *searchbar;
 
      par = data;
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 412aefdc69..75cee4d1d9 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -65,7 +65,7 @@ static Eina_Bool
 _selection_done(void *data, const Eo_Event *event)
 {
    Elm_Fileselector_Button_Data *sd = data;
-   const char *file = event->event_info;
+   const char *file = event->info;
    Evas_Object *del;
 
    if (file) eina_stringshare_replace(&sd->fsd.path, file);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 85bb72ea44..6296d35503 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -47,7 +47,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
   static Eina_Bool                                                               \
   _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED)                                          \
   {                                                                         \
-     eo_event_callback_call(data, event, ev->event_info);          \
+     eo_event_callback_call(data, event, ev->info);          \
                                                                       \
      return EINA_TRUE;                                                \
   }
@@ -67,7 +67,7 @@ SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED)
 static Eina_Bool
 _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
 {
-   const char *file = event->event_info;
+   const char *file = event->info;
    char *s;
 
    if (!file) return EINA_TRUE;
@@ -77,7 +77,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
    elm_object_text_set(sd->entry, s);
    free(s);
    eo_event_callback_call
-     (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->event_info);
+     (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
 
    return EINA_TRUE;
 }
@@ -92,7 +92,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
    file = elm_object_text_get(sd->entry);
    elm_fileselector_path_set(sd->button, file);
    eo_event_callback_call
-     (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->event_info);
+     (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 3709b9c260..14f9a42a92 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3801,7 +3801,7 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
 static Eina_Bool
 _state_changed_signal_send(void *data, const Eo_Event *event)
 {
-   Elm_Atspi_Event_State_Changed_Data *state_data = event->event_info;
+   Elm_Atspi_Event_State_Changed_Data *state_data = event->info;
    const char *type_desc;
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
 
@@ -3822,7 +3822,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
 static Eina_Bool
 _property_changed_signal_send(void *data, const Eo_Event *event)
 {
-   const char *property = event->event_info;
+   const char *property = event->info;
    char *atspi_desc;
    enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST;
 
@@ -3887,7 +3887,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event)
 static Eina_Bool
 _active_descendant_changed_signal_send(void *data, const Eo_Event *event)
 {
-   Eo *child = event->event_info;
+   Eo *child = event->info;
    int idx;
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
@@ -3907,7 +3907,7 @@ static Eina_Bool
 _children_changed_signal_send(void *data, const Eo_Event *event)
 {
    const char *atspi_desc = NULL;
-   Elm_Atspi_Event_Children_Changed_Data *ev_data = event->event_info;
+   Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info;
    int idx;
    enum _Atspi_Object_Child_Event_Type type;
 
@@ -4094,7 +4094,7 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
 static Eina_Bool
 _text_text_inserted_send(void *data, const Eo_Event *event)
 {
-   Elm_Atspi_Text_Change_Info *info = event->event_info;
+   Elm_Atspi_Text_Change_Info *info = event->info;
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
 
@@ -4110,7 +4110,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event)
 static Eina_Bool
 _text_text_removed_send(void *data, const Eo_Event *event)
 {
-   Elm_Atspi_Text_Change_Info *info = event->event_info;
+   Elm_Atspi_Text_Change_Info *info = event->info;
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
 
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 04231e1765..3bbf5c209a 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -32,7 +32,7 @@ static Eina_Bool
 _child_added_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
-   Evas_Object_Box_Option *opt = event->event_info;
+   Evas_Object_Box_Option *opt = event->info;
    eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
 
    return EINA_TRUE;
@@ -42,7 +42,7 @@ static Eina_Bool
 _child_removed_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
-   Evas_Object *child = event->event_info;
+   Evas_Object *child = event->info;
    eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
 
    return EINA_TRUE;
@@ -196,7 +196,7 @@ static Eina_Bool
 _transition_layout_child_added(void *data, const Eo_Event *event)
 {
    Transition_Animation_Data *tad;
-   Evas_Object_Box_Option *opt = event->event_info;
+   Evas_Object_Box_Option *opt = event->info;
    Elm_Box_Transition *layout_data = data;
 
    tad = calloc(1, sizeof(Transition_Animation_Data));
@@ -218,7 +218,7 @@ _transition_layout_child_removed(void *data, const Eo_Event *event)
 
    EINA_LIST_FOREACH(layout_data->objs, l, tad)
      {
-        if (tad->obj == event->event_info)
+        if (tad->obj == event->info)
           {
              free(eina_list_data_get(l));
              layout_data->objs = eina_list_remove_list(layout_data->objs, l);
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 856f59062b..41bd65ea0c 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -193,7 +193,7 @@ static Eina_Bool
 _colorclass_activate(void *data, const Eo_Event *event)
 {
    Colorclass_UI *cc = data;
-   Elm_Object_Item *it = event->event_info;
+   Elm_Object_Item *it = event->info;
    Edje_Color_Class *ecc;
    Colorclass *lcc;
    Eina_List *l;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 42279fa09d..a081fc45cc 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3870,7 +3870,7 @@ elm_entry_add(Evas_Object *parent)
 static Eina_Bool
 _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->event_info;
+   const Eo_Callback_Array_Item *event = ev->info;
 
    ELM_ENTRY_DATA_GET(ev->obj, sd);
    if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
@@ -3881,7 +3881,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 static Eina_Bool
 _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->event_info;
+   const Eo_Callback_Array_Item *event = ev->info;
 
    ELM_ENTRY_DATA_GET(ev->obj, sd);
    if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 80eeea7dad..9b1b3b038b 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -303,7 +303,7 @@ _elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd)
 static Eina_Bool
 _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->event_info;
+   const Eo_Callback_Array_Item *event = ev->info;
 
    ELM_GLVIEW_DATA_GET(ev->obj, sd);
 
diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c
index 4f5710af4a..ca8cd35285 100644
--- a/src/lib/elementary/elm_helper.c
+++ b/src/lib/elementary/elm_helper.c
@@ -41,7 +41,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator)
 EAPI Eina_Bool
 elm_validator_regexp_helper(void *data, const Eo_Event *event)
 {
-   Elm_Validate_Content *vc = event->event_info;
+   Elm_Validate_Content *vc = event->info;
    Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data;
 
    validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 1e9d1a225e..75853fa348 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -346,7 +346,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
    Eo_Event ev;
    ev.obj = accessible;
    ev.desc = event;
-   ev.event_info = event_info;
+   ev.info = event_info;
    EINA_LIST_FOREACH(global_callbacks, l, hdl)
      {
         if (hdl->cb)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index ee31bcc2d6..652f9b86d2 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -425,7 +425,7 @@ _menu_hide(void *data,
 static Eina_Bool
 _hover_dismissed_cb(void *data, const Eo_Event *event)
 {
-   _menu_hide(data, event->obj, event->event_info);
+   _menu_hide(data, event->obj, event->info);
    eo_event_callback_call
      (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
    eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index b621476eb0..bca36b0b67 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -889,7 +889,7 @@ _text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 static Eina_Bool
 _inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event)
 {
-   Evas_Event_Mouse_Move *ev = event->event_info;
+   Evas_Event_Mouse_Move *ev = event->info;
    ELM_SPINNER_DATA_GET(data, sd);
 
    if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer)
diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c
index 422718dba3..a953f910c5 100644
--- a/src/lib/elementary/elm_store.c
+++ b/src/lib/elementary/elm_store.c
@@ -227,7 +227,7 @@ static Eina_Bool
 _store_genlist_item_realized(void *data, const Eo_Event *event)
 {
    Elm_Store *st = data;
-   Elm_Object_Item *gli = event->event_info;
+   Elm_Object_Item *gli = event->info;
    Elm_Store_Item *sti = elm_object_item_data_get(gli);
    if (!sti) return EINA_TRUE;
    st->realized_count++;
@@ -241,7 +241,7 @@ static Eina_Bool
 _store_genlist_item_unrealized(void *data, const Eo_Event *event)
 {
    Elm_Store *st = data;
-   Elm_Object_Item *gli = event->event_info;
+   Elm_Object_Item *gli = event->info;
    Elm_Store_Item *sti = elm_object_item_data_get(gli);
    if (!sti) return EINA_TRUE;
    st->realized_count--;
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 26c437e887..64023eb556 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -41,7 +41,7 @@ struct _Elm_View_Form_Data
 static Eina_Bool
 _efl_model_properties_change_cb(void *data, const Eo_Event *event)
 {
-   const Efl_Model_Property_Event *evt = event->event_info;
+   const Efl_Model_Property_Event *evt = event->info;
    const Eina_Value *value;
    const char *prop;
    unsigned int i;
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index dc03f2bd22..5a343763ee 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -160,7 +160,7 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
 static Eina_Bool
 _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Object_Item *item = event->event_info;
+   Elm_Object_Item *item = event->info;
    View_List_ItemData *idata = elm_object_item_data_get(item);
    Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR;
 
@@ -183,7 +183,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Object_Item *item = event->event_info;
+   Elm_Object_Item *item = event->info;
    View_List_ItemData *idata = elm_object_item_data_get(item);
 
    eo_event_callback_array_del(idata->model, model_callbacks(), idata);
@@ -194,7 +194,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Object_Item *glit = event->event_info;
+   Elm_Object_Item *glit = event->info;
    elm_genlist_item_subitems_clear(glit);
    return EINA_TRUE;
 }
@@ -218,7 +218,7 @@ static Eina_Bool
 _efl_model_properties_change_cb(void *data, const Eo_Event *event)
 {
    View_List_ItemData *idata = data;
-   Efl_Model_Property_Event *evt = event->event_info;
+   Efl_Model_Property_Event *evt = event->info;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE);
@@ -285,7 +285,7 @@ static Eina_Bool
 _efl_model_load_status_change_cb(void *data, const Eo_Event *event)
 {
    View_List_ItemData *idata = data;
-   Efl_Model_Load *load = event->event_info;
+   Efl_Model_Load *load = event->info;
 
    if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED)
      {
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index e165af9178..1746844434 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -706,26 +706,26 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
 
    if (event->desc == EVAS_OBJECT_EVENT_KEY_DOWN)
      {
-        Evas_Event_Key_Down *ev = event->event_info;
+        Evas_Event_Key_Down *ev = event->info;
         event_flags = &(ev->event_flags);
         type = EVAS_CALLBACK_KEY_DOWN;
      }
    else if (event->desc == EVAS_OBJECT_EVENT_KEY_UP)
      {
-        Evas_Event_Key_Up *ev = event->event_info;
+        Evas_Event_Key_Up *ev = event->info;
         event_flags = &(ev->event_flags);
         type = EVAS_CALLBACK_KEY_UP;
      }
    else if (event->desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL)
      {
-        Evas_Event_Mouse_Wheel *ev = event->event_info;
+        Evas_Event_Mouse_Wheel *ev = event->info;
         event_flags = &(ev->event_flags);
         type = EVAS_CALLBACK_MOUSE_WHEEL;
      }
    else
      return EO_CALLBACK_CONTINUE;
 
-   elm_widget_event_propagate(obj, type, event->event_info, event_flags);
+   elm_widget_event_propagate(obj, type, event->info, event_flags);
 
    return EO_CALLBACK_CONTINUE;
 }
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index d592bdefed..4e93495f6c 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -11,7 +11,7 @@ struct Eo.Event {
      [[Parameter passed in event callbacks holding extra event parameters]]
      obj: Eo.Base *; [[The object the event was called on.]]
      desc: const(Eo.Event_Description) *; [[The event description.]]
-     event_info: void *; [[Extra event information passed by the event caller.]]
+     info: void *; [[Extra event information passed by the event caller.]]
 }
 
 type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype.
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 0740b39163..776e92a542 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -675,7 +675,7 @@ _eo_base_event_callback_call(Eo *obj_id, Eo_Base_Data *pd,
    Eo_Event ev;
    ev.obj = obj_id;
    ev.desc = desc;
-   ev.event_info = event_info;
+   ev.info = event_info;
 
    pd->walking_list++;
 
@@ -734,7 +734,7 @@ _eo_event_forwarder_callback(void *data, const Eo_Event *event)
    Eo *new_obj = (Eo *) data;
    Eina_Bool ret = EINA_FALSE;
 
-   ret = eo_event_callback_call(new_obj, event->desc, event->event_info);
+   ret = eo_event_callback_call(new_obj, event->desc, event->info);
 
    return ret;
 }
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index db08309982..e334d1f382 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -62,7 +62,7 @@ static Eina_Bool
 _eo_evas_object_cb(void *data, const Eo_Event *event)
 {
    _eo_evas_object_cb_info *info = data;
-   if (info->func) info->func(info->data, evas_object_evas_get(event->obj), event->obj, event->event_info);
+   if (info->func) info->func(info->data, evas_object_evas_get(event->obj), event->obj, event->info);
    return EINA_TRUE;
 }
 
@@ -78,7 +78,7 @@ static Eina_Bool
 _eo_evas_cb(void *data, const Eo_Event *event)
 {
    _eo_evas_cb_info *info = data;
-   if (info->func) info->func(info->data, event->obj, event->event_info);
+   if (info->func) info->func(info->data, event->obj, event->info);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index ec7633d812..4f3bda9601 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -59,7 +59,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
    const Eo_Event_Description *eo_desc = NULL;
    Eina_Bool ret = EINA_FALSE;
 
-   target_node = (Evas_Canvas3D_Node *)event->event_info;
+   target_node = (Evas_Canvas3D_Node *)event->info;
    pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
    collision_list = (Eina_List *)data;
    eo_desc = eo_base_legacy_only_event_description_get("collision");
@@ -81,7 +81,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Ev
 {
    Eina_Bool ret = EINA_FALSE;
    const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked");
-   ret = eo_event_callback_call((Eo *)event->event_info, eo_desc, event->event_info);
+   ret = eo_event_callback_call((Eo *)event->info, eo_desc, event->info);
 
    return ret;
 }
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index c423567c43..8085f41856 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -87,7 +87,7 @@ _animator_repeater(void *data, const Eo_Event *event)
 {
    Evas_Object_Protected_Data *obj = data;
 
-   eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info);
+   eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->info);
    DBG("Emitting animator tick on %p.", obj->object);
 
    return EO_CALLBACK_CONTINUE;
@@ -96,7 +96,7 @@ _animator_repeater(void *data, const Eo_Event *event)
 static Eina_Bool
 _check_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->event_info;
+   const Eo_Callback_Array_Item *array = event->info;
    Evas_Object_Protected_Data *obj = data;
    int i;
 
@@ -122,7 +122,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
 static Eina_Bool
 _check_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->event_info;
+   const Eo_Callback_Array_Item *array = event->info;
    Evas_Object_Protected_Data *obj = data;
    int i;
 
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 461338d5c0..752f349389 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -64,7 +64,7 @@ static Eina_Bool
 _eo_evas_smart_cb(void *data, const Eo_Event *event)
 {
    _eo_evas_smart_cb_info *info = data;
-   if (info->func) info->func(info->data, event->obj, event->event_info);
+   if (info->func) info->func(info->data, event->obj, event->info);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index c5eff086be..10aa752bee 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -27,7 +27,7 @@ _efl_vg_base_property_changed(void *data, const Eo_Event *event)
    pd->changed = EINA_TRUE;
 
    parent = eo_parent_get(event->obj);
-   eo_event_callback_call(parent, event->desc, event->event_info);
+   eo_event_callback_call(parent, event->desc, event->info);
    return EINA_TRUE;
 }
 
diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 198f095a28..2301807f06 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -93,7 +93,7 @@ _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event)
    struct tm curr_time;
    const char *fmt;
 
-   disk_data = (DiskItem_Data *)elm_object_item_data_get(event->event_info);
+   disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info);
    if (!disk_data || !(disk_data->ctx_mod)) return EINA_FALSE;
 
    elm_datetime_value_get(disk_data->ctx_mod->mod_data.base, &curr_time);
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index dc89c6f14a..c4b3686ae8 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -61,7 +61,7 @@ static Eina_Bool
 static Eina_Bool
 _load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Model_Load *st = event->event_info;
+   Efl_Model_Load *st = event->info;
    printf("Load CHANGE\n");
 
    if (st->status & EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN)
@@ -113,7 +113,7 @@ _load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _properties_change_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   const Efl_Model_Property_Event *evt = (Efl_Model_Property_Event *)event->event_info;
+   const Efl_Model_Property_Event *evt = (Efl_Model_Property_Event *)event->info;
    const char *prop;
    Eina_Array_Iterator it;
    unsigned int i;
@@ -137,7 +137,7 @@ _properties_change_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _children_count_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   unsigned int *len = (unsigned int *)event->event_info;
+   unsigned int *len = (unsigned int *)event->info;
    unsigned int total;
 
    fprintf(stdout, "Children count number=%d\n", *len);
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index dd92ef0a51..47b1509c8d 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -21,7 +21,7 @@ const char* tmpdir = NULL;
 static Eina_Bool
 _load_monitor_status_cb(void *data, const Eo_Event *event)
 {
-  Efl_Model_Load* st = event->event_info;
+  Efl_Model_Load* st = event->info;
   Eo* parent = data;
   const Eina_Value* value_prop = NULL;
   const char* str = NULL;
@@ -51,7 +51,7 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
   if(children_added)
     {
-       Efl_Model_Children_Event* evt = event->event_info;
+       Efl_Model_Children_Event* evt = event->info;
 
        Eina_Bool b;
        b = efl_model_load_status_get(evt->child);
@@ -75,7 +75,7 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _children_added_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-  Efl_Model_Children_Event* evt = event->event_info;
+  Efl_Model_Children_Event* evt = event->info;
   if (evt == NULL)
     return EINA_TRUE;
 
@@ -88,7 +88,7 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 _children_count_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   unsigned int *len = event->event_info;
+   unsigned int *len = event->info;
    Eina_Accessor *accessor;
    Efl_Model_Load_Status status;
    Eo *child;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index b89f1e9ac9..8dc5e15448 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -34,7 +34,7 @@ _event_load_status_quit_cb(void *data, const Eo_Event *event)
 {
    printf("_event_load_status_quit_cb\n");
    Efl_Model_Load_Status expected_status = (Efl_Model_Load_Status)data;
-   Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info;
+   Efl_Model_Load *actual_load = (Efl_Model_Load*)event->info;
 
    if (expected_status == actual_load->status)
      {
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index 614fda9cc2..c56ee4636d 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -86,7 +86,7 @@ _children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
    if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
      return EINA_TRUE;
 
-   ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->event_info;
+   ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
    current = event->obj;
    counter++;
 
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index f88e045836..8a8aad5659 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -134,7 +134,7 @@ broadcast_event(Emotion_Event ev)
 static Eina_Bool
 bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Evas_Event_Key_Down *ev = event->event_info;
+   Evas_Event_Key_Down *ev = event->info;
    Eina_List *l;
    Evas_Object *o;
 
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 6f9e914415..b32d5f995f 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -15,7 +15,7 @@ static int cb_called = EINA_FALSE;
 static Eina_Bool
 _a_changed_cb(void *data, const Eo_Event *event)
 {
-   int new_a = *((int *) event->event_info);
+   int new_a = *((int *) event->info);
    printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data);
 
    cb_called = EINA_TRUE;
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 5d40331b03..453eb1ab97 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -18,7 +18,7 @@ _null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 static Eina_Bool
 _a_changed_cb(void *data, const Eo_Event *event)
 {
-   int new_a = *((int *) event->event_info);
+   int new_a = *((int *) event->info);
    printf("%s event_info:'%d' data:'%d'\n", __func__, new_a, (int) (intptr_t) data);
 
    cb_count++;
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 458b95c008..b56a87b89f 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -30,7 +30,7 @@ Eina_Bool
 _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
-   const Eo_Callback_Array_Item *callback_array = event->event_info;
+   const Eo_Callback_Array_Item *callback_array = event->info;
 
    if (callback_array->desc != EV_A_CHANGED)
       return EINA_TRUE;
@@ -45,7 +45,7 @@ Eina_Bool
 _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
-   const Eo_Callback_Array_Item *callback_array = event->event_info;
+   const Eo_Callback_Array_Item *callback_array = event->info;
 
    if (callback_array->desc != EV_A_CHANGED)
       return EINA_TRUE;
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 0a9b74c7d5..fcaa115e99 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -82,7 +82,7 @@ _eo_signals_eo_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED
 Eina_Bool
 _eo_signals_cb_added_deled(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *callback_array = event->event_info;
+   const Eo_Callback_Array_Item *callback_array = event->info;
 
    fail_if((callback_array != data) &&
          (callback_array->func != _eo_signals_cb_added_deled));
diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c
index a6e7ce1ebd..76b9f9db67 100644
--- a/src/tests/eolian_cxx/callback.c
+++ b/src/tests/eolian_cxx/callback.c
@@ -19,7 +19,7 @@ typedef struct _Callback_Data Callback_Data;
 
 static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event const* event)
 {
-  Callback_Data* pd = event->event_info;
+  Callback_Data* pd = event->info;
   ++pd->callbacks;
   eo_event_callback_call(event->obj, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks);
   return EINA_TRUE;