diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index 346a3b6d4f..e5d97c2caf 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/test_anim.c
@@ -19,18 +19,18 @@ _anim_tick(void *data EINA_UNUSED, const Eo_Event *event)
    double lx, ly;
    unsigned int i;
 
-   evas_output_viewport_get(evas_object_evas_get(event->obj), 0, 0, &vw, &vh);
+   evas_output_viewport_get(evas_object_evas_get(event->object), 0, 0, &vw, &vh);
    r = 48;
    t = ecore_loop_time_get();
    fac = 2.0 / (double)((sizeof(names) / sizeof(char *) / 2));
-   evas_pointer_canvas_xy_get(evas_object_evas_get(event->obj), &x, &y);
+   evas_pointer_canvas_xy_get(evas_object_evas_get(event->object), &x, &y);
    lx = x;
    ly = y;
 
    for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
      {
-        bub = evas_object_data_get(event->obj, names[i * 2]);
-        sh = evas_object_data_get(event->obj, names[(i * 2) + 1]);
+        bub = evas_object_data_get(event->object, names[i * 2]);
+        sh = evas_object_data_get(event->object, names[(i * 2) + 1]);
         zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2;
         xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2;
         yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2;
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index f06fdba238..e0c1f0ae32 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -45,7 +45,7 @@ _close_cb(void *data, const Eo_Event *event)
    App_View_Context *ctx = data;
    if (ctx->win)
      evas_object_del(ctx->win);
-   eo_unref(event->obj);
+   eo_unref(event->object);
    return EINA_TRUE;
 }
 
@@ -66,7 +66,7 @@ _resume_cb(void *data, const Eo_Event *event)
    if (!ctx->win)
      {
         _window_create(ctx);
-        elm_app_server_view_window_set(event->obj, ctx->win);
+        elm_app_server_view_window_set(event->object, ctx->win);
      }
 
    _text_update(ctx, "alive");
@@ -80,7 +80,7 @@ _view_del_cb(void *data, const Eo_Event *event)
 
    if (ctx->win)
      evas_object_del(ctx->win);
-   elm_app_server_view_window_set(event->obj, NULL);
+   elm_app_server_view_window_set(event->object, NULL);
    eina_stringshare_del(ctx->view_name);
    free(ctx);
    return EINA_TRUE;
@@ -126,11 +126,11 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
    const char *title = NULL;
 
    printf("terminate cb\n");
-   elm_app_server_save(event->obj);
-   title = elm_app_server_title_get(event->obj);
+   elm_app_server_save(event->object);
+   title = elm_app_server_title_get(event->object);
 
    printf("Closing: %s\n", title);
-   eo_unref(event->obj);
+   eo_unref(event->object);
    return EINA_TRUE;
 }
 
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 0ca4e66e7a..c295cc3fb5 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -361,9 +361,9 @@ _end_hide_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
 static Eina_Bool
 _context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   elm_entry_context_menu_clear(event->obj);
-   elm_entry_context_menu_item_add(event->obj, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL);
-   elm_entry_context_menu_item_add(event->obj, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL);
+   elm_entry_context_menu_clear(event->object);
+   elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL);
+   elm_entry_context_menu_item_add(event->object, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL);
    return EO_CALLBACK_CONTINUE;
 }
 
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index 0440a74947..803ced8e51 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -38,7 +38,7 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN;
 
-   state = elm_app_client_view_state_get(event->obj);
+   state = elm_app_client_view_state_get(event->object);
 
    if (state == ELM_APP_VIEW_STATE_CLOSED)
      {
@@ -47,7 +47,7 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
         evas_object_del(props);
      }
    else
-     _app_view_clicked(event->obj, NULL, NULL);
+     _app_view_clicked(event->object, NULL, NULL);
 
    return EINA_TRUE;
 }
@@ -273,8 +273,8 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
 static Eina_Bool
 _view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   if (app_selected == event->obj)
-     _app_clicked(event->obj, NULL, NULL);
+   if (app_selected == event->object)
+     _app_clicked(event->object, NULL, NULL);
    return EINA_TRUE;
 }
 
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index 6948a5c561..be7f3b17ca 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -21,7 +21,7 @@ typedef enum {
 static Eina_Bool
 weights_cb(void *data, const Eo_Event *event)
 {
-   Weight_Mode mode = elm_radio_state_value_get(event->obj);
+   Weight_Mode mode = elm_radio_state_value_get(event->object);
 
    switch (mode)
      {
@@ -65,7 +65,7 @@ weights_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    evas_object_size_hint_request_set(objects[3], val, val);
    return EO_CALLBACK_CONTINUE;
 }
@@ -73,7 +73,7 @@ request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 padding_slider_cb(void *data, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    efl_pack_padding_set(data, val, val, EINA_TRUE);
    return EO_CALLBACK_CONTINUE;
 }
@@ -81,7 +81,7 @@ padding_slider_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 margin_slider_cb(void *data, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    evas_object_size_hint_padding_set(data, val, val, val, val);
    return EO_CALLBACK_CONTINUE;
 }
@@ -90,7 +90,7 @@ static Eina_Bool
 alignh_slider_cb(void *data, const Eo_Event *event)
 {
    double av, val;
-   val = elm_slider_value_get(event->obj);
+   val = elm_slider_value_get(event->object);
    efl_pack_align_get(data, NULL, &av);
    efl_pack_align_set(data, val, av);
    return EO_CALLBACK_CONTINUE;
@@ -100,7 +100,7 @@ static Eina_Bool
 alignv_slider_cb(void *data, const Eo_Event *event)
 {
    double ah, val;
-   val = elm_slider_value_get(event->obj);
+   val = elm_slider_value_get(event->object);
    efl_pack_align_get(data, &ah, NULL);
    efl_pack_align_set(data, ah, val);
    return EO_CALLBACK_CONTINUE;
@@ -112,7 +112,7 @@ static Eina_Bool flow = EINA_FALSE;
 static Eina_Bool
 flow_check_cb(void *data, const Eo_Event *event)
 {
-   flow = elm_check_selected_get(event->obj);
+   flow = elm_check_selected_get(event->object);
    efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
    return EO_CALLBACK_CONTINUE;
 }
@@ -120,7 +120,7 @@ flow_check_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 horiz_check_cb(void *data, const Eo_Event *event)
 {
-   Eina_Bool chk = elm_check_selected_get(event->obj);
+   Eina_Bool chk = elm_check_selected_get(event->object);
    efl_pack_direction_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL);
    return EO_CALLBACK_CONTINUE;
 }
@@ -128,7 +128,7 @@ horiz_check_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 homo_check_cb(void *data, const Eo_Event *event)
 {
-   Eina_Bool chk = elm_check_selected_get(event->obj);
+   Eina_Bool chk = elm_check_selected_get(event->object);
    s_flow_params.homogenous = chk;
    efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
    return EO_CALLBACK_CONTINUE;
@@ -137,7 +137,7 @@ homo_check_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 max_size_check_cb(void *data, const Eo_Event *event)
 {
-   Eina_Bool chk = elm_check_selected_get(event->obj);
+   Eina_Bool chk = elm_check_selected_get(event->object);
    s_flow_params.max_size = chk;
    efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
    return EO_CALLBACK_CONTINUE;
@@ -146,7 +146,7 @@ max_size_check_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 left_check_cb(void *data, const Eo_Event *event)
 {
-   Eina_Bool chk = elm_check_selected_get(event->obj);
+   Eina_Bool chk = elm_check_selected_get(event->object);
    if (chk)
      {
         efl_pack_align_set(data, 0, 0.5);
@@ -200,7 +200,7 @@ EO_DEFINE_CLASS(_test_ui_box_custom_engine_class_get, &custom_engine_class_desc,
 static Eina_Bool
 custom_check_cb(void *data, const Eo_Event *event)
 {
-   Eina_Bool chk = elm_check_selected_get(event->obj);
+   Eina_Bool chk = elm_check_selected_get(event->object);
    efl_pack_layout_engine_set(data, chk ? _test_ui_box_custom_engine_class_get() : NULL, NULL);
    return EO_CALLBACK_CONTINUE;
 }
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 95359d057b..5b5166c74b 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -35,7 +35,7 @@ EO_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc
 static Eina_Bool
 weights_cb(void *data, const Eo_Event *event)
 {
-   Weight_Mode mode = elm_radio_state_value_get(event->obj);
+   Weight_Mode mode = elm_radio_state_value_get(event->object);
    Eo *grid = data;
 
    if (mode != CUSTOM)
@@ -82,7 +82,7 @@ weights_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    for (int i = 0; i < 6; i++)
      evas_object_size_hint_request_set(objects[i], val, 0);
    return EO_CALLBACK_CONTINUE;
@@ -91,7 +91,7 @@ request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
 padding_slider_cb(void *data, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    efl_pack_padding_set(data, val, val, EINA_TRUE);
    return EO_CALLBACK_CONTINUE;
 }
@@ -99,7 +99,7 @@ padding_slider_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 margin_slider_cb(void *data, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    evas_object_size_hint_padding_set(data, val, val, val, val);
    return EO_CALLBACK_CONTINUE;
 }
@@ -107,7 +107,7 @@ margin_slider_cb(void *data, const Eo_Event *event)
 static Eina_Bool
 btnmargins_slider_cb(void *data, const Eo_Event *event)
 {
-   int val = elm_slider_value_get(event->obj);
+   int val = elm_slider_value_get(event->object);
    for (int i = 1; i < 7; i++)
      evas_object_size_hint_padding_set(data, val, val, val, val);
    return EO_CALLBACK_CONTINUE;
@@ -120,8 +120,8 @@ layout_updated_cb(void *data, const Eo_Event *event)
    char buf[64];
    int rows, cols, count;
 
-   efl_pack_grid_size_get(event->obj, &cols, &rows);
-   count = efl_content_count(event->obj);
+   efl_pack_grid_size_get(event->object, &cols, &rows);
+   count = efl_content_count(event->object);
    sprintf(buf, "%d items (%dx%d)", count, cols, rows);
    elm_object_text_set(o, buf);
 
@@ -136,7 +136,7 @@ child_evt_cb(void *data, const Eo_Event *event)
    int col, row, colspan, rowspan;
    char buf[64];
 
-   efl_pack_grid_position_get(event->obj, it, &col, &row, &colspan, &rowspan);
+   efl_pack_grid_position_get(event->object, it, &col, &row, &colspan, &rowspan);
    if (event->desc == EFL_CONTAINER_EVENT_CONTENT_ADDED)
      sprintf(buf, "pack %d,%d %dx%d", col, row, colspan, rowspan);
    else
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 5c627074b1..23052a7c1b 100644
--- a/src/bin/elementary/test_win_plug.c
+++ b/src/bin/elementary/test_win_plug.c
@@ -146,7 +146,7 @@ create_handles(Evas_Object *obj)
 static Eina_Bool
 _notify_end(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   eo_unref(event->obj);
+   eo_unref(event->object);
    return EINA_FALSE;
 }
 
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index 5633e89229..320bfc9cba 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -139,7 +139,7 @@ template <typename T, typename F>
 Eina_Bool
 event_callback(void *data, ::Eo_Event const* event)
 {
-   T wrapper(::eo_ref(event->obj));
+   T wrapper(::eo_ref(event->object));
    F *f = static_cast<F*>(data);
    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 3e1ff638c6..9d9219df85 100644
--- a/src/bindings/js/eo_js/eo_js_event.hh
+++ b/src/bindings/js/eo_js/eo_js_event.hh
@@ -59,7 +59,7 @@ inline Eina_Bool event_callback(void* data, Eo_Event const* eo_event)
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   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::Handle<v8::Value> a[] = {eina::js::compatibility_new<v8::External>(isolate, eo_event->object)};
   v8::Local<v8::Object> self = (event->info->constructor->handle())->NewInstance(1, a);
 
   v8::Local<v8::Value> call_args[] = {
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 9beb4e3b94..1453dc2f7b 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -196,12 +196,12 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
   const char *name;
   Eina_Bool ret;
 
-  ecore_audio_obj_name_get(event->obj, &name);
+  ecore_audio_obj_name_get(event->object, &name);
   printf("Done: %s\n", name);
 
-  inputs = eina_list_remove(inputs, event->obj);
-  ret = ecore_audio_obj_out_input_detach(out, event->obj);
-  eo_unref(event->obj);
+  inputs = eina_list_remove(inputs, event->object);
+  ret = ecore_audio_obj_out_input_detach(out, event->object);
+  eo_unref(event->object);
 
   if (!ret)
     printf("Could not detach input %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 2296be2e09..7041451430 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -20,11 +20,11 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
   const char *name;
   Eo *out;
 
-  ecore_audio_obj_name_get(event->obj, &name);
+  ecore_audio_obj_name_get(event->object, &name);
   printf("Done: %s\n", name);
 
-  ecore_audio_obj_in_output_get(event->obj, &out);
-  eo_unref(event->obj);
+  ecore_audio_obj_in_output_get(event->object, &out);
+  eo_unref(event->object);
   eo_unref(out);
 
   ecore_main_loop_quit();
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index a1226eb94e..041fafeba5 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -172,7 +172,7 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
    legacy->inside_call = 1;
    if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) ||
        legacy->delete_me)
-     eo_unref(event->obj);
+     eo_unref(event->object);
 
    return EO_CALLBACK_CONTINUE;
 }
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 4e105ef485..50bd4c2b78 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -104,17 +104,17 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
         if (array[i].desc == EFL_LOOP_FD_EVENT_READ)
           {
              if (fd->references.read++ > 0) continue;
-             _efl_loop_fd_reset(event->obj, fd);
+             _efl_loop_fd_reset(event->object, fd);
           }
         else if (array[i].desc == EFL_LOOP_FD_EVENT_WRITE)
           {
              if (fd->references.write++ > 0) continue;
-             _efl_loop_fd_reset(event->obj, fd);
+             _efl_loop_fd_reset(event->object, fd);
           }
         if (array[i].desc == EFL_LOOP_FD_EVENT_ERROR)
           {
              if (fd->references.error++ > 0) continue;
-             _efl_loop_fd_reset(event->obj, fd);
+             _efl_loop_fd_reset(event->object, fd);
           }
      }
 
@@ -133,17 +133,17 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
         if (array[i].desc == EFL_LOOP_FD_EVENT_READ)
           {
              if (fd->references.read++ > 0) continue;
-             _efl_loop_fd_reset(event->obj, fd);
+             _efl_loop_fd_reset(event->object, fd);
           }
         else if (array[i].desc == EFL_LOOP_FD_EVENT_WRITE)
           {
              if (fd->references.write++ > 0) continue;
-             _efl_loop_fd_reset(event->obj, fd);
+             _efl_loop_fd_reset(event->object, fd);
           }
         if (array[i].desc == EFL_LOOP_FD_EVENT_ERROR)
           {
              if (fd->references.error++ > 0) continue;
-             _efl_loop_fd_reset(event->obj, fd);
+             _efl_loop_fd_reset(event->object, fd);
           }
      }
 
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 5a97d44c8a..9f2961e661 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -96,10 +96,10 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *e
   int samplerate = 0;
   double speed = 0;
 
-  samplerate = ecore_audio_obj_in_samplerate_get(event->obj);
-  speed = ecore_audio_obj_in_speed_get(event->obj);
+  samplerate = ecore_audio_obj_in_samplerate_get(event->object);
+  speed = ecore_audio_obj_in_speed_get(event->object);
 
-  stream = eo_key_data_get(event->obj, "pulse_data");
+  stream = eo_key_data_get(event->object, "pulse_data");
 
   pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
 
@@ -151,9 +151,9 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
 static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event)
 {
   Eo *in = data;
-  eo_event_callback_del(event->obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
+  eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
 
-  _input_attach_internal(event->obj, in);
+  _input_attach_internal(event->object, in);
 
   return EINA_TRUE;
 }
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index c6cb069e8a..72870af1fe 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -172,7 +172,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
    e->status = f->status;
    e->url_con = f->url_con;
    ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
-                   (Ecore_End_Cb)_ecore_con_event_url_free, event->obj);
+                   (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
 
    return EO_CALLBACK_STOP;
 }
@@ -191,7 +191,7 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
    e->size = f->size;
    memcpy(e->data, f->data, f->size);
    ecore_event_add(ECORE_CON_EVENT_URL_DATA, e,
-                   (Ecore_End_Cb)_ecore_con_event_url_free, event->obj);
+                   (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
 
    return EO_CALLBACK_CONTINUE;
 }
@@ -210,7 +210,7 @@ _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event
    e->up.total = f->up.total;
    e->up.now = f->up.now;
    ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e,
-                   (Ecore_End_Cb)_ecore_con_event_url_free, event->obj);
+                   (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
 
    return EO_CALLBACK_CONTINUE;
 }
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 1d243771da..bbb6e71b9a 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -9,7 +9,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
    if (ev->hold)
      _edje_emit(ed, "hold,on", rp->part->name);
@@ -26,7 +26,7 @@ _edje_focus_in_signal_cb(void *data, const Eo_Event *event)
    Edje_Real_Part *rp;
 
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if ((!rp) || (!ed))
      return EO_CALLBACK_CONTINUE;
 
@@ -42,7 +42,7 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event)
    Edje_Real_Part *rp;
 
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if ((!rp) || (!ed))
      return EO_CALLBACK_CONTINUE;
 
@@ -60,7 +60,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (rp)
      {
         if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -81,7 +81,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (rp)
      {
         if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -104,7 +104,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
 
    ignored = rp->part->ignore_flags & ev->event_flags;
@@ -175,7 +175,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
 
    ignored = rp->part->ignore_flags & ev->event_flags;
@@ -249,7 +249,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return EO_CALLBACK_CONTINUE;
    if (rp->part->dragable.event_id >= 0)
      {
@@ -270,7 +270,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
           {
              Evas_Coord x, y, w, h;
 
-             evas_object_geometry_get(event->obj, &x, &y, &w, &h);
+             evas_object_geometry_get(event->object, &x, &y, &w, &h);
              if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) ||
                  (ev->cur.canvas.x >= (x + w)) || (ev->cur.canvas.y >= (y + h)))
                {
@@ -287,7 +287,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
           {
              Evas_Coord x, y, w, h;
 
-             evas_object_geometry_get(event->obj, &x, &y, &w, &h);
+             evas_object_geometry_get(event->object, &x, &y, &w, &h);
              if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) &&
                  (ev->cur.canvas.x < (x + w)) && (ev->cur.canvas.y < (y + h)))
                {
@@ -358,7 +358,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
 
    ev = event->info;
    ed = data;
-   rp = evas_object_data_get(event->obj, "real_part");
+   rp = evas_object_data_get(event->object, "real_part");
    if (rp)
      {
         if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index d4d9090659..8020cd6c05 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -10,7 +10,7 @@ static Eina_Bool outfail = EINA_FALSE;
 static Eina_Bool
 _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   eo_unref(event->obj);
+   eo_unref(event->object);
 
    return EINA_TRUE;
 }
@@ -19,7 +19,7 @@ static Eina_Bool
 _out_fail(void *data EINA_UNUSED, const Eo_Event *event)
 {
    outfail = EINA_TRUE;
-   eo_unref(event->obj);
+   eo_unref(event->object);
    out = NULL;
    return EINA_TRUE;
 }
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index 8a4d752e85..bde316d249 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -53,8 +53,8 @@ _register_sort_cb(Efl_Vpath_Manager_Entry *e1, Efl_Vpath_Manager_Entry *e2)
 static Eina_Bool
 _cb_vpath_del(void *data, const Eo_Event *event)
 {
-   efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->obj);
-   eo_event_callback_del(event->obj, EO_EVENT_DEL, _cb_vpath_del, data);
+   efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object);
+   eo_event_callback_del(event->object, EO_EVENT_DEL, _cb_vpath_del, data);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 3c3c2a6a2b..ce25f17fb1 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -398,10 +398,10 @@ _subobj_del_cb(void *data, const Eo_Event *event)
    Efl_Ui_Grid *obj = data;
    Efl_Ui_Grid_Data *pd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
 
-   eo_event_callback_array_del(event->obj, subobj_callbacks(), data);
-   _item_remove(obj, pd, event->obj);
+   eo_event_callback_array_del(event->object, subobj_callbacks(), data);
+   _item_remove(obj, pd, event->object);
 
-   if (!elm_widget_sub_object_del(obj, event->obj))
+   if (!elm_widget_sub_object_del(obj, event->object))
      WRN("failed to remove child from its parent");
 
    return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index c347b1e1ae..d955fdc909 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -96,7 +96,7 @@ _on_hover_clicked(void *data, const Eo_Event *event)
 {
    const char *dismissstr;
 
-   dismissstr = elm_layout_data_get(event->obj, "dismiss");
+   dismissstr = elm_layout_data_get(event->object, "dismiss");
 
    if (!dismissstr || strcmp(dismissstr, "on"))
      elm_combobox_hover_end(data); // for backward compatibility
@@ -322,7 +322,7 @@ static Eina_Bool
 _mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    //Unset the multibuttonentry to contracted mode of single line
-   elm_multibuttonentry_expanded_set(event->obj, EINA_TRUE);
+   elm_multibuttonentry_expanded_set(event->object, EINA_TRUE);
    return EINA_TRUE;
 }
 
@@ -336,7 +336,7 @@ static Eina_Bool
 _mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    //Set the multibuttonentry to contracted mode of single line
-   elm_multibuttonentry_expanded_set(event->obj, EINA_FALSE);
+   elm_multibuttonentry_expanded_set(event->object, EINA_FALSE);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index a2d49ae1b5..00ecfb1fcc 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1058,7 +1058,7 @@ _on_text_activated(void *data, const Eo_Event *event)
 
    ELM_FILESELECTOR_DATA_GET(fs, sd);
 
-   path = elm_widget_part_text_get(event->obj, NULL);
+   path = elm_widget_part_text_get(event->object, NULL);
 
    if (!ecore_file_exists(path))
      {
@@ -1134,7 +1134,7 @@ _on_text_activated(void *data, const Eo_Event *event)
    free(dir);
 
 end:
-   elm_object_focus_set(event->obj, EINA_FALSE);
+   elm_object_focus_set(event->object, EINA_FALSE);
 
    return EINA_TRUE;
 }
@@ -1187,7 +1187,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
    eina_stringshare_del(p);
    /* After anchor was clicked, entry will be focused, and will be editable.
     * It's wrong. So remove focus. */
-   elm_object_focus_set(event->obj, EINA_FALSE);
+   elm_object_focus_set(event->object, EINA_FALSE);
 
    if (sd->path_entry_idler) {
        ecore_idler_del(sd->path_entry_idler);
@@ -1429,7 +1429,7 @@ _preedit_cb(void *data, const Eo_Event *event)
 {
    ELM_FILESELECTOR_DATA_GET(data, sd);
 
-   sd->search_string = elm_entry_entry_get(event->obj);
+   sd->search_string = elm_entry_entry_get(event->object);
 
    if (sd->search_string && sd->path)
      _populate(data, sd->path, NULL, NULL);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index d0f6e86f41..df041f321a 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -114,7 +114,7 @@ _on_hover_clicked(void *data, const Eo_Event *event)
 {
    const char *dismissstr;
 
-   dismissstr = elm_layout_data_get(event->obj, "dismiss");
+   dismissstr = elm_layout_data_get(event->object, "dismiss");
 
    if (!dismissstr || strcmp(dismissstr, "on"))
      elm_hoversel_hover_end(data); // for backward compatibility
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 2504f04998..c5865dc228 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -956,7 +956,7 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event)
       multiple times on some heavy environment. This callback del will
       prevent those scenario and guarantee only one clicked for it's own
       page. */
-   eo_event_callback_del(event->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data);
+   eo_event_callback_del(event->object, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data);
    elm_naviframe_item_pop(data);
 
    return EINA_TRUE;
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 1f481cb1e9..52284aa5ff 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -32,7 +32,7 @@ static Eina_Bool
 _view_del_cb(void *data, const Eo_Event *event)
 {
    Elm_App_Server_Data *cdata = data;
-   eina_hash_del(cdata->views, NULL, event->obj);
+   eina_hash_del(cdata->views, NULL, event->object);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index a99b53e8f8..b42a109ac1 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3815,7 +3815,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
 
    type_desc = elm_states_to_atspi_state[state_data->type].name;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL);
    return EINA_TRUE;
 }
@@ -3865,7 +3865,7 @@ _property_changed_signal_send(void *data, const Eo_Event *event)
         return EINA_FALSE;
      }
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL);
    return EINA_TRUE;
 }
@@ -3878,7 +3878,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED))
      return EINA_FALSE;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "",
                        0, 0, NULL, NULL);
 
@@ -3898,7 +3898,7 @@ _active_descendant_changed_signal_send(void *data, const Eo_Event *event)
 
    idx = elm_interface_atspi_accessible_index_in_parent_get(child);
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
                        idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child);
    return EINA_TRUE;
@@ -3933,7 +3933,7 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
 
    if (!atspi_desc) return EINA_FALSE;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
                        idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child);
 
@@ -3973,7 +3973,7 @@ _window_signal_send(void *data, const Eo_Event *event)
         return EINA_FALSE;
      }
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_WINDOW,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_WINDOW,
                        &_window_obj_signals[type], "", 0, 0, "i", 0);
    return EINA_TRUE;
 }
@@ -3986,7 +3986,7 @@ _selection_signal_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED))
      return EINA_FALSE;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0);
    return EINA_TRUE;
 }
@@ -4084,9 +4084,9 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
      return EINA_TRUE;
 
-   cursor_pos = elm_interface_atspi_text_caret_offset_get(event->obj);
+   cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object);
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
 
    return EINA_TRUE;
@@ -4102,7 +4102,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
      return EINA_TRUE;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content);
 
    return EINA_TRUE;
@@ -4118,7 +4118,7 @@ _text_text_removed_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
      return EINA_TRUE;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content);
 
    return EINA_TRUE;
@@ -4132,7 +4132,7 @@ _text_selection_changed_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED))
      return EINA_TRUE;
 
-   _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
+   _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL);
 
    return EINA_TRUE;
@@ -4170,7 +4170,7 @@ _on_object_add(void *data, const Eo_Event *event)
 
    sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED);
    iter = eldbus_message_iter_get(sig);
-   _cache_item_reference_append_cb(data, event->obj, iter);
+   _cache_item_reference_append_cb(data, event->object, iter);
 
    eldbus_service_signal_send(pd->cache_interface, sig);
 
@@ -4184,11 +4184,11 @@ _on_object_del(void *data, const Eo_Event *event)
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
 
-   _bridge_object_unregister(data, event->obj);
+   _bridge_object_unregister(data, event->object);
 
    sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_REMOVED);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig);
-   _bridge_iter_object_reference_append(data, iter, event->obj);
+   _bridge_iter_object_reference_append(data, iter, event->object);
    eldbus_service_signal_send(pd->cache_interface, sig);
 
    return EINA_TRUE;
@@ -4320,7 +4320,7 @@ _bridge_accessible_event_dispatch(void *data, const Eo_Event *event)
 {
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
 
-   _bridge_object_register(data, event->obj);
+   _bridge_object_register(data, event->object);
 
    Eo_Event_Cb cb = eina_hash_find(pd->event_hash, &event->desc);
    return cb ? cb(data, event) : EINA_TRUE;
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 6f626ab16e..42fe7e8841 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -1775,7 +1775,7 @@ static Eina_Bool
 _x11_win_rotation_changed_cb(void *data, const Eo_Event *event)
 {
    Evas_Object *win = data;
-   int rot = elm_win_rotation_get(event->obj);
+   int rot = elm_win_rotation_get(event->object);
    elm_win_rotation_set(win, rot);
    return EINA_TRUE;
 }
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index cb345e7794..12e8cda550 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -641,11 +641,11 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
    Evas_Object *parent;
    int i, v;
 
-   for (i = 0; i < 4 && sd->spinners[i] != event->obj; i++);
+   for (i = 0; i < 4 && sd->spinners[i] != event->object; i++);
 
-   parent = evas_object_data_get(event->obj, "parent");
-   v = elm_spinner_value_get(event->obj);
-   evas_object_data_set(event->obj, "_changed", event->obj);
+   parent = evas_object_data_get(event->object, "parent");
+   v = elm_spinner_value_get(event->object);
+   evas_object_data_set(event->object, "_changed", event->object);
 
    switch (i)
      {
@@ -662,7 +662,7 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
          _colors_set(parent, sd->r, sd->g, sd->b, v);
          break;
      }
-   evas_object_data_del(event->obj, "_changed");
+   evas_object_data_del(event->object, "_changed");
    eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 
    return EINA_TRUE;
@@ -701,7 +701,7 @@ _start_grab_pick_cb(void *data, const Eo_Event *event)
 
    ELM_COLORSELECTOR_DATA_GET(o, sd);
 
-   elm_object_disabled_set(event->obj, EINA_TRUE);
+   elm_object_disabled_set(event->object, EINA_TRUE);
 
    sd->grab.mouse_motion = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _mouse_grab_pixels, o);
    sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, o);
@@ -1018,7 +1018,7 @@ _button_clicked_cb(void *data, const Eo_Event *event)
    double x, y, step;
    ELM_COLORSELECTOR_DATA_GET(cb_data->parent, sd);
 
-   if (event->obj == cb_data->rbt) step = 1.0;
+   if (event->object == cb_data->rbt) step = 1.0;
    else step = -1.0;
 
    edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y);
@@ -1062,7 +1062,7 @@ _button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED)
    Color_Bar_Data *cb_data = data;
    double x, y, step;
 
-   if (event->obj == cb_data->rbt) step = 1.0 / BASE_STEP;
+   if (event->object == cb_data->rbt) step = 1.0 / BASE_STEP;
    else step = -1.0 / BASE_STEP;
 
    edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y);
@@ -2007,7 +2007,7 @@ _key_action_move(Evas_Object *obj, const char *params)
         else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
           {
              Eo_Event event = {};
-             event.obj = sd->cb_data[sd->sel_color_type]->lbt;
+             event.object = sd->cb_data[sd->sel_color_type]->lbt;
              _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
           }
         else return EINA_FALSE;
@@ -2021,7 +2021,7 @@ _key_action_move(Evas_Object *obj, const char *params)
         else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
           {
              Eo_Event event = {};
-             event.obj = sd->cb_data[sd->sel_color_type]->rbt;
+             event.object = sd->cb_data[sd->sel_color_type]->rbt;
              _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
           }
         else return EINA_FALSE;
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index d18ece899b..95516a3f7b 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -514,7 +514,7 @@ static Eina_Bool
 _on_indicator_mode_changed(void *data, const Eo_Event *event)
 {
    Evas_Object *conformant = data;
-   Evas_Object *win = event->obj;
+   Evas_Object *win = event->object;
 
    Elm_Win_Indicator_Mode indmode;
    Elm_Win_Indicator_Opacity_Mode ind_o_mode;
@@ -534,7 +534,7 @@ static Eina_Bool
 _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
 {
    int rot = 0;
-   Evas_Object *win = event->obj;
+   Evas_Object *win = event->object;
    Evas_Object *conformant = data;
    Evas_Object *old_indi = NULL;
 
@@ -1004,7 +1004,7 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    Eo_Event event = {};
-   event.obj = sd->win;
+   event.object = sd->win;
    sd->win = elm_widget_top_get(obj);
    _on_indicator_mode_changed(obj, &event);
    _on_rotation_changed(obj, &event);
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index d6b17b7c26..358d8006fa 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3920,7 +3920,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
    const Eo_Callback_Array_Item *event = ev->info;
 
-   ELM_ENTRY_DATA_GET(ev->obj, sd);
+   ELM_ENTRY_DATA_GET(ev->object, sd);
    if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
      sd->validators++;
    return EO_CALLBACK_CONTINUE;
@@ -3931,7 +3931,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 {
    const Eo_Callback_Array_Item *event = ev->info;
 
-   ELM_ENTRY_DATA_GET(ev->obj, sd);
+   ELM_ENTRY_DATA_GET(ev->object, sd);
    if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
      sd->validators--;
    return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 582fed50b4..a2cfb4039d 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -323,7 +323,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
    const Eo_Callback_Array_Item *event = ev->info;
 
-   ELM_GLVIEW_DATA_GET(ev->obj, sd);
+   ELM_GLVIEW_DATA_GET(ev->object, sd);
 
    if (event->desc == ELM_GLVIEW_EVENT_CREATED)
      {
@@ -331,7 +331,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
      }
    else if (event->desc == ELM_GLVIEW_EVENT_RENDER)
      {
-        _set_render_policy_callback(ev->obj);
+        _set_render_policy_callback(ev->object);
      }
 
    return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index bccb2d38ed..3e5133a2a2 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -344,7 +344,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
      }
 
    Eo_Event ev;
-   ev.obj = accessible;
+   ev.object = accessible;
    ev.desc = event;
    ev.info = event_info;
    EINA_LIST_FOREACH(global_callbacks, l, hdl)
@@ -426,7 +426,7 @@ _on_rel_obj_del(void *data, const Eo_Event *event)
      {
         EINA_LIST_FOREACH_SAFE(rel->objects, p, p2, rel_obj)
           {
-          if (rel_obj == event->obj)
+          if (rel_obj == event->object)
                rel->objects = eina_list_remove_list(rel->objects, p);
           }
         if (!rel->objects)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 49598dedb4..86ffd926c0 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -426,7 +426,7 @@ _menu_hide(void *data,
 static Eina_Bool
 _hover_dismissed_cb(void *data, const Eo_Event *event)
 {
-   _menu_hide(data, event->obj, event->info);
+   _menu_hide(data, event->object, 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_photocam.c b/src/lib/elementary/elm_photocam.c
index fda0298666..876d2f4b24 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -1953,7 +1953,7 @@ done:
      {
         // FIXME: If one day we do support partial animator in photocam, this would require change
         Eo_Event event = {};
-        event.obj = evas_object_evas_get(obj);
+        event.object = evas_object_evas_get(obj);
         if (!_zoom_anim_cb(obj, &event))
           {
              _elm_photocam_bounce_reset(obj, sd);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index bf44223a8e..ab187a1f9c 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -853,7 +853,7 @@ _inc_dec_button_pressed_cb(void *data, const Eo_Event *event)
 {
    ELM_SPINNER_DATA_GET(data, sd);
 
-   sd->inc_clicked = sd->inc_button == event->obj ? EINA_TRUE : EINA_FALSE;
+   sd->inc_clicked = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE;
 
    if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
 
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index ce97e8ecff..e9fc81cf98 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -243,7 +243,7 @@ _parents_unfocus(Evas_Object *obj)
 static Eina_Bool
 _on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   elm_widget_focus_hide_handle(event->obj);
+   elm_widget_focus_hide_handle(event->object);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -252,23 +252,23 @@ _on_sub_obj_del(void *data, const Eo_Event *event)
 {
    ELM_WIDGET_DATA_GET(data, sd);
 
-   if (_elm_widget_is(event->obj))
+   if (_elm_widget_is(event->object))
      {
-        if (_is_focused(event->obj)) _parents_unfocus(sd->obj);
+        if (_is_focused(event->object)) _parents_unfocus(sd->obj);
      }
-   if (event->obj == sd->resize_obj)
+   if (event->object == sd->resize_obj)
      {
         /* already dels sub object */
         elm_widget_resize_object_set(sd->obj, NULL, EINA_TRUE);
      }
-   else if (event->obj == sd->hover_obj)
+   else if (event->object == sd->hover_obj)
      {
         sd->hover_obj = NULL;
      }
    else
      {
-        if (!elm_widget_sub_object_del(sd->obj, event->obj))
-          ERR("failed to remove sub object %p from %p\n", event->obj, sd->obj);
+        if (!elm_widget_sub_object_del(sd->obj, event->object))
+          ERR("failed to remove sub object %p from %p\n", event->object, sd->obj);
      }
 
    return EO_CALLBACK_CONTINUE;
@@ -707,7 +707,7 @@ _propagate_y_drag_lock(Evas_Object *obj,
 static Eina_Bool
 _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Eo *obj = event->obj;
+   Eo *obj = event->object;
    INTERNAL_ENTRY EO_CALLBACK_CONTINUE;
    Evas_Callback_Type type;
    Evas_Event_Flags *event_flags = NULL;
@@ -4377,7 +4377,7 @@ static Eina_Bool
 _track_obj_view_update(void *data, const Eo_Event *event)
 {
    Elm_Widget_Item_Data *item = data;
-   _track_obj_update(item->track_obj, event->obj);
+   _track_obj_update(item->track_obj, event->object);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -4457,10 +4457,10 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
 static Eina_Bool
 _eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Elm_Widget_Item_Data *item = eo_data_scope_get(event->obj, ELM_WIDGET_ITEM_CLASS);
+   Elm_Widget_Item_Data *item = eo_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS);
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE);
    if (item->del_func)
-      item->del_func((void *) WIDGET_ITEM_DATA_GET(event->obj), item->widget, item->eo_obj);
+      item->del_func((void *) WIDGET_ITEM_DATA_GET(event->object), item->widget, item->eo_obj);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index c728186260..1b0d905168 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -10,7 +10,7 @@ struct Eo.Event.Description {
 
 struct Eo.Event {
      [[Parameter passed in event callbacks holding extra event parameters]]
-     obj: Eo.Base *; [[The object the event was called on.]]
+     object: Eo.Base *; [[The object the event was called on.]]
      desc: const(Eo.Event.Description) *; [[The event description.]]
      info: void *; [[Extra event information passed by the event caller.]]
 }
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index fe60cc0e21..47dade6bec 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -1036,7 +1036,7 @@ _eo_base_event_callback_call(Eo *obj_id, Eo_Base_Data *pd,
    Eo_Current_Callback_Description saved;
    Eo_Event ev;
 
-   ev.obj = obj_id;
+   ev.object = obj_id;
    ev.desc = desc;
    ev.info = event_info;
 
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index e334d1f382..87643195a0 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->info);
+   if (info->func) info->func(info->data, evas_object_evas_get(event->object), event->object, 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->info);
+   if (info->func) info->func(info->data, event->object, event->info);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index aae5f4ddf1..4374d0b3e0 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -486,7 +486,7 @@ _clipper_del_cb(void *data, const Eo_Event *event)
    if (!obj) return EO_CALLBACK_CONTINUE;
 
    _evas_object_clip_unset(eo_obj, obj);
-   if (obj->prev->clipper && (obj->prev->clipper->object == event->obj))
+   if (obj->prev->clipper && (obj->prev->clipper->object == event->object))
      {
         // not removing cb since it's the del cb... it can't be called again!
         EINA_COW_STATE_WRITE_BEGIN(obj, state_write, prev)
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 38216a719d..10bd95f4a2 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -125,7 +125,7 @@ _on_child_del(void *data, const Eo_Event *event)
    Evas_Object *box = data;
 
    Evas_Object *ret = NULL;
-   ret = evas_obj_box_internal_remove(box, event->obj);
+   ret = evas_obj_box_internal_remove(box, event->object);
    if (!ret)
      ERR("child removal failed");
    evas_object_smart_changed(box);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index d8e9574952..bc446f775a 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->info);
+   if (info->func) info->func(info->data, event->object, event->info);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 6966e22a5e..8f78f57368 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -247,7 +247,7 @@ static Eina_Bool
 _on_child_del(void *data, const Eo_Event *event)
 {
    Evas_Object *table = data;
-   evas_object_table_unpack(table, event->obj);
+   evas_object_table_unpack(table, event->object);
 
    return EO_CALLBACK_CONTINUE;
 }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 82bf141494..51ef647d87 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7402,7 +7402,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event)
 
    EINA_LIST_FOREACH(obj->obstacles, i, obs)
      {
-        if (event->obj == obs->eo_obs)
+        if (event->object == obs->eo_obs)
            break;
      }
    obj->obstacles = eina_list_remove_list(obj->obstacles, i);
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 5b843b0004..edc5f51ed7 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -26,7 +26,7 @@ _efl_vg_property_changed(void *data, const Eo_Event *event)
    if (pd->changed) return EINA_TRUE;
    pd->changed = EINA_TRUE;
 
-   parent = eo_parent_get(event->obj);
+   parent = eo_parent_get(event->object);
    eo_event_callback_call(parent, event->desc, event->info);
    return EINA_TRUE;
 }
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 9dc38d8674..4e163b79eb 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -36,7 +36,7 @@ static Eina_Bool
 _evas_vg_root_node_changed(void *data, const Eo_Event *event)
 {
    Efl_VG_Root_Node_Data *pd = data;
-   Efl_VG_Data *bd = eo_data_scope_get(event->obj, EFL_VG_CLASS);
+   Efl_VG_Data *bd = eo_data_scope_get(event->object, EFL_VG_CLASS);
 
    if (bd->changed) return EINA_TRUE;
    bd->changed = 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 b8fef85b14..caff642b52 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -38,7 +38,7 @@ _ctxpopup_dismissed_cb(void *data, const Eo_Event *event)
 {
    Ctxpopup_Module_Data *ctx_mod;
    ctx_mod = (Ctxpopup_Module_Data *)data;
-   evas_object_del(event->obj);
+   evas_object_del(event->object);
    ctx_mod->ctxpopup = NULL;
 
    return EINA_TRUE;
@@ -143,11 +143,11 @@ _field_clicked_cb(void *data, const Eo_Event *event)
    ctx_mod = (Ctxpopup_Module_Data *)data;
    if (!ctx_mod) return EINA_FALSE;
 
-   snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(event->obj));
+   snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(event->object));
 
    if (ctx_mod->ctxpopup)
      evas_object_del(ctx_mod->ctxpopup);
-   ctx_mod->ctxpopup = elm_ctxpopup_add(event->obj);
+   ctx_mod->ctxpopup = elm_ctxpopup_add(event->object);
    elm_object_style_set(ctx_mod->ctxpopup, buf);
    elm_ctxpopup_horizontal_set(ctx_mod->ctxpopup, EINA_TRUE);
    evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND,
@@ -155,7 +155,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
    evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5);
    eo_event_callback_add
      (ctx_mod->ctxpopup, ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod);
-   elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->obj));
+   elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->object));
 
    diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
    eo_event_callback_add
@@ -166,7 +166,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
    t = time(NULL);
    localtime_r(&t, &time1);
 
-   field_type = (Elm_Datetime_Field_Type )evas_object_data_get(event->obj, "_field_type");
+   field_type = (Elm_Datetime_Field_Type )evas_object_data_get(event->object, "_field_type");
    fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type);
    elm_datetime_value_get(ctx_mod->mod_data.base, &time1);
    val = _field_value_get(&time1, field_type);
@@ -203,7 +203,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
      }
    elm_diskselector_side_text_max_length_set(diskselector, text_len);
 
-   evas_object_geometry_get(event->obj, &x, &y, &w, &h);
+   evas_object_geometry_get(event->object, &x, &y, &w, &h);
    evas_object_geometry_get(elm_widget_top_get(ctx_mod->mod_data.base), NULL, NULL, &width, NULL);
    evas_object_size_hint_min_set(ctx_mod->ctxpopup, width, -1);
    display_item_num = width / (w + elm_config_finger_size_get());
diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c
index 4cccfb181a..8922c5743a 100644
--- a/src/modules/elementary/prefs/elm_button.c
+++ b/src/modules/elementary/prefs/elm_button.c
@@ -13,7 +13,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
-   prefs_it_changed_cb(event->obj);
+   prefs_it_changed_cb(event->object);
    return EINA_TRUE;
 }
 
diff --git a/src/modules/elementary/prefs/elm_check.c b/src/modules/elementary/prefs/elm_check.c
index 37c42918f7..7d1b2cbf66 100644
--- a/src/modules/elementary/prefs/elm_check.c
+++ b/src/modules/elementary/prefs/elm_check.c
@@ -11,7 +11,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
 {
     Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
-    prefs_it_changed_cb(event->obj);
+    prefs_it_changed_cb(event->object);
     return EINA_TRUE;
 }
 
diff --git a/src/modules/elementary/prefs/elm_datetime.c b/src/modules/elementary/prefs/elm_datetime.c
index 86b4729d68..6b0f532f89 100644
--- a/src/modules/elementary/prefs/elm_datetime.c
+++ b/src/modules/elementary/prefs/elm_datetime.c
@@ -11,7 +11,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
-   prefs_it_changed_cb(event->obj);
+   prefs_it_changed_cb(event->object);
    return EINA_TRUE;
 }
 
diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c
index 9bd0dcc57a..b9566094ed 100644
--- a/src/modules/elementary/prefs/elm_entry.c
+++ b/src/modules/elementary/prefs/elm_entry.c
@@ -100,7 +100,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
-   prefs_it_changed_cb(event->obj);
+   prefs_it_changed_cb(event->object);
    return EINA_TRUE;
 }
 
diff --git a/src/modules/elementary/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c
index e03a1e1646..635eb24692 100644
--- a/src/modules/elementary/prefs/elm_slider.c
+++ b/src/modules/elementary/prefs/elm_slider.c
@@ -12,7 +12,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
-   prefs_it_changed_cb(event->obj);
+   prefs_it_changed_cb(event->object);
    return EINA_TRUE;
 }
 
diff --git a/src/modules/elementary/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c
index 51903fed90..063b998c38 100644
--- a/src/modules/elementary/prefs/elm_spinner.c
+++ b/src/modules/elementary/prefs/elm_spinner.c
@@ -12,7 +12,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
 {
     Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
-    prefs_it_changed_cb(event->obj);
+    prefs_it_changed_cb(event->object);
     return EINA_TRUE;
 }
 
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 96b2232a6f..927ba95d03 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -304,7 +304,7 @@ _evas_gl_preload_target_die(void *data, const Eo_Event *event)
 {
    Evas_GL_Texture *tex = data;
 
-   evas_gl_preload_target_unregister(tex, event->obj);
+   evas_gl_preload_target_unregister(tex, event->object);
 
    return EO_CALLBACK_CONTINUE;
 }
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 9112b8961f..2174f9a24c 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -34,7 +34,7 @@ static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA
 
 static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-  ecore_audio_obj_in_looped_set(event->obj, EINA_FALSE);
+  ecore_audio_obj_in_looped_set(event->object, EINA_FALSE);
 
   return EINA_TRUE;
 }
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 09c0f13254..5ddec2b99c 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -56,7 +56,7 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
    if(temp_filename && strcmp(temp_filename, filename) == 0)
      {
         children_deleted = EINA_TRUE;
-        efl_model_child_del(event->obj, evt->child);
+        efl_model_child_del(event->object, evt->child);
      }
    free(filename);
 
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index c56ee4636d..aeab09042d 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -87,7 +87,7 @@ _children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
      return EINA_TRUE;
 
    ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
-   current = event->obj;
+   current = event->object;
    counter++;
 
    return EINA_TRUE;
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index ef631c7d29..755f5be42c 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -40,7 +40,7 @@ _async_error_cb(void *data, const Eo_Event *event)
    Test_Data *td = data;
    char path[PATH_MAX];
    sprintf(path, pathfmt, td->image_id);
-   efl_file_set(event->obj, path, NULL);
+   efl_file_set(event->object, path, NULL);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -52,7 +52,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
    char path[PATH_MAX];
 
    sprintf(path, pathfmt, td->image_id);
-   efl_file_get(event->obj, &ff, &kk);
+   efl_file_get(event->object, &ff, &kk);
    r1 = strrchr(ff, '/');
    r2 = strrchr(path, '/');
    ck_assert(!strcmp(r1, r2));
@@ -62,7 +62,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
      {
         td->image_id++;
         sprintf(path, pathfmt, td->image_id);
-        efl_file_set(event->obj, path, NULL);
+        efl_file_set(event->object, path, NULL);
         return EO_CALLBACK_CONTINUE;
      }
    else if (td->image_id < MAX_IMAGE_ID)
@@ -71,7 +71,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
         for (; td->image_id < MAX_IMAGE_ID;)
           {
              sprintf(path, pathfmt, ++td->image_id);
-             efl_file_set(event->obj, path, NULL);
+             efl_file_set(event->object, path, NULL);
           }
         return EO_CALLBACK_CONTINUE;
      }
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index e372e2cbac..83937428c3 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -326,7 +326,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
 static Eina_Bool
 video_obj_frame_decode_cb(void *data, const Eo_Event *event)
 {
-   video_obj_time_changed(event->obj, data);
+   video_obj_time_changed(event->object, data);
 
    if (0)
      {
@@ -348,16 +348,16 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event)
    double ratio;
 
    oe = data;
-   emotion_object_size_get(event->obj, &iw, &ih);
-   ratio = emotion_object_ratio_get(event->obj);
+   emotion_object_size_get(event->object, &iw, &ih);
+   ratio = emotion_object_ratio_get(event->object);
    printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio);
    if (ratio > 0.0) iw = (ih * ratio) + 0.5;
-   evas_object_size_hint_min_set(event->obj, iw, ih);
-   edje_object_part_swallow(oe, "video_swallow", event->obj);
+   evas_object_size_hint_min_set(event->object, iw, ih);
+   edje_object_part_swallow(oe, "video_swallow", event->object);
    edje_obj_size_min_calc(oe, &w, &h);
    efl_gfx_size_set(oe, w, h);
-   evas_object_size_hint_min_set(event->obj, 0, 0);
-   edje_object_part_swallow(oe, "video_swallow", event->obj);
+   evas_object_size_hint_min_set(event->object, 0, 0);
+   edje_object_part_swallow(oe, "video_swallow", event->object);
 
    return EINA_TRUE;
 }
@@ -366,7 +366,7 @@ static Eina_Bool
 video_obj_length_change_cb(void *data, const Eo_Event *event)
 {
    printf("len change!\n");
-   video_obj_time_changed(event->obj, data);
+   video_obj_time_changed(event->object, data);
 
    return EINA_TRUE;
 }
@@ -375,7 +375,7 @@ static Eina_Bool
 video_obj_position_update_cb(void *data, const Eo_Event *event)
 {
    printf("pos up!\n");
-   video_obj_time_changed(event->obj, data);
+   video_obj_time_changed(event->object, data);
 
    return EINA_TRUE;
 }
@@ -386,8 +386,8 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
    printf("video stopped!!!\n");
    if (loop)
      {
-        emotion_object_position_set(event->obj, 0.0);
-        emotion_object_play_set(event->obj, EINA_TRUE);
+        emotion_object_position_set(event->object, 0.0);
+        emotion_object_play_set(event->object, EINA_TRUE);
      }
 
    return EINA_TRUE;
@@ -397,9 +397,9 @@ static Eina_Bool
 video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
-          emotion_object_audio_channel_count(event->obj),
-          emotion_object_video_channel_count(event->obj),
-          emotion_object_spu_channel_count(event->obj));
+          emotion_object_audio_channel_count(event->object),
+          emotion_object_video_channel_count(event->object),
+          emotion_object_spu_channel_count(event->object));
 
    return EINA_TRUE;
 }
@@ -407,7 +407,7 @@ video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
 static Eina_Bool
  video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   printf("video title to: \"%s\"\n", emotion_object_title_get(event->obj));
+   printf("video title to: \"%s\"\n", emotion_object_title_get(event->object));
 
    return EINA_TRUE;
 }
@@ -416,8 +416,8 @@ static Eina_Bool
 video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    printf("progress: \"%s\" %3.3f\n",
-          emotion_object_progress_info_get(event->obj),
-          emotion_object_progress_status_get(event->obj));
+          emotion_object_progress_info_get(event->object),
+          emotion_object_progress_status_get(event->object));
 
    return EINA_TRUE;
 }
@@ -426,8 +426,8 @@ static Eina_Bool
 video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    printf("video ref to: \"%s\" %i\n",
-          emotion_object_ref_file_get(event->obj),
-          emotion_object_ref_num_get(event->obj));
+          emotion_object_ref_file_get(event->object),
+          emotion_object_ref_num_get(event->object));
 
    return EINA_TRUE;
 }
@@ -436,7 +436,7 @@ static Eina_Bool
 video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    printf("video spu buttons to: %i\n",
-          emotion_object_spu_button_count_get(event->obj));
+          emotion_object_spu_button_count_get(event->object));
 
    return EINA_TRUE;
 }
@@ -445,7 +445,7 @@ static Eina_Bool
 video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    printf("video selected spu button: %i\n",
-          emotion_object_spu_button_get(event->obj));
+          emotion_object_spu_button_get(event->object));
 
    return EINA_TRUE;
 }
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 496e107709..5c33bc5efb 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -23,8 +23,8 @@ _a_changed_cb(void *data, const Eo_Event *event)
 
    cb_count++;
 
-   eo_event_callback_priority_add(event->obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
-   eo_event_callback_del(event->obj, EV_A_CHANGED, _null_cb, (void *) 23423);
+   eo_event_callback_priority_add(event->object, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
+   eo_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423);
 
    /* Stop as we reached the 3rd one. */
    return (cb_count != 3);
@@ -49,7 +49,7 @@ _restart_2_cb(void *data, const Eo_Event *event)
    fail_if(inside);
 
    inside = EINA_TRUE;
-   eo_event_callback_call(event->obj, event->desc, data);
+   eo_event_callback_call(event->object, event->desc, data);
    inside = EINA_FALSE;
 
    called++;
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 01eec450e1..f7cad686d2 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -31,7 +31,7 @@ _a_set(Eo *obj, void *class_data, int a)
 Eina_Bool
 _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
+   Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
    const Eo_Callback_Array_Item *callback_array = event->info;
 
    if (callback_array->desc != EV_A_CHANGED)
@@ -39,14 +39,14 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
 
    pd->cb_count++;
 
-   printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->obj, pd->cb_count);
+   printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->object, pd->cb_count);
    return EO_CALLBACK_CONTINUE;
 }
 
 Eina_Bool
 _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
+   Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
    const Eo_Callback_Array_Item *callback_array = event->info;
 
    if (callback_array->desc != EV_A_CHANGED)
@@ -54,7 +54,7 @@ _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
 
    pd->cb_count--;
 
-   printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->obj, pd->cb_count);
+   printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->object, pd->cb_count);
    return EO_CALLBACK_CONTINUE;
 }
 
diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c
index 28e20ce622..aee32370cb 100644
--- a/src/tests/eolian_cxx/callback.c
+++ b/src/tests/eolian_cxx/callback.c
@@ -21,7 +21,7 @@ static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event const
 {
   Callback_Data* pd = event->info;
   ++pd->callbacks;
-  eo_event_callback_call(event->obj, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks);
+  eo_event_callback_call(event->object, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks);
   return EINA_TRUE;
 }