Change the EFL to follow the new Eo rename.

474 files changed, 2776 insertions, 2776 deletions

diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 6431a64ddd..3a96c1c4aa 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -363,7 +363,7 @@ ecore_shutdown(void)
        }
 #endif
 
-     eo_del(_mainloop_singleton);
+     efl_del(_mainloop_singleton);
      _mainloop_singleton = NULL;
 
      if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
@@ -409,7 +409,7 @@ ecore_shutdown(void)
 
    if (vpath)
      {
-        eo_del(vpath);
+        efl_del(vpath);
         vpath = NULL;
      }
 
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index 28ffa9f77f..d48219dec6 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -94,15 +94,15 @@ _ecore_exe_command_get(Eo *obj EINA_UNUSED, Ecore_Exe_Data *pd, const char **cmd
 }
 
 EOLIAN static Eo *
-_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
+_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   obj = eo_finalize(eo_super(obj, MY_CLASS));
+   obj = efl_finalize(eo_super(obj, MY_CLASS));
 
    if (!obj)
       return obj;
 
-   return _impl_ecore_exe_eo_base_finalize(obj, exe);
+   return _impl_ecore_exe_efl_object_finalize(obj, exe);
 }
 
 EAPI void
@@ -210,17 +210,17 @@ ecore_exe_free(Ecore_Exe *obj)
       return NULL;
 
    void *data = exe->data;
-   eo_del(obj);
+   efl_del(obj);
 
    return data;
 }
 
 EOLIAN static void
-_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
+_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
 {
-   eo_destructor(eo_super(obj, ECORE_EXE_CLASS));
+   efl_destructor(eo_super(obj, ECORE_EXE_CLASS));
 
-   _impl_ecore_exe_eo_base_destructor(obj, exe);
+   _impl_ecore_exe_efl_object_destructor(obj, exe);
 }
 
 EAPI void
diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo
index cbcac3d355..6d7fab1d5d 100644
--- a/src/lib/ecore/ecore_exe.eo
+++ b/src/lib/ecore/ecore_exe.eo
@@ -13,7 +13,7 @@ struct Ecore.Exe.Event_Data.Line
  */
 struct Ecore.Exe.Event_Data
 {
-   exe: Eo.Base;  [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
+   exe: Efl.Object;  [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
    data: void_ptr; [[the raw binary data from the child process that was received]]
    size: int; [[the size of this data in bytes]]
    lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]]
@@ -37,7 +37,7 @@ enum Ecore.Exe_Flags
    term_with_parent = 512 [[Makes child receive SIGTERM when parent dies.]]
 }
 
-class Ecore.Exe (Eo.Base, Efl.Control)
+class Ecore.Exe (Efl.Object, Efl.Control)
 {
    [[Ecore.Exe is responsible for managing portable process spawning.
 
@@ -64,8 +64,8 @@ class Ecore.Exe (Eo.Base, Efl.Control)
         }
    }
    implements {
-        Eo.Base.destructor;
-        Eo.Base.finalize;
+        Efl.Object.destructor;
+        Efl.Object.finalize;
         Efl.Control.suspend.set;
    }
    constructors {
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index 43a18c9fdb..2babbbf6a5 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -228,7 +228,7 @@ _impl_ecore_exe_run_priority_get(void)
 }
 
 Eo *
-_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
+_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
 {
    int statusPipe[2] = { -1, -1 };
    int errorPipe[2] = { -1, -1 };
@@ -727,7 +727,7 @@ _impl_ecore_exe_event_data_get(Ecore_Exe      *obj,
 }
 
 void
-_impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
+_impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
 {
    void *data;
    int ok = 0;
@@ -1068,7 +1068,7 @@ _ecore_exe_data_generic_handler(void             *data,
    Ecore_Exe *obj = data;
    int child_fd;
    int event_type;
-   const Eo_Event_Description *eo_event = NULL;
+   const Efl_Event_Description *eo_event = NULL;
 
    Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
 
@@ -1167,7 +1167,7 @@ _ecore_exe_data_generic_handler(void             *data,
                        ecore_event_add(event_type, e,
                              _ecore_exe_event_exe_data_free,
                              NULL);
-                       eo_event_callback_call(obj, eo_event, e);
+                       efl_event_callback_call(obj, eo_event, e);
                     }
                }
             }
diff --git a/src/lib/ecore/ecore_exe_private.h b/src/lib/ecore/ecore_exe_private.h
index 66c6d4f65a..53e44420b0 100644
--- a/src/lib/ecore/ecore_exe_private.h
+++ b/src/lib/ecore/ecore_exe_private.h
@@ -154,11 +154,11 @@ void _ecore_exe_event_add_free(void *data EINA_UNUSED, void *ev);
 void _impl_ecore_exe_run_priority_set(int pri);
 int _impl_ecore_exe_run_priority_get(void);
 void _impl_ecore_exe_auto_limits_set(Ecore_Exe *obj, Ecore_Exe_Data *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
-Eo *_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe);
+Eo *_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe);
 void _impl_ecore_exe_efl_control_suspend_set(Eo *obj EINA_UNUSED, Ecore_Exe_Data *exe, Eina_Bool suspend);
 Eina_Bool _impl_ecore_exe_send(Ecore_Exe *obj, Ecore_Exe_Data *exe, const void *data, int size);
 Ecore_Exe_Event_Data *_impl_ecore_exe_event_data_get(Ecore_Exe *obj, Ecore_Exe_Data *exe, Ecore_Exe_Flags flags);
-void _impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe);
+void _impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe);
 void _impl_ecore_exe_pause(Ecore_Exe *obj, Ecore_Exe_Data *exe);
 void _impl_ecore_exe_continue(Ecore_Exe *obj, Ecore_Exe_Data *exe);
 void _impl_ecore_exe_interrupt(Ecore_Exe *obj, Ecore_Exe_Data *exe);
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index bc4041492f..0316754027 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
              ecore_event_add(ECORE_EXE_EVENT_DATA, event_data,
                              _ecore_exe_event_exe_data_free,
                              NULL);
-             eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
+             efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
           }
 
         current_buf = NULL;
@@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
              ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data,
                              _ecore_exe_event_exe_data_free,
                              NULL);
-             eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
+             efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
           }
 
         current_buf = NULL;
@@ -379,7 +379,7 @@ _impl_ecore_exe_run_priority_get(void)
 }
 
 Eo *
-_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
+_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
 {
    char exe_cmd_buf[32768];
    SECURITY_ATTRIBUTES sa;
@@ -689,7 +689,7 @@ _impl_ecore_exe_event_data_get(Ecore_Exe      *obj,
 }
 
 void
-_impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
+_impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
 {
    void *data;
 
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 3ef93c6aa2..ecc74dc923 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -11,7 +11,7 @@
 
 EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
                           { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process },
-                          { EO_EVENT_DEL, _ecore_factorized_idle_event_del });
+                          { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
 
 
 EAPI Ecore_Idle_Enterer *
@@ -30,8 +30,8 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
 
    // This avoid us duplicating code and should only be slightly slower
    // due to a useless cycle of callback registration
-   eo_event_callback_array_del(_mainloop_singleton, ecore_idle_enterer_callbacks(), ie);
-   eo_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EO_CALLBACK_PRIORITY_BEFORE, ie);
+   efl_event_callback_array_del(_mainloop_singleton, ecore_idle_enterer_callbacks(), ie);
+   efl_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EO_CALLBACK_PRIORITY_BEFORE, ie);
 
    return ie;
 }
@@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
 void
 _ecore_idle_enterer_call(Eo *loop)
 {
-   eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
+   efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
 }
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index 3f51c4e689..c53a182081 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -11,7 +11,7 @@
 
 EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
                           { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
-                          { EO_EVENT_DEL, _ecore_factorized_idle_event_del });
+                          { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
 
 EAPI Ecore_Idle_Exiter *
 ecore_idle_exiter_add(Ecore_Task_Cb func,
@@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
 void
 _ecore_idle_exiter_call(Eo *loop)
 {
-   eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
+   efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
 }
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 1512af3c5a..3c94e6d0a0 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -14,7 +14,7 @@ struct _Ecore_Factorized_Idle
    Ecore_Task_Cb func;
    void         *data;
 
-   const Eo_Callback_Array_Item *desc;
+   const Efl_Callback_Array_Item *desc;
 
    short         references;
    Eina_Bool     delete_me : 1;
@@ -55,7 +55,7 @@ _ecore_factorized_idle_del(Ecore_Idler *idler)
         return idler->data;
      }
 
-   eo_event_callback_array_del(_mainloop_singleton, idler->desc, idler);
+   efl_event_callback_array_del(_mainloop_singleton, idler->desc, idler);
 
    data = idler->data;
    free(idler);
@@ -63,7 +63,7 @@ _ecore_factorized_idle_del(Ecore_Idler *idler)
 }
 
 Ecore_Factorized_Idle *
-_ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
+_ecore_factorized_idle_add(const Efl_Callback_Array_Item *desc,
                            Ecore_Task_Cb func,
                            const void   *data)
 {
@@ -89,7 +89,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
    ret->references = 0;
    ret->delete_me = EINA_FALSE;
 
-   eo_event_callback_array_add(_mainloop_singleton, desc, ret);
+   efl_event_callback_array_add(_mainloop_singleton, desc, ret);
 
    return ret;
 }
@@ -98,7 +98,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
 
 EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
                           { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
-                          { EO_EVENT_DEL, _ecore_factorized_idle_event_del });
+                          { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
 
 EAPI Ecore_Idler *
 ecore_idler_add(Ecore_Task_Cb func,
@@ -116,7 +116,7 @@ ecore_idler_del(Ecore_Idler *idler)
 void
 _ecore_idler_all_call(Eo *loop)
 {
-   eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
+   efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
 }
 
 int
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index d16c97a7de..f0e18787fc 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2717,7 +2717,7 @@ err :
 Eo *_mainloop_singleton = NULL;
 
 EOLIAN static Efl_Loop *
-_efl_loop_main_get(Eo_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
+_efl_loop_main_get(Efl_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
 {
    if (!_mainloop_singleton)
      {
@@ -2758,23 +2758,23 @@ _efl_loop_quit(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED, unsigned char
    _ecore_exit_code = exit_code;
 }
 
-EOLIAN static Eo_Base *
-_efl_loop_eo_base_provider_find(Eo *obj, Efl_Loop_Data *pd, const Eo_Base *klass)
+EOLIAN static Efl_Object *
+_efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass)
 {
-   Eo_Base *r;
+   Efl_Object *r;
 
    if (klass == EFL_LOOP_CLASS) return obj;
 
    r = eina_hash_find(pd->providers, &klass);
    if (r) return r;
 
-   return eo_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
+   return efl_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
 }
 
 static void
 _check_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Efl_Loop_Data *pd = data;
    int i;
 
@@ -2790,7 +2790,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
 static void
 _check_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Efl_Loop_Data *pd = data;
    int i;
 
@@ -2804,16 +2804,16 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
-                          { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add },
-                          { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del });
+                          { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
+                          { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
 
-EOLIAN static Eo_Base *
-_efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
+EOLIAN static Efl_Object *
+_efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, EFL_LOOP_CLASS));
+   obj = efl_constructor(eo_super(obj, EFL_LOOP_CLASS));
    if (!obj) return NULL;
 
-   eo_event_callback_array_add(obj, event_catcher_watch(), pd);
+   efl_event_callback_array_add(obj, event_catcher_watch(), pd);
 
    pd->providers = eina_hash_pointer_new((void*) eo_unref);
 
@@ -2821,9 +2821,9 @@ _efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
 }
 
 EOLIAN static void
-_efl_loop_eo_base_destructor(Eo *obj, Efl_Loop_Data *pd)
+_efl_loop_efl_object_destructor(Eo *obj, Efl_Loop_Data *pd)
 {
-   eo_destructor(eo_super(obj, EFL_LOOP_CLASS));
+   efl_destructor(eo_super(obj, EFL_LOOP_CLASS));
 
    eina_hash_free(pd->providers);
 }
@@ -2873,7 +2873,7 @@ _efl_loop_arguments_send(void *data, void *value EINA_UNUSED)
    arge.initialization = initialization;
    initialization = EINA_FALSE;
 
-   eo_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
+   efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
 
    _efl_loop_arguments_cleanup(arga);
 }
@@ -2907,7 +2907,7 @@ static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED);
 
 EO_CALLBACKS_ARRAY_DEFINE(timeout,
                           { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
-                          { EO_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
+                          { EFL_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
 
 /* This event will be triggered when the main loop is destroyed and destroy its timers along */
 static void _efl_loop_internal_cancel(Efl_Internal_Promise *p);
@@ -2925,8 +2925,8 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
 
    eina_promise_owner_value_set(t->promise, t->data, NULL);
 
-   eo_event_callback_array_del(t->u.timer, timeout(), t);
-   eo_del(t->u.timer);
+   efl_event_callback_array_del(t->u.timer, timeout(), t);
+   efl_del(t->u.timer);
 }
 
 static void
@@ -2947,8 +2947,8 @@ _efl_loop_job_cancel(void* data, Eina_Promise_Owner* promise EINA_UNUSED)
      }
    else
      {
-        eo_event_callback_array_del(j->u.timer, timeout(), j);
-        eo_del(j->u.timer);
+        efl_event_callback_array_del(j->u.timer, timeout(), j);
+        efl_del(j->u.timer);
      }
 
    _efl_loop_internal_cancel(j);
@@ -3009,7 +3009,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
    t->job_is = EINA_FALSE;
    t->u.timer = eo_add(EFL_LOOP_TIMER_CLASS, obj,
                        efl_loop_timer_interval_set(eo_self, time),
-                       eo_event_callback_array_add(eo_self, timeout(), t));
+                       efl_event_callback_array_add(eo_self, timeout(), t));
 
    if (!t->u.timer) goto on_error;
 
@@ -3023,7 +3023,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
 }
 
 static Eina_Bool
-_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass, const Eo_Base *provider)
+_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *provider)
 {
    // The passed object does not provide that said class.
    if (!eo_isa(provider, klass)) return EINA_FALSE;
@@ -3034,7 +3034,7 @@ _efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass
 }
 
 static Eina_Bool
-_efl_loop_unregister(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass, const Eo_Base *provider)
+_efl_loop_unregister(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *provider)
 {
    return eina_hash_del(pd->providers, &klass, provider);
 }
diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo
index 6ea1a76f93..239aa647e9 100644
--- a/src/lib/ecore/ecore_parent.eo
+++ b/src/lib/ecore/ecore_parent.eo
@@ -1,4 +1,4 @@
-class Ecore.Parent (Eo.Base)
+class Ecore.Parent (Efl.Object)
 {
    data: null;
 }
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 3279979f71..cc4e4f406e 100644
--- a/src/lib/ecore/ecore_poller.c
+++ b/src/lib/ecore/ecore_poller.c
@@ -173,7 +173,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
                      {
                         pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
 
-                        eo_parent_set(poller->obj, NULL);
+                        efl_parent_set(poller->obj, NULL);
                         if (eo_destructed_is(poller->obj))
                            eo_manual_free(poller->obj);
                         else
@@ -351,7 +351,7 @@ ecore_poller_del(Ecore_Poller *obj)
    data = poller->data;
    pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
 
-   eo_parent_set(poller->obj, NULL);
+   efl_parent_set(poller->obj, NULL);
    if (eo_destructed_is(poller->obj))
       eo_manual_free(obj);
    else
@@ -362,7 +362,7 @@ ecore_poller_del(Ecore_Poller *obj)
 }
 
 EOLIAN static void
-_ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
+_ecore_poller_efl_object_destructor(Eo *obj, Ecore_Poller_Data *pd)
 {
    if (!pd->delete_me)
    {
@@ -370,18 +370,18 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
      poller_delete_count++;
    }
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eo *
-_ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd)
+_ecore_poller_efl_object_finalize(Eo *obj, Ecore_Poller_Data *pd)
 {
    if (!pd->func)
    {
       return NULL;
    }
 
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 void
@@ -395,7 +395,7 @@ _ecore_poller_shutdown(void)
         while ((poller = pollers[i]))
           {
              pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
-             eo_parent_set(poller->obj, NULL);
+             efl_parent_set(poller->obj, NULL);
              if (eo_destructed_is(poller->obj))
                 eo_manual_free(poller->obj);
              else
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index 804d1067e8..e0e2decc80 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -7,7 +7,7 @@ enum Ecore.Poller_Type
    core = 0 [[The core poller interval]]
 }
 
-class Ecore.Poller (Eo.Base)
+class Ecore.Poller (Efl.Object)
 {
    [[Ecore poller provides infrastructure for the creation of pollers.
 
@@ -53,8 +53,8 @@ class Ecore.Poller (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
    constructors {
       .constructor;
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index d6cb900a72..eaf5a3b0a8 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -163,7 +163,7 @@ int          _efl_loop_timers_exists(void);
 
 int          _efl_loop_timer_expired_call(double when);
 
-Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Eo_Callback_Array_Item*desc,
+Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Efl_Callback_Array_Item*desc,
                                                   Ecore_Task_Cb func,
                                                   const void   *data);
 void        *_ecore_factorized_idle_del(Ecore_Idler *idler);
@@ -369,7 +369,7 @@ extern Eo *_mainloop_singleton;
 extern Eo *_ecore_parent;
 extern Efl_Version _app_efl_version;
 #define ECORE_PARENT_CLASS ecore_parent_class_get()
-EAPI const Eo_Class *ecore_parent_class_get(void) EINA_CONST;
+EAPI const Efl_Class *ecore_parent_class_get(void) EINA_CONST;
 
 // access to direct input cb
 #define ECORE_EVAS_INTERNAL
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 20f94f8f50..d9572f0075 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -77,7 +77,7 @@ ecore_timer_precision_set(double value)
 static void
 _check_timer_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Efl_Loop_Timer_Data *timer = data;
    int i;
 
@@ -97,7 +97,7 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event)
 static void
 _check_timer_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Efl_Loop_Timer_Data *timer = data;
    int i;
 
@@ -113,17 +113,17 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(timer_watch,
-                          { EO_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
-                          { EO_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
+                          { EFL_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
+                          { EFL_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
 
 EOLIAN static Eo *
-_efl_loop_timer_eo_base_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
+_efl_loop_timer_efl_object_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
 {
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
 
-   eo_event_callback_array_add(obj, timer_watch(), timer);
+   efl_event_callback_array_add(obj, timer_watch(), timer);
 
-   eo_wref_add(obj, &timer->object);
+   efl_wref_add(obj, &timer->object);
 
    timer->at = ecore_time_get();
    timer->initialized = 0;
@@ -133,11 +133,11 @@ _efl_loop_timer_eo_base_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
 
 
 EOLIAN static Eo *
-_efl_loop_timer_eo_base_finalize(Eo *obj, Efl_Loop_Timer_Data *pd)
+_efl_loop_timer_efl_object_finalize(Eo *obj, Efl_Loop_Timer_Data *pd)
 {
    _efl_loop_timer_util_instanciate(pd);
 
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy;
@@ -167,14 +167,14 @@ _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_del(event->object);
+     efl_del(event->object);
    else
      legacy->inside_call = 0;
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(legacy_timer,
                           { EFL_LOOP_TIMER_EVENT_TICK, _ecore_timer_legacy_tick },
-                          { EO_EVENT_DEL, _ecore_timer_legacy_del });
+                          { EFL_EVENT_DEL, _ecore_timer_legacy_del });
 
 EAPI Ecore_Timer *
 ecore_timer_add(double        in,
@@ -191,8 +191,8 @@ ecore_timer_add(double        in,
    legacy->func = func;
    legacy->data = data;
    timer = eo_add(MY_CLASS, ecore_main_loop_get(),
-                  eo_event_callback_array_add(eo_self, legacy_timer(), legacy),
-                  eo_key_data_set(eo_self, "_legacy", legacy),
+                  efl_event_callback_array_add(eo_self, legacy_timer(), legacy),
+                  efl_key_data_set(eo_self, "_legacy", legacy),
                   efl_loop_timer_interval_set(eo_self, in));
 
    return timer;
@@ -213,8 +213,8 @@ ecore_timer_loop_add(double        in,
    legacy->func = func;
    legacy->data = data;
    timer = eo_add(MY_CLASS, ecore_main_loop_get(),
-                  eo_event_callback_array_add(eo_self, legacy_timer(), legacy),
-                  eo_key_data_set(eo_self, "_legacy", legacy),
+                  efl_event_callback_array_add(eo_self, legacy_timer(), legacy),
+                  efl_key_data_set(eo_self, "_legacy", legacy),
                   efl_loop_timer_loop_reset(eo_self),
                   efl_loop_timer_interval_set(eo_self, in));
 
@@ -230,7 +230,7 @@ ecore_timer_del(Ecore_Timer *timer)
    if (!timer) return NULL;
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
 
-   legacy = eo_key_data_get(timer, "_legacy");
+   legacy = efl_key_data_get(timer, "_legacy");
    // If legacy == NULL, this means double free or something
    if (legacy == NULL)
      {
@@ -245,7 +245,7 @@ ecore_timer_del(Ecore_Timer *timer)
    if (legacy->inside_call)
      legacy->delete_me = EINA_TRUE;
    else
-     eo_del(timer);
+     efl_del(timer);
 
    return data;
 }
@@ -346,17 +346,17 @@ ecore_timer_freeze(Ecore_Timer *timer)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
    ECORE_TIMER_CHECK(timer);
-   eo_event_freeze(timer);
+   efl_event_freeze(timer);
 }
 
 EOLIAN static void
-_efl_loop_timer_eo_base_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
+_efl_loop_timer_efl_object_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
 {
    double now;
 
    EINA_MAIN_LOOP_CHECK_RETURN;
 
-   eo_event_freeze(eo_super(obj, MY_CLASS));
+   efl_event_freeze(eo_super(obj, MY_CLASS));
 
    /* Timer already frozen */
    if (timer->frozen)
@@ -377,12 +377,12 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
    int r = 0;
 
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
-   r = eo_event_freeze_count_get(timer);
+   r = efl_event_freeze_count_get(timer);
    return !!r;
 }
 
 EOLIAN static int
-_efl_loop_timer_eo_base_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
+_efl_loop_timer_efl_object_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
 
@@ -394,17 +394,17 @@ ecore_timer_thaw(Ecore_Timer *timer)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
    ECORE_TIMER_CHECK(timer);
-   eo_event_thaw(timer);
+   efl_event_thaw(timer);
 }
 
 EOLIAN static void
-_efl_loop_timer_eo_base_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
+_efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
 {
    double now;
 
    EINA_MAIN_LOOP_CHECK_RETURN;
 
-   eo_event_thaw(eo_super(obj, MY_CLASS));
+   efl_event_thaw(eo_super(obj, MY_CLASS));
 
    /* Timer not frozen */
    if (!timer->frozen)
@@ -469,7 +469,7 @@ _efl_loop_timer_util_delay(Efl_Loop_Timer_Data *timer,
 }
 
 EOLIAN static void
-_efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, Eo_Base *parent)
+_efl_loop_timer_efl_object_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, Efl_Object *parent)
 {
    Eina_Inlist *first;
 
@@ -479,9 +479,9 @@ _efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd,
    else if (first == suspended)
      suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
 
-   eo_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
+   efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
 
-   if (eo_parent_get(obj) != parent)
+   if (efl_parent_get(obj) != parent)
      return ;
 
    if (parent != NULL)
@@ -496,7 +496,7 @@ _efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd,
 }
 
 EOLIAN static void
-_efl_loop_timer_eo_base_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
+_efl_loop_timer_efl_object_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
 {
    Eina_Inlist *first;
 
@@ -511,7 +511,7 @@ _efl_loop_timer_eo_base_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
    else if (first == suspended)
      suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 void
@@ -658,7 +658,7 @@ _efl_loop_timer_expired_call(double when)
 
         eo_ref(timer->object);
         eina_evlog("+timer", timer, 0.0, NULL);
-        eo_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
+        efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
         eina_evlog("-timer", timer, 0.0, NULL);
 
         /* may have changed in recursive main loops */
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 6b0d503e3a..0ccc7469fc 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -5,7 +5,7 @@ struct Efl.Loop.Arguments {
    initialization: bool; [[Set to true when the program should initialize its internal state. This happen once per process instance.]]
 }
 
-class Efl.Loop (Eo.Base)
+class Efl.Loop (Efl.Object)
 {
    [[The Efl Main Loop
 
@@ -86,16 +86,16 @@ class Efl.Loop (Eo.Base)
       register {
          [[Will register a manager of a specific class to be answered by eo.provider_find.]]
          params {
-            @in klass: const(Eo.Class); [[The class provided by the registered provider.]]
-            @in provider: const(Eo.Base); [[The provider for the newly registered class that has to provide that said Eo.Class.]]
+            @in klass: const(Efl.Class); [[The class provided by the registered provider.]]
+            @in provider: const(Efl.Object); [[The provider for the newly registered class that has to provide that said Efl.Class.]]
          }
          return: bool; [[true if successfully register, false otherwise.]]
       }
       unregister {
          [[Will unregister a manager of a specific class that was previously registered and answered by eo.provider_find.]]
          params {
-            @in klass: const(Eo.Class); [[The class provided by the provider to unregister for.]]
-            @in provider: const(Eo.Base); [[The provider for the registered class to unregister.]]
+            @in klass: const(Efl.Class); [[The class provided by the provider to unregister for.]]
+            @in provider: const(Efl.Object); [[The provider for the registered class to unregister.]]
          }
          return: bool; [[true if successfully unregistered, false otherwise.]]
       }
@@ -107,8 +107,8 @@ class Efl.Loop (Eo.Base)
       arguments: Efl.Loop.Arguments; [[Event happens when args are provided to the loop by args_add().]]
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.provider_find;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.provider_find;
    }
 }
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 5df3ec4fd1..dc7f472349 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -31,15 +31,15 @@ _efl_loop_fd_read_cb(void *data, Ecore_Fd_Handler *fd_handler)
 
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
      {
-        eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
+        efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
      }
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
      {
-        eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
+        efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
      }
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
      {
-        eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
+        efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
      }
 
    return ECORE_CALLBACK_RENEW;
@@ -95,7 +95,7 @@ _efl_loop_fd_fd_file_get(Eo *obj EINA_UNUSED, Efl_Loop_Fd_Data *pd)
 static void
 _check_fd_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Efl_Loop_Fd_Data *fd = data;
    int i;
 
@@ -122,7 +122,7 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
 static void
 _check_fd_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Efl_Loop_Fd_Data *fd = data;
    int i;
 
@@ -147,15 +147,15 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(fd_watch,
-                          { EO_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
-                          { EO_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
+                          { EFL_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
+                          { EFL_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
 
-static Eo_Base *
-_efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
+static Efl_Object *
+_efl_loop_fd_efl_object_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
 {
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
 
-   eo_event_callback_array_add(obj, fd_watch(), pd);
+   efl_event_callback_array_add(obj, fd_watch(), pd);
 
    pd->fd = -1;
 
@@ -163,12 +163,12 @@ _efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
 }
 
 static void
-_efl_loop_fd_eo_base_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Eo_Base *parent)
+_efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *parent)
 {
    if (pd->handler) ecore_main_fd_handler_del(pd->handler);
    pd->handler = NULL;
 
-   eo_parent_set(eo_super(obj, MY_CLASS), parent);
+   efl_parent_set(eo_super(obj, MY_CLASS), parent);
 
    if (parent == NULL) return ;
 
@@ -176,9 +176,9 @@ _efl_loop_fd_eo_base_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Eo_Base *parent)
 }
 
 static void
-_efl_loop_fd_eo_base_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
+_efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 
    ecore_main_fd_handler_del(pd->handler);
 }
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 92848463e6..4e0853f41a 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -39,8 +39,8 @@ class Efl.Loop.Fd (Efl.Loop_User)
       error;
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.parent.set;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.parent.set;
    }
 }
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 022e9ee898..fbbbe348ce 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -59,11 +59,11 @@ class Efl.Loop.Timer (Efl.Loop_User)
       tick; [[Event triggered when the specified time as passed.]]
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.finalize;
-      Eo.Base.event_freeze;
-      Eo.Base.parent.set;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
+      Efl.Object.event_freeze;
+      Efl.Object.parent.set;
       /* XXX: can't document overridden methods
        * Pauses a running timer.
        *
@@ -78,8 +78,8 @@ class Efl.Loop.Timer (Efl.Loop_User)
        *
        * @see ecore_timer_thaw()
        */
-      Eo.Base.event_freeze_count.get;
-      Eo.Base.event_thaw;
+      Efl.Object.event_freeze_count.get;
+      Efl.Object.event_thaw;
       /* XXX: can't document overridden methods
        * Resumes a frozen (paused) timer.
        *
diff --git a/src/lib/ecore/efl_loop_user.c b/src/lib/ecore/efl_loop_user.c
index 6aef76afe8..3dc8ffaa9e 100644
--- a/src/lib/ecore/efl_loop_user.c
+++ b/src/lib/ecore/efl_loop_user.c
@@ -14,16 +14,16 @@ struct _Efl_Loop_User_Data
 static Efl_Loop *
 _efl_loop_user_loop_get(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED)
 {
-   return eo_provider_find(obj, EFL_LOOP_CLASS);
+   return efl_provider_find(obj, EFL_LOOP_CLASS);
 }
 
 static void
-_efl_loop_user_eo_base_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Eo_Base *parent)
+_efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Efl_Object *parent)
 {
-   if (parent != NULL && eo_provider_find(parent, EFL_LOOP_CLASS) == NULL)
+   if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
      return ;
 
-   eo_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
+   efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
 }
 
 #include "efl_loop_user.eo.c"
diff --git a/src/lib/ecore/efl_loop_user.eo b/src/lib/ecore/efl_loop_user.eo
index 076cff3ec1..c689f49bc0 100644
--- a/src/lib/ecore/efl_loop_user.eo
+++ b/src/lib/ecore/efl_loop_user.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_User (Eo.Base)
+class Efl.Loop_User (Efl.Object)
 {
    [[An Efl.Loop_User is a class that require one of the parent to provide
      an Efl.Loop interface when doing provider_find. It will enforce this by
@@ -9,6 +9,6 @@ class Efl.Loop_User (Eo.Base)
       }
    }
    implements {
-      Eo.Base.parent.set;
+      Efl.Object.parent.set;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index 7e146de9eb..5d08762112 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -1,5 +1,5 @@
 type @extern Ecore.Audio.Vio: __undefined_type; /* FIXME: Had function pointer members. */
-type @extern eo_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */
+type @extern efl_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */
 
 enum Ecore.Audio.Format {
     auto, [[Automatically detect the format (for inputs)]]
@@ -11,7 +11,7 @@ enum Ecore.Audio.Format {
     last [[Sentinel value, do not use]]
 }
 
-class Ecore.Audio (Eo.Base)
+class Ecore.Audio (Efl.Object)
 {
    [[Convenience audio class.]]
 
@@ -112,7 +112,7 @@ class Ecore.Audio (Eo.Base)
                                         the function callbacks
                                       ]]
               data: void_ptr; [[user data to pass to the VIO functions]]
-              free_func: eo_key_data_free_func; [[this function takes care to
+              free_func: efl_key_data_free_func; [[this function takes care to
                                                   clean up $data when he VIO is
                                                   destroyed. NULL means do
                                                   nothing.
@@ -121,6 +121,6 @@ class Ecore.Audio (Eo.Base)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 57457c2e54..4c7b439ef1 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -150,8 +150,8 @@ class Ecore.Audio.In (Ecore.Audio)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Ecore.Audio.vio_set;
    }
    events {
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index 6b88780624..267538045d 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -3,7 +3,7 @@ class Ecore.Audio.In.Sndfile (Ecore.Audio.In)
    [[Ecore Audio sndfile input.]]
    eo_prefix: ecore_audio_obj_in_sndfile;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Ecore.Audio.source.set;
       Ecore.Audio.source.get;
       Ecore.Audio.format.set;
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 768b491644..fbef1f2feb 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -3,8 +3,8 @@ class Ecore.Audio.In.Tone (Ecore.Audio.In)
    [[Ecore Audio tone input.]]
    eo_prefix: ecore_audio_obj_in_tone;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.key_data;
+      Efl.Object.constructor;
+      Efl.Object.key_data;
       Ecore.Audio.In.length.set;
       Ecore.Audio.In.seek;
       Ecore.Audio.In.read_internal;
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index bef68c8b46..26b34ae4e5 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -55,10 +55,10 @@ _ecore_audio_volume_get(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Object *obj)
 }
 
 EOLIAN static Eo *
-_ecore_audio_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
+_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
 {
   obj->volume = 1.0;
-  return eo_constructor(eo_super(eo_obj, MY_CLASS));
+  return efl_constructor(eo_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index c69bd2fc74..6f20d43bb5 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double
 
   obj->speed = speed;
 
-  eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
+  efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
 }
 
 EOLIAN static double
@@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
 {
   obj->samplerate = samplerate;
 
-  eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
+  efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
 }
 
 EOLIAN static int
@@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
       len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
       if (len_read == 0) {
           if (!obj->looped || !obj->seekable) {
-              eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
+              efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
           } else {
               ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET);
               len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
-              eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
+              efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
           }
       }
 
@@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
 }
 
 EOLIAN static void
-_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
+_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
@@ -171,9 +171,9 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
 }
 
 EOLIAN static Eo *
-_ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
+_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
 {
-  eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
   obj->speed = 1.0;
 
@@ -181,12 +181,12 @@ _ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
 }
 
 EOLIAN static void
-_ecore_audio_in_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
+_ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
 {
   if(obj->output)
     ecore_audio_obj_out_input_detach(obj->output, eo_obj);
 
-  eo_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio_in.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index 1117a65f14..887ec8b7c0 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -145,7 +145,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
 }
 
 EOLIAN static void
-_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
+_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
   Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
@@ -199,7 +199,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
 }
 
 EOLIAN static void
-_ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
+_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
@@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Da
   if (ea_obj->vio)
     _free_vio(ea_obj);
 
-  eo_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio_in_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index bf89c73c5e..a44387b727 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -83,34 +83,34 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
 }
 
 EOLIAN static void
-_ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val)
+_ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val)
 {
   if (!key) return;
 
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       obj->freq = *(int *)val;
   } else {
-      eo_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
+      efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
   }
 
 }
 
 EOLIAN static void *
-_ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
+_ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
 {
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       return (void *) (intptr_t) obj->freq;
   } else {
-      return eo_key_data_get(eo_super(eo_obj, MY_CLASS), key);
+      return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key);
   }
 }
 
 EOLIAN static Eo *
-_ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
+_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
 {
   Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
 
-  eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
   in_obj->channels = 1;
   in_obj->samplerate = 44100;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
index bf6bee04e8..c7bb60061b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -37,7 +37,7 @@ extern "C"
 /**
  * @brief The frequency of the tone in Hz
  *
- * Set with @ref eo_key_data_set()
+ * Set with @ref efl_key_data_set()
  */
 #define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
 
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index c34245fa49..10e26c5430 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
 }
 
 EOLIAN static void
-_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
+_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
@@ -130,9 +130,9 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
 }
 
 EOLIAN static Eo *
-_ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
+_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
 {
-  eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
   obj->need_writer = EINA_TRUE;
 
@@ -140,7 +140,7 @@ _ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
 }
 
 EOLIAN static void
-_ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
+_ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
 {
   Eina_List *cur, *tmp;
   Eo *in;
@@ -149,7 +149,7 @@ _ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
       ecore_audio_obj_out_input_detach(eo_obj, in);
   }
 
-  eo_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio_out.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
index e3217567a5..91977b80c2 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
@@ -293,7 +293,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
      }
 
    /* Keep track of data for deallocation */
-   eo_key_data_set(input, "coreaudio_data", helper);
+   efl_key_data_set(input, "coreaudio_data", helper);
 
    /* Start playing */
    helper->is_playing = EINA_TRUE;
@@ -325,7 +325,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
 
    DBG("Detach");
    /* Free helper */
-   data = eo_key_data_get(input, "coreaudio_data");
+   data = efl_key_data_get(input, "coreaudio_data");
    _core_audio_helper_free(data);
 
    ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input);
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 e665df7da0..c920f95f89 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -63,7 +63,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
   ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume);
 
   EINA_LIST_FOREACH(out_obj->inputs, input, in) {
-      stream = eo_key_data_get(in, "pulse_data");
+      stream = efl_key_data_get(in, "pulse_data");
       idx = EPA_CALL(pa_stream_get_index)(stream);
       EPA_CALL(pa_operation_unref)(EPA_CALL(pa_context_set_sink_input_volume)(class_vars.context, idx, &pa_volume, NULL, NULL));
   }
@@ -98,7 +98,7 @@ static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event)
   samplerate = ecore_audio_obj_in_samplerate_get(event->object);
   speed = ecore_audio_obj_in_speed_get(event->object);
 
-  stream = eo_key_data_get(event->object, "pulse_data");
+  stream = efl_key_data_get(event->object, "pulse_data");
 
   EPA_CALL(pa_operation_unref)(EPA_CALL(pa_stream_update_sample_rate)(stream, samplerate * speed, NULL, NULL));
 }
@@ -132,9 +132,9 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
       return EINA_FALSE;
   }
 
-  eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj);
+  efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj);
 
-  eo_key_data_set(in, "pulse_data", stream);
+  efl_key_data_set(in, "pulse_data", stream);
 
 
   EPA_CALL(pa_stream_set_write_callback)(stream, _write_cb, in);
@@ -149,7 +149,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
 static void _delayed_attach_cb(void *data, const Eo_Event *event)
 {
   Eo *in = data;
-  eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
+  efl_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
 
   _input_attach_internal(event->object, in);
 }
@@ -161,7 +161,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_
 
   if (class_vars.state != PA_CONTEXT_READY) {
     DBG("Delaying input_attach because PA context is not ready.");
-    eo_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
+    efl_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
   } else {
     retval = _input_attach_internal(eo_obj, in);
   }
@@ -188,7 +188,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
   if (!ret2)
     return EINA_FALSE;
 
-  stream = eo_key_data_get(in, "pulse_data");
+  stream = efl_key_data_get(in, "pulse_data");
 
   EPA_CALL(pa_stream_set_write_callback)(stream, NULL, NULL);
   op = EPA_CALL(pa_stream_drain) (stream, _drain_cb, NULL);
@@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
    if (state == PA_CONTEXT_READY) {
       DBG("PA context ready.");
       EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-         eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
+         efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
       }
    } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
       DBG("PA context fail.");
       EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-         eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
+         efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
       }
    } else {
       DBG("Connection state %i", state);
@@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED)
         }
         // the callback here can delete things in the list..
         EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-           eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
+           efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
         }
         // now unref everything safely
         EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
@@ -262,14 +262,14 @@ static void _state_job(void *data EINA_UNUSED)
 }
 
 EOLIAN static Eo *
-_ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
+_ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
 {
   int argc;
   char **argv;
   Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
   if (!EPA_LOAD()) return NULL;
-  eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
   out_obj->need_writer = EINA_FALSE;
 
@@ -293,10 +293,10 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat
 }
 
 EOLIAN static void
-_ecore_audio_out_pulse_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
+_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
 {
   class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
-  eo_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio_out_pulse.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index 6143b4b02d..fddc898dca 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -162,11 +162,11 @@ _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndf
 }
 
 EOLIAN static Eo *
-_ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
+_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
 {
   Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
-  eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
   ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
 
@@ -176,7 +176,7 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
 }
 
 EOLIAN static void
-_ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
+_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
 {
   Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
@@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_
   if (out_obj->write_idler)
     ecore_idler_del(out_obj->write_idler);
 
-  eo_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio_out_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index f2f1d7c484..4192e73ed5 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -34,8 +34,8 @@ class Ecore.Audio.Out (Ecore.Audio)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Ecore.Audio.vio_set;
    }
 }
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 770aa744cb..b107eefda8 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -4,8 +4,8 @@ class Ecore.Audio.Out.Pulse (Ecore.Audio.Out)
    eo_prefix: ecore_audio_obj_out_pulse;
    event_prefix: ecore_audio_out_pulse;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Ecore.Audio.volume.set;
       Ecore.Audio.Out.input_attach;
       Ecore.Audio.Out.input_detach;
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index d807f654da..510f644f63 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -3,8 +3,8 @@ class Ecore.Audio.Out.Sndfile (Ecore.Audio.Out)
    [[Ecore audio output to the sndfile library.]]
    eo_prefix: ecore_audio_obj_out_sndfile;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Ecore.Audio.source.get;
       Ecore.Audio.source.set;
       Ecore.Audio.format.get;
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index 6cf19a7921..0bccb0ee68 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
 struct _Ecore_Audio_Vio_Internal {
     Ecore_Audio_Vio *vio;
     void *data;
-    eo_key_data_free_func free_func;
+    efl_key_data_free_func free_func;
 };
 typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;
 
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 29fe7311bb..b1b87bf366 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -108,7 +108,7 @@ static void        _ecore_con_lookup_done(void *data,
 static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
 
 #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
-     if (eo_finalized_get(obj)) \
+     if (efl_finalized_get(obj)) \
        { \
           ERR("This function is only allowed during construction."); \
           return; \
@@ -332,7 +332,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n
      return EINA_TRUE;
 
    free(lk);
-   eo_del(obj);
+   efl_del(obj);
    return EINA_FALSE;
 }
 
@@ -367,9 +367,9 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
 }
 
 EOLIAN static Eo *
-_efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
+_efl_network_server_efl_object_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
 {
-   obj = eo_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   obj = efl_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->fd = -1;
    svr->reject_excess_clients = EINA_FALSE;
@@ -380,12 +380,12 @@ _efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Serve
 }
 
 EOLIAN static Eo *
-_efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
+_efl_network_server_efl_object_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
 {
    Ecore_Con_Type compl_type = svr->type;
    Ecore_Con_Type type;
 
-   eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->created = EINA_TRUE;
    svr->ppid = getpid();
@@ -463,7 +463,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
 }
 
 EOLIAN static Eo *
-_efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
+_efl_network_connector_efl_object_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
 {
    Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Type compl_type = svr->type;
@@ -471,7 +471,7 @@ _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNU
 
    /* XXX: We intentionally put SERVER class here and not connector, as we'd
     * like to skip that one. */
-   eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
    svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
    if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
    ecore_event_add(ev, e,
                    _ecore_con_event_server_add_free, NULL);
-   eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
+   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
    _ecore_con_event_count++;
 }
 
@@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
         Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
         event_info.data = e->data;
         event_info.size = e->size;
-        eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
+        efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
      }
    _ecore_con_event_count++;
 }
@@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
    if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
    ecore_event_add(ev, e,
                    (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
-   eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
+   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
    _ecore_con_event_count++;
 }
 
@@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
         Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
         event_info.data = e->data;
         event_info.size = e->size;
-        eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
+        efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
      }
    _ecore_con_event_count++;
 }
@@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
    DBG("%s", error);
    svr->event_count = eina_list_append(svr->event_count, e);
    ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
-   eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
+   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
    _ecore_con_event_count++;
 }
 
@@ -1286,18 +1286,18 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
    cl->event_count = eina_list_append(cl->event_count, e);
    host_server->event_count = eina_list_append(host_server->event_count, e);
    ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
-   eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
+   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
    _ecore_con_event_count++;
 }
 
 static void
 _ecore_con_server_free(Ecore_Con_Server *obj)
 {
-   eo_del(obj);
+   efl_del(obj);
 }
 
 EOLIAN static void
-_efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
+_efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
 {
    Ecore_Con_Client *cl_obj;
    double t_start, t;
@@ -1373,7 +1373,7 @@ _efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
    servers = eina_list_remove(servers, obj);
    svr->data = NULL;
 
-   eo_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   efl_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 end:
    return;
 }
@@ -1381,11 +1381,11 @@ end:
 static void
 _ecore_con_client_free(Ecore_Con_Client *obj)
 {
-   eo_del(obj);
+   efl_del(obj);
 }
 
 EOLIAN static void
-_efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
+_efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
 {
    double t_start, t;
 
@@ -1439,7 +1439,7 @@ _efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
    eina_stringshare_del(cl->ip);
    cl->data = NULL;
 
-   eo_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
+   efl_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
 }
 
 static Eina_Bool
@@ -2130,7 +2130,7 @@ error:
            ecore_event_del(ev);
         }
    }
-   eo_del(obj);
+   efl_del(obj);
    if (clerr || errno) ecore_con_event_server_error(svr_obj, clerr ? : strerror(errno));
    return ECORE_CALLBACK_RENEW;
 }
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 4812d577ba..e1fec9b611 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -577,10 +577,10 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
    EET_DATA_DESCRIPTOR_ADD_MAPPING(pd->matching, name, edd);
 }
 
-EOLIAN static Eo_Base *
-_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
+EOLIAN static Efl_Object *
+_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
+   obj = efl_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
 
    if (!obj) return NULL;
 
@@ -595,7 +595,7 @@ _ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_
 }
 
 EOLIAN static void
-_ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
+_ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
 {
    Ecore_Con_Reply *n;
    Ecore_Con_Eet_Client *c;
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
    ecore_event_handler_del(pd->handler_del);
    ecore_event_handler_del(pd->handler_data);
 
-   eo_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
+   efl_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
 }
 
-EOLIAN static Eo_Base *
-_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
+EOLIAN static Efl_Object *
+_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
+   obj = efl_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
 
    if (!obj) return NULL;
 
@@ -636,7 +636,7 @@ _ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_
 }
 
 EOLIAN static void
-_ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
+_ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
 {
    Ecore_Con_Eet_Server *s;
 
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
    ecore_event_handler_del(pd->handler_del);
    ecore_event_handler_del(pd->handler_data);
 
-   eo_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
+   efl_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
 }
 
-EOLIAN static Eo_Base *
-_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
+EOLIAN static Efl_Object *
+_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
+   obj = efl_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
 
    if (!obj) return NULL;
 
@@ -673,9 +673,9 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 }
 
 EOLIAN static void
-_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
+_ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
-   eo_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
+   efl_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
 
    eet_data_descriptor_free(pd->edd);
    eet_data_descriptor_free(pd->matching);
@@ -683,8 +683,8 @@ _ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
    eina_hash_free(pd->raw_data_callbacks);
 }
 
-EOLIAN static Eo_Base *
-_ecore_con_eet_base_eo_base_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
+EOLIAN static Efl_Object *
+_ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
    if (pd->server) return obj;
 
@@ -742,7 +742,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
 EAPI void
 ecore_con_eet_server_free(Ecore_Con_Eet *r)
 {
-   eo_del(r);
+   efl_del(r);
 }
 
 EAPI void
@@ -918,13 +918,13 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
 EAPI void
 ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
 {
-   eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
+   efl_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
 }
 
 EAPI const void *
 ecore_con_eet_data_get(Ecore_Con_Eet *ece)
 {
-   return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
+   return efl_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
 }
 
 EAPI Ecore_Con_Eet *
diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo
index 4e5527365b..250a78531a 100644
--- a/src/lib/ecore_con/ecore_con_eet_base.eo
+++ b/src/lib/ecore_con/ecore_con_eet_base.eo
@@ -6,7 +6,7 @@ type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; /* FIXME: function poi
 struct @extern Eet.Data.Descriptor;
 struct Ecore.Con.Reply;
 
-class Ecore.Con.Eet.Base (Eo.Base) {
+class Ecore.Con.Eet.Base (Efl.Object) {
    [[Ecore Connection Eet Base class.
    
    This class provides Eet data serialization features to Ecore Connection objects.]]
@@ -90,8 +90,8 @@ class Ecore.Con.Eet.Base (Eo.Base) {
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
 }
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj.eo b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
index 85167369da..a9eb6bb101 100644
--- a/src/lib/ecore_con/ecore_con_eet_client_obj.eo
+++ b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
@@ -3,8 +3,8 @@ class Ecore.Con.Eet.Client.Obj (Ecore.Con.Eet.Base) {
 
    eo_prefix: ecore_con_eet_client_obj;
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
    }
 }
 
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj.eo b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
index 175f0ba57e..d561833ddf 100644
--- a/src/lib/ecore_con/ecore_con_eet_server_obj.eo
+++ b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
@@ -3,8 +3,8 @@ class Ecore.Con.Eet.Server.Obj (Ecore.Con.Eet.Base) {
 
    eo_prefix: ecore_con_eet_server_obj;
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
    }
 }
 
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 1a1e1454d4..4a5dbadc34 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -356,7 +356,7 @@ del_handler_read:
 close_event_read:
    CloseHandle(svr->event_read);
 free_cl:
-   eo_del(cl_obj);
+   efl_del(cl_obj);
 
    return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index df01406bf9..8e3b64f6a4 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -169,7 +169,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
    e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete));
    if (!e)
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -178,7 +178,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
    ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
                    (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
 
-   eo_event_callback_stop(event->object);
+   efl_event_callback_stop(event->object);
 }
 
 static void
@@ -227,15 +227,15 @@ ecore_con_url_new(const char *url)
    Ecore_Con_Url *url_obj;
    url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eo_self, url));
 
-   eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
+   efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
 
    return url_obj;
 }
 
 EOLIAN static Eo *
-_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
+_efl_network_url_efl_object_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
 {
-   url_obj = eo_constructor(eo_super(url_obj, MY_CLASS));
+   url_obj = efl_constructor(eo_super(url_obj, MY_CLASS));
 
    if (!_init_count || !_c_init())
      {
@@ -257,7 +257,7 @@ _efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_D
 }
 
 EOLIAN static Eo *
-_efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
+_efl_network_url_efl_object_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
 {
    CURLcode ret;
 
@@ -335,7 +335,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
     */
    _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
    _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
-   return eo_finalize(eo_super(url_obj, MY_CLASS));
+   return efl_finalize(eo_super(url_obj, MY_CLASS));
 }
 
 EAPI Ecore_Con_Url *
@@ -372,9 +372,9 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
    if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
 
-   eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
+   efl_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
 
-   eo_del(url_obj);
+   efl_del(url_obj);
 }
 
 static void
@@ -393,9 +393,9 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
 }
 
 EOLIAN static void
-_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
+_efl_network_url_efl_object_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
 {
-   eo_destructor(eo_super(url_obj, MY_CLASS));
+   efl_destructor(eo_super(url_obj, MY_CLASS));
 
    if (!_c) return;
    if (url_con->curl_easy)
@@ -1140,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
    e.status = status;
    e.url_con = url_obj;
    url_con->event_count++;
-   eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
+   efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
 }
 
 static void
@@ -1201,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
         e.size = real_size;
         e.data = buffer;
         url_con->event_count++;
-        eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
+        efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
      }
    else
      {
@@ -1260,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
    e.up.total = ultotal;
    e.up.now = ulnow;
    url_con->event_count++;
-   eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
+   efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
 
    return 0;
 }
diff --git a/src/lib/ecore_con/efl_network.eo b/src/lib/ecore_con/efl_network.eo
index 64f88cf7c6..3664b6ff07 100644
--- a/src/lib/ecore_con/efl_network.eo
+++ b/src/lib/ecore_con/efl_network.eo
@@ -29,7 +29,7 @@ enum Ecore.Con.Type
    socket_activate = (1 << 9)
 }
 
-abstract Efl.Network (Eo.Base) {
+abstract Efl.Network (Efl.Object) {
    [[Abstract base class for all EFL.Network classes]]
 
    legacy_prefix: ecore_con;
diff --git a/src/lib/ecore_con/efl_network_client.eo b/src/lib/ecore_con/efl_network_client.eo
index cbe37c55cb..bf3f6c2f32 100644
--- a/src/lib/ecore_con/efl_network_client.eo
+++ b/src/lib/ecore_con/efl_network_client.eo
@@ -13,7 +13,7 @@ class Efl.Network.Client (Efl.Network) {
       }
    }
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Network.ip.get;
       Efl.Network.uptime.get;
       Efl.Network.port.get;
diff --git a/src/lib/ecore_con/efl_network_connector.eo b/src/lib/ecore_con/efl_network_connector.eo
index 1d74547c22..5b3e27e321 100644
--- a/src/lib/ecore_con/efl_network_connector.eo
+++ b/src/lib/ecore_con/efl_network_connector.eo
@@ -3,6 +3,6 @@ class Efl.Network.Connector (Efl.Network.Server) {
    eo_prefix: efl_network_connector_obj;
    data: null;
    implements {
-      Eo.Base.finalize;
+      Efl.Object.finalize;
    }
 }
diff --git a/src/lib/ecore_con/efl_network_server.eo b/src/lib/ecore_con/efl_network_server.eo
index f079e9ceaa..972e262ffa 100644
--- a/src/lib/ecore_con/efl_network_server.eo
+++ b/src/lib/ecore_con/efl_network_server.eo
@@ -76,9 +76,9 @@ class Efl.Network.Server (Efl.Network) {
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
       Efl.Network.ip.get;
       Efl.Network.uptime.get;
       Efl.Network.port.set;
diff --git a/src/lib/ecore_con/efl_network_url.eo b/src/lib/ecore_con/efl_network_url.eo
index 783b18f563..971d6d5fca 100644
--- a/src/lib/ecore_con/efl_network_url.eo
+++ b/src/lib/ecore_con/efl_network_url.eo
@@ -1,4 +1,4 @@
-class Efl.Network.Url (Eo.Base) {
+class Efl.Network.Url (Efl.Object) {
    [[Uniform Resource Locator (URL) base class]]
    eo_prefix: efl_network_url;
    methods {
@@ -15,9 +15,9 @@ class Efl.Network.Url (Eo.Base) {
       }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
-        Eo.Base.finalize;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
+        Efl.Object.finalize;
    }
    events {
       data; [[Triggered when data arrives at the socket.]]
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 5c6bf83129..42007334c1 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3110,7 +3110,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
         a.update_area = *viewport;
      }
 
-   eo_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
+   efl_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
 
    // FIXME: We do not support partial animator in the subcanvas
    EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@@ -3164,7 +3164,7 @@ _ecore_evas_animator_fallback(void *data)
 static void
 _check_animator_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Ecore_Evas *ee = data;
    int i;
 
@@ -3198,7 +3198,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
 static void
 _check_animator_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Ecore_Evas *ee = data;
    int i;
 
@@ -3228,13 +3228,13 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(animator_watch,
-                          { EO_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
-                          { EO_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
+                          { EFL_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
+                          { EFL_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
 
 EAPI void
 _ecore_evas_register_animators(Ecore_Evas *ee)
 {
-   eo_event_callback_array_add(ee->evas, animator_watch(), ee);
+   efl_event_callback_array_add(ee->evas, animator_watch(), ee);
 }
 
 EAPI void
@@ -4328,7 +4328,7 @@ _pointer_position_set(Efl_Event_Pointer_Data *ev, Ecore_Evas *ee, int x, int y,
      EVENT_XY_SET(ev, my, ee->w + fh - mx - 1, fx, fy);
 }
 
-static const Eo_Event_Description *
+static const Efl_Event_Description *
 _event_description_get(Efl_Pointer_Action action)
 {
    switch (action)
@@ -4384,9 +4384,9 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
    ev->pressure = info->multi.pressure;
    ev->angle = info->multi.angle - ee->rotation;
 
-   eo_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_del(evt);
+   efl_del(evt);
 
    return processed;
 }
@@ -4442,9 +4442,9 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
    ev->pressure = info->multi.pressure;
    ev->angle = info->multi.angle - ee->rotation;
 
-   eo_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_del(evt);
+   efl_del(evt);
 
    return processed;
 }
@@ -4474,9 +4474,9 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
    ev->wheel.z = info->z;
    ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
 
-   eo_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_del(evt);
+   efl_del(evt);
 
    return processed;
 }
@@ -4501,9 +4501,9 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
    ev->timestamp = info->timestamp;
    _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
 
-   eo_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
-   eo_del(evt);
+   efl_del(evt);
 
    return processed;
 }
@@ -4551,12 +4551,12 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
    ev->device = NULL; /* FIXME */
 
    if (down)
-     eo_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt);
+     efl_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt);
    else
-     eo_event_callback_call(e, EFL_EVENT_KEY_UP, evt);
+     efl_event_callback_call(e, EFL_EVENT_KEY_UP, evt);
 
    processed = ev->evas_done;
-   eo_del(evt);
+   efl_del(evt);
 
    return processed;
 }
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c
index 25bf3f86e6..81c14d1e81 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.c
@@ -99,10 +99,10 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw
    if (height) *height = pd->base->generic->h;
 }
 
-static Eo_Base *
-_ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
+static Efl_Object *
+_ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    if (!obj) return NULL;
    pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@@ -112,10 +112,10 @@ _ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_
 }
 
 EOLIAN static void
-_ector_cairo_software_surface_eo_base_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
+_ector_cairo_software_surface_efl_object_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
 {
    eo_data_unref(obj, pd->base);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 #include "ector_cairo_software_surface.eo.c"
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo
index 2aaf674ca2..f389a23bb4 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo
@@ -8,7 +8,7 @@ class Ector.Cairo.Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.B
    methods {}
    implements {
       Ector.Buffer.pixels_set;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index 540ce4e825..a06706a90f 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -60,7 +60,7 @@ _ector_cairo_surface_symbol_get(Eo *obj EINA_UNUSED,
 static Ector_Renderer *
 _ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
                                                                 Ector_Cairo_Surface_Data *pd EINA_UNUSED,
-                                                                const Eo_Class *type)
+                                                                const Efl_Class *type)
 {
    if (type == ECTOR_RENDERER_SHAPE_MIXIN)
      return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -115,14 +115,14 @@ _ector_cairo_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
 }
 
 static Eo *
-_ector_cairo_surface_eo_base_constructor(Eo *obj,
+_ector_cairo_surface_efl_object_constructor(Eo *obj,
                                          Ector_Cairo_Surface_Data *pd)
 {
    USE(obj, cairo_destroy, NULL);
    USE(obj, cairo_image_surface_create, NULL);
    USE(obj, cairo_create, NULL);
 
-   obj = eo_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
    if (!obj) return NULL;
 
    _cairo_count++;
@@ -133,10 +133,10 @@ _ector_cairo_surface_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED,
+_ector_cairo_surface_efl_object_destructor(Eo *obj EINA_UNUSED,
                                         Ector_Cairo_Surface_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
 
    if (--_cairo_count) return ;
    if (_cairo_so) eina_module_free(_cairo_so);
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 80b40ff578..4fce1f6a8d 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,6 +1,6 @@
 type @extern cairo_t: void_ptr;
 
-class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
+class Ector.Cairo.Surface (Efl.Object, Ector.Surface)
 {
    [[Ector surface on a cairo backend
 
@@ -28,7 +28,7 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
    implements {
       Ector.Surface.renderer_factory_new;
       Ector.Surface.reference_point.set;
-      Eo.Base.destructor;
-      Eo.Base.constructor;
+      Efl.Object.destructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index eca5d0cc4b..4f97d28777 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -180,9 +180,9 @@ _ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
 }
 
 static Eo *
-_ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
+_ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
    if (!obj) return NULL;
 
    pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
@@ -190,10 +190,10 @@ _ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd
    return obj;
 }
 
-static Eo_Base *
-_ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
+static Efl_Object *
+_ector_renderer_cairo_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
 {
-   obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
+   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
    if (!obj) return NULL;
 
    USE(pd->generic, cairo_matrix_init, NULL);
@@ -213,7 +213,7 @@ _ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
 }
 
 static void
-_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
+_ector_renderer_cairo_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
 {
    Ector_Renderer_Data *base;
 
@@ -223,7 +223,7 @@ _ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
 
    free(pd->m);
 
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
 }
 
 #include "ector_renderer_cairo.eo.c"
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index f9e094fe9c..56a894dd66 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -13,8 +13,8 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
       Ector.Renderer.draw;
       Ector.Renderer.color.set;
       Ector.Renderer.color.get;
-      Eo.Base.constructor;
-      Eo.Base.finalize;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.finalize;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 757d5c8af4..bf8a05d428 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -129,12 +129,12 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
                       gld->end.y - gld->start.y);
 }
 
-static Eo_Base *
-_ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
+static Efl_Object *
+_ector_renderer_cairo_gradient_linear_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
 {
    Ector_Renderer_Data *base;
 
-   obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
+   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
    if (!obj) return NULL;
 
    base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@@ -153,7 +153,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_C
 }
 
 static void
-_ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
+_ector_renderer_cairo_gradient_linear_efl_object_destructor(Eo *obj,
                                                          Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
 {
    Ector_Renderer_Data *base;
@@ -161,7 +161,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
    base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
    eo_data_xunref(base->surface, pd->parent, obj);
 
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
 }
 
 static void
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 0f3fc1d302..ebbf88f056 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc.get;
       Ector.Renderer.Cairo.fill;
-      Eo.Base.finalize;
-      Eo.Base.destructor;
+      Efl.Object.finalize;
+      Efl.Object.destructor;
       Efl.Gfx.Gradient.stop.set;
    }
 }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
index 97d0417fbd..7127dabfb5 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -134,12 +134,12 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNU
                       gld->radius * 2, gld->radius * 2);
 }
 
-static Eo_Base *
-_ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
+static Efl_Object *
+_ector_renderer_cairo_gradient_radial_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
 {
    Ector_Renderer_Data *base;
 
-   obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
+   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
    if (!obj) return NULL;
 
    base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@@ -157,7 +157,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_C
 }
 
 static void
-_ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
+_ector_renderer_cairo_gradient_radial_efl_object_destructor(Eo *obj,
                                                          Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
 {
    Ector_Renderer_Data *base;
@@ -165,7 +165,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
    base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
    eo_data_xunref(base->surface, pd->parent, obj);
 
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
 }
 
 static void
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
index 0df3bc1e81..9d17778bec 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc.get;
       Ector.Renderer.Cairo.fill;
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
       Efl.Gfx.Gradient.stop.set;
    }
 }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 811dc5cac1..9acc36ae25 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -246,9 +246,9 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
 }
 
 Eo *
-_ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
+_ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
 
    if (!obj) return NULL;
 
@@ -256,15 +256,15 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh
    pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
    pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
-   eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
+   efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
 
     return obj;
 }
 
-static Eo_Base *
-_ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
+static Efl_Object *
+_ector_renderer_cairo_shape_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
 {
-   obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
    if (!obj) return NULL;
 
    USE(pd->base, cairo_path_destroy, NULL);
@@ -291,7 +291,7 @@ _ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape
 }
 
 void
-_ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
+_ector_renderer_cairo_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
 {
    Ector_Renderer_Data *base;
 
@@ -305,7 +305,7 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha
    eo_data_xunref(obj, pd->shape, obj);
    eo_data_xunref(obj, pd->base, obj);
 
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
 
    if (pd->path) cairo_path_destroy(pd->path);
 }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 4191ff0feb..917ae5d8e9 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc.get;
       Ector.Renderer.Cairo.fill;
-      Eo.Base.constructor;
-      Eo.Base.finalize;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.finalize;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/ector_renderer.c b/src/lib/ector/ector_renderer.c
index c3df0ff419..cfe0f017c4 100644
--- a/src/lib/ector/ector_renderer.c
+++ b/src/lib/ector/ector_renderer.c
@@ -10,16 +10,16 @@
 #define MY_CLASS ECTOR_RENDERER_CLASS
 
 static void
-_ector_renderer_eo_base_destructor(Eo *obj, Ector_Renderer_Data *pd)
+_ector_renderer_efl_object_destructor(Eo *obj, Ector_Renderer_Data *pd)
 {
    if (pd->m) free(pd->m);
    eo_unref(pd->surface);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
-static Eo_Base *
-_ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd)
+static Efl_Object *
+_ector_renderer_efl_object_finalize(Eo *obj, Ector_Renderer_Data *pd)
 {
    if (!pd->surface)
      {
@@ -27,7 +27,7 @@ _ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd)
         return NULL;
      }
    pd->finalized = EINA_TRUE;
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 static Ector_Surface *
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index c9432bb0fc..b2ac222e7e 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -9,7 +9,7 @@ enum Ector.Quality
    last, [[Sentinel]]
 }
 
-abstract Ector.Renderer (Eo.Base)
+abstract Ector.Renderer (Efl.Object)
 {
    [[Ector renderer abstract interface]]
 
@@ -128,7 +128,7 @@ abstract Ector.Renderer (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
 }
diff --git a/src/lib/ector/ector_renderer_buffer.eo b/src/lib/ector/ector_renderer_buffer.eo
index 477d5ee7cd..27e1eb5c5c 100644
--- a/src/lib/ector/ector_renderer_buffer.eo
+++ b/src/lib/ector/ector_renderer_buffer.eo
@@ -1,4 +1,4 @@
-mixin Ector.Renderer.Buffer (Eo.Interface, Ector.Renderer, Efl.Gfx.Fill)
+mixin Ector.Renderer.Buffer (Efl.Interface, Ector.Renderer, Efl.Gfx.Fill)
 {
    [[Ector buffers have a default fill set to repeat]]
    eo_prefix: ector_renderer_buffer;
diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo
index 8d5ba7b655..da4eea44bd 100644
--- a/src/lib/ector/ector_surface.eo
+++ b/src/lib/ector/ector_surface.eo
@@ -16,9 +16,9 @@ mixin Ector.Surface (Ector.Buffer)
       }
       renderer_factory_new @virtual_pure {
          [[Create a new renderer factory for the given type]]
-         return: Eo.Base; /* FIXME: Should be a more restricted type, only here for cyclic. */
+         return: Efl.Object; /* FIXME: Should be a more restricted type, only here for cyclic. */
          params {
-            @in type: const(Eo.Class) @nonull; /* FIXME: Should probably be a more restricted type */
+            @in type: const(Efl.Class) @nonull; /* FIXME: Should probably be a more restricted type */
          }
       }
    }
diff --git a/src/lib/ector/gl/ector_gl_buffer.eo b/src/lib/ector/gl/ector_gl_buffer.eo
index 7e8c3c8e7b..ea1b327174 100644
--- a/src/lib/ector/gl/ector_gl_buffer.eo
+++ b/src/lib/ector/gl/ector_gl_buffer.eo
@@ -1,4 +1,4 @@
-class Ector.GL.Buffer (Eo.Base, Ector.GL.Buffer.Base)
+class Ector.GL.Buffer (Efl.Object, Ector.GL.Buffer.Base)
 {
    data: null;
 }
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 0998ebde65..7f49aec2e7 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -42,7 +42,7 @@ _shader_free(void *s)
 static Ector_Renderer *
 _ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj,
                                                              Ector_GL_Surface_Data *pd EINA_UNUSED,
-                                                             const Eo_Class *type)
+                                                             const Efl_Class *type)
 {
    if (type == ECTOR_RENDERER_SHAPE_MIXIN)
      return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -327,9 +327,9 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA
 }
 
 static void
-_ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
+_ector_gl_surface_efl_object_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
 
    eina_hash_free(shader_cache);
    shader_cache = NULL;
@@ -337,12 +337,12 @@ _ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNU
    shader_file = NULL;
 }
 
-static Eo_Base *
-_ector_gl_surface_eo_base_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
+static Efl_Object *
+_ector_gl_surface_efl_object_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
 {
    Eina_Strbuf *file_path = NULL;
 
-   obj = eo_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
    if (!obj) return NULL;
 
    if (shader_cache) return obj;
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo
index 24afe906da..8d31f24131 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -30,7 +30,7 @@ class Ector.GL.Surface (Ector.GL.Buffer, Ector.Surface)
    implements {
       Ector.Surface.renderer_factory_new;
       Ector.Surface.reference_point.set;
-      Eo.Base.destructor;
-      Eo.Base.constructor;
+      Efl.Object.destructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/ector/gl/ector_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c
index b3b251ca7a..655f94772b 100644
--- a/src/lib/ector/gl/ector_renderer_gl.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -36,10 +36,10 @@ _ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED,
    return r;
 }
 
-static Eo_Base *
-_ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
+static Efl_Object *
+_ector_renderer_gl_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS));
    if (!obj) return NULL;
 
    pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
@@ -47,7 +47,7 @@ _ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
 }
 
 static void
-_ector_renderer_gl_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
+_ector_renderer_gl_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
 {
    eo_data_xunref(obj, pd->base, obj);
 }
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index c6e0915d51..3a9dcd6671 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -16,7 +16,7 @@ abstract Ector.Renderer.GL (Ector.Renderer)
    implements {
       Ector.Renderer.prepare;
       Ector.Renderer.draw;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
index 7aa2eeb90f..07a9490abb 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -66,10 +66,10 @@ _ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Rendere
    return EINA_TRUE;
 }
 
-static Eo_Base *
-_ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
+static Efl_Object *
+_ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
 
    if (!obj) return NULL;
 
@@ -81,7 +81,7 @@ _ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_G
 }
 
 static void
-_ector_renderer_gl_gradient_linear_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
+_ector_renderer_gl_gradient_linear_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
 {
    eo_data_xunref(obj, pd->base, obj);
    eo_data_xunref(obj, pd->linear, obj);
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
index 67c007849f..9ec8f1ffa7 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc.get;
       Ector.Renderer.GL.fill;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Gfx.Gradient.stop.set;
    }
 }
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
index a16619c8a3..77514f0387 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -79,10 +79,10 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
    return crc;
 }
 
-static Eo_Base *
-_ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
+static Efl_Object *
+_ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
 
    if (!obj) return NULL;
 
@@ -94,7 +94,7 @@ _ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_G
 }
 
 static void
-_ector_renderer_gl_gradient_radial_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
+_ector_renderer_gl_gradient_radial_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
 {
    eo_data_xunref(obj, pd->base, obj);
    eo_data_xunref(obj, pd->radial, obj);
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
index b0446ce720..a03b7c6a51 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc.get;
       Ector.Renderer.GL.fill;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Gfx.Gradient.stop.set;
    }
 }
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 7edc5e9e43..0615ed9bf6 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -138,10 +138,10 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
    return crc;
 }
 
-static Eo_Base *
-_ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
+static Efl_Object *
+_ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
 
    if (!obj) return NULL;
 
@@ -149,13 +149,13 @@ _ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Da
    pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
    pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
-   eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
+   efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
 
    return obj;
 }
 
 static void
-_ector_renderer_gl_shape_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
+_ector_renderer_gl_shape_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
 {
    eo_data_xunref(obj, pd->shape, obj);
    eo_data_xunref(obj, pd->base, obj);
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index 5282898d04..d4f1217bd5 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc.get;
       Ector.Renderer.GL.fill;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.c b/src/lib/ector/software/ector_renderer_software_buffer.c
index e16ec6ee46..2b21e2d89b 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.c
+++ b/src/lib/ector/software/ector_renderer_software_buffer.c
@@ -63,10 +63,10 @@ _ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_S
 }
 
 EOLIAN static void
-_ector_renderer_software_buffer_eo_base_destructor(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
+_ector_renderer_software_buffer_efl_object_destructor(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
 {
    eo_data_xunref(pd->base->surface, pd->surface, obj);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 #include "ector_renderer_software_buffer.eo.c"
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.eo b/src/lib/ector/software/ector_renderer_software_buffer.eo
index 3d189b5a9b..ba7977bbb9 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.eo
+++ b/src/lib/ector/software/ector_renderer_software_buffer.eo
@@ -13,6 +13,6 @@ class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Bu
       Ector.Renderer.prepare;
       Ector.Renderer.crc.get;
       Ector.Renderer.Software.fill;
-      Eo.Base.destructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index d5d5effc5e..8c922a1cec 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -63,10 +63,10 @@ _ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EI
 }
 
 static Eo *
-_ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj,
+_ector_renderer_software_gradient_linear_efl_object_constructor(Eo *obj,
                                                              Ector_Renderer_Software_Gradient_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
    if (!obj) return NULL;
 
    pd->gd  = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
@@ -76,7 +76,7 @@ _ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj,
+_ector_renderer_software_gradient_linear_efl_object_destructor(Eo *obj,
                                                             Ector_Renderer_Software_Gradient_Data *pd)
 {
    Ector_Renderer_Data *base;
@@ -89,7 +89,7 @@ _ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj,
    eo_data_xunref(obj, pd->gd, obj);
    eo_data_xunref(obj, pd->gld, obj);
 
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
 }
 
 void
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 0d63b98b82..136724b40c 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Software.Gradient.Linear (Ector.Renderer.Software, Ector.Re
       Ector.Renderer.draw;
       Ector.Renderer.crc.get;
       Ector.Renderer.Software.fill;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Gfx.Gradient.stop.set;
    }
 }
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
index 1154fea263..031778077b 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -73,10 +73,10 @@ _ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EI
 }
 
 Eo *
-_ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj,
+_ector_renderer_software_gradient_radial_efl_object_constructor(Eo *obj,
                                                              Ector_Renderer_Software_Gradient_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
    pd->gd  = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
    pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
 
@@ -84,7 +84,7 @@ _ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj,
 }
 
 void
-_ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj,
+_ector_renderer_software_gradient_radial_efl_object_destructor(Eo *obj,
                                                             Ector_Renderer_Software_Gradient_Data *pd)
 {
    Ector_Renderer_Data *base;
@@ -97,7 +97,7 @@ _ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj,
    eo_data_xunref(obj, pd->gd, obj);
    eo_data_xunref(obj, pd->gld, obj);
 
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
 }
 
 void
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index c50b754109..bfe992eb08 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Software.Gradient.Radial (Ector.Renderer.Software, Ector.Re
       Ector.Renderer.draw;
       Ector.Renderer.crc.get;
       Ector.Renderer.Software.fill;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Gfx.Gradient.stop.set;
    }
 }
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index 0a3f719498..e9a6e8f5c4 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -692,21 +692,21 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI
 }
 
 static Eo *
-_ector_renderer_software_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
+_ector_renderer_software_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
+   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
    if (!obj) return NULL;
 
    pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
    pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
    pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
-   eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd);
+   efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd);
 
    return obj;
 }
 
 static void
-_ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
+_ector_renderer_software_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
 {
    //FIXME, As base class  destructor can't call destructor of mixin class.
    // call explicit API to free shape data.
@@ -718,7 +718,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa
    eo_data_xunref(pd->base->surface, pd->surface, obj);
    eo_data_xunref(obj, pd->shape, obj);
    eo_data_xunref(obj, pd->base, obj);
-   eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
 }
 
 
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index b8d91fe610..2538f435bc 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Sha
       Ector.Renderer.Software.fill;
       Ector.Renderer.crc.get;
       Efl.Gfx.Shape.path.set;
-      Eo.Base.constructor;
-      Eo.Base.destructor;      
+      Efl.Object.constructor;
+      Efl.Object.destructor;      
    }
 }
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index 65c21c993c..baf8d62015 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
         return;
      }
 
-   eo_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
+   efl_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
    if (!pd->nofree)
      {
         free(pd->pixels.u8);
@@ -332,11 +332,11 @@ _ector_software_buffer_base_ector_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_So
                        : 0);
 }
 
-EOLIAN static Eo_Base *
-_ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED)
+EOLIAN static Efl_Object *
+_ector_software_buffer_efl_object_constructor(Eo *obj, void *data EINA_UNUSED)
 {
    Ector_Software_Buffer_Base_Data *pd;
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    pd->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
    pd->generic->eo = obj;
@@ -344,12 +344,12 @@ _ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED)
 }
 
 EOLIAN static void
-_ector_software_buffer_eo_base_destructor(Eo *obj, void *data EINA_UNUSED)
+_ector_software_buffer_efl_object_destructor(Eo *obj, void *data EINA_UNUSED)
 {
    Ector_Software_Buffer_Base_Data *pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    _ector_software_buffer_base_pixels_clear(obj, pd);
    eo_data_unref(obj, pd->generic);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
    if (pd->internal.maps)
      {
         ERR("Pixel data is still mapped during destroy! Check your code!");
diff --git a/src/lib/ector/software/ector_software_buffer.eo b/src/lib/ector/software/ector_software_buffer.eo
index cfbe1f76d0..27ba690790 100644
--- a/src/lib/ector/software/ector_software_buffer.eo
+++ b/src/lib/ector/software/ector_software_buffer.eo
@@ -1,8 +1,8 @@
-class Ector.Software.Buffer (Eo.Base, Ector.Software.Buffer.Base)
+class Ector.Software.Buffer (Efl.Object, Ector.Software.Buffer.Base)
 {
    data: null;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index ab5fe90b7a..115170b865 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -13,7 +13,7 @@
 static Ector_Renderer *
 _ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
                                                                    Ector_Software_Surface_Data *pd EINA_UNUSED,
-                                                                   const Eo_Class *type)
+                                                                   const Efl_Class *type)
 {
    if (type == ECTOR_RENDERER_SHAPE_MIXIN)
      return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -28,9 +28,9 @@ _ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
 }
 
 static Eo *
-_ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data *pd)
+_ector_software_surface_efl_object_constructor(Eo *obj, Ector_Software_Surface_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    pd->rasterizer = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer));
    ector_software_rasterizer_init(pd->rasterizer);
    pd->rasterizer->fill_data.raster_buffer = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@@ -38,13 +38,13 @@ _ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data
 }
 
 static void
-_ector_software_surface_eo_base_destructor(Eo *obj, Ector_Software_Surface_Data *pd)
+_ector_software_surface_efl_object_destructor(Eo *obj, Ector_Software_Surface_Data *pd)
 {
    ector_software_rasterizer_done(pd->rasterizer);
    eo_data_unref(obj, pd->rasterizer->fill_data.raster_buffer);
    free(pd->rasterizer);
    pd->rasterizer = NULL;
-   eo_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
+   efl_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
 }
 
 static void
diff --git a/src/lib/ector/software/ector_software_surface.eo b/src/lib/ector/software/ector_software_surface.eo
index 3aa560d46e..fd0c174d37 100644
--- a/src/lib/ector/software/ector_software_surface.eo
+++ b/src/lib/ector/software/ector_software_surface.eo
@@ -5,7 +5,7 @@ class Ector.Software.Surface (Ector.Software.Buffer, Ector.Surface)
    implements {
       Ector.Surface.renderer_factory_new;
       Ector.Surface.reference_point.set;
-      Eo.Base.destructor;
-      Eo.Base.constructor;
+      Efl.Object.destructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 64db70911a..d1e015dc7d 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -902,7 +902,7 @@ _edje_recalc_do(Edje *ed)
    if (!ed->calc_only)
      {
         if (ed->recalc_call)
-          eo_event_callback_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL);
+          efl_event_callback_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL);
      }
    else
      evas_object_smart_need_recalculate_set(ed->obj, need_calc);
@@ -3322,11 +3322,11 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
         else
           {
              if (ep->typedata.vector->cur.vg)
-               eo_del(ep->typedata.vector->cur.vg);
+               efl_del(ep->typedata.vector->cur.vg);
 
              _edje_dupe_vector_data(ed, chosen_desc->vg.id, w, h, &ep->typedata.vector->cur);
 
-             eo_parent_set(ep->typedata.vector->cur.vg, root_vg);
+             efl_parent_set(ep->typedata.vector->cur.vg, root_vg);
           }
      }
 }
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 631ee9cd36..9363034e96 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -445,28 +445,28 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
 void
 _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
 {
-   eo_event_callback_array_add(obj, edje_callbacks(), ed);
+   efl_event_callback_array_add(obj, edje_callbacks(), ed);
    evas_object_data_set(obj, "real_part", rp);
 }
 
 void
 _edje_callbacks_del(Evas_Object *obj, Edje *ed)
 {
-   eo_event_callback_array_del(obj, edje_callbacks(), ed);
+   efl_event_callback_array_del(obj, edje_callbacks(), ed);
    evas_object_data_del(obj, "real_part");
 }
 
 void
 _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
 {
-   eo_event_callback_array_add(obj, edje_focus_callbacks(), ed);
+   efl_event_callback_array_add(obj, edje_focus_callbacks(), ed);
    evas_object_data_set(obj, "real_part", rp);
 }
 
 void
 _edje_callbacks_focus_del(Evas_Object *obj, Edje *ed)
 {
-   eo_event_callback_array_del(obj, edje_focus_callbacks(), ed);
+   efl_event_callback_array_del(obj, edje_focus_callbacks(), ed);
    evas_object_data_del(obj, "real_part");
 }
 
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index 7aad0c1e46..592cd35fe0 100644
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -39,7 +39,7 @@ struct _Part_Item_Iterator
 };
 
 #define PROXY_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0)
-#define PROXY_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) eo_del(obj); } } while(0)
+#define PROXY_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) efl_del(obj); } } while(0)
 #define RETURN_VAL(a) do { typeof(a) _ret = a; PROXY_UNREF(obj, pd); return _ret; } while(0)
 #define RETURN_VOID do { PROXY_UNREF(obj, pd); return; } while(0)
 #define PROXY_CALL(a) ({ PROXY_REF(obj, pd); a; })
@@ -49,8 +49,8 @@ struct _Part_Item_Iterator
 #define PROXY_RESET(type) \
    do { if (_ ## type ## _proxy) \
      { \
-        eo_del_intercept_set(_ ## type ## _proxy, NULL); \
-        eo_del(_ ## type ## _proxy); \
+        efl_del_intercept_set(_ ## type ## _proxy, NULL); \
+        efl_del(_ ## type ## _proxy); \
         _ ## type ## _proxy = NULL; \
      } } while (0)
 
@@ -60,14 +60,14 @@ type ## _del_cb(Eo *proxy) \
 { \
    if (_ ## type ## _proxy) \
      { \
-        eo_del_intercept_set(proxy, NULL); \
-        eo_del(proxy); \
+        efl_del_intercept_set(proxy, NULL); \
+        efl_del(proxy); \
         return; \
      } \
-   if (eo_parent_get(proxy)) \
+   if (efl_parent_get(proxy)) \
      { \
         eo_ref(proxy); \
-        eo_parent_set(proxy, NULL); \
+        efl_parent_set(proxy, NULL); \
      } \
    _ ## type ## _proxy = proxy; \
 }
@@ -112,15 +112,15 @@ _efl_canvas_layout_internal_ ## type ## _efl_canvas_layout_internal_real_part_se
    pd->rp = rp; \
    pd->part = part; \
    pd->temp = 1; \
-   eo_del_intercept_set(obj, type ## _del_cb); \
-   eo_parent_set(obj, pd->ed->obj); \
+   efl_del_intercept_set(obj, type ## _del_cb); \
+   efl_parent_set(obj, pd->ed->obj); \
 } \
 \
-EOLIAN static Eo_Base * \
-_efl_canvas_layout_internal_ ## type ## _eo_base_finalize(Eo *obj, datatype *pd) \
+EOLIAN static Efl_Object * \
+_efl_canvas_layout_internal_ ## type ## _efl_object_finalize(Eo *obj, datatype *pd) \
 { \
    EINA_SAFETY_ON_FALSE_RETURN_VAL(pd->rp && pd->ed && pd->part, NULL); \
-   return eo_finalize(eo_super(obj, TYPE ## _CLASS)); \
+   return efl_finalize(eo_super(obj, TYPE ## _CLASS)); \
 }
 
 static Eo *_box_proxy = NULL;
@@ -277,7 +277,7 @@ static void
 _part_item_iterator_free(Part_Item_Iterator *it)
 {
    eina_iterator_free(it->real_iterator);
-   eo_wref_del(it->object, &it->object);
+   efl_wref_del(it->object, &it->object);
    free(it);
 }
 
@@ -296,7 +296,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator)
    it->iterator.next = FUNC_ITERATOR_NEXT(_part_item_iterator_next);
    it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_part_item_iterator_get_container);
    it->iterator.free = FUNC_ITERATOR_FREE(_part_item_iterator_free);
-   eo_wref_add(obj, &it->object);
+   efl_wref_add(obj, &it->object);
 
    return &it->iterator;
 }
@@ -438,7 +438,7 @@ _table_item_iterator_free(Part_Item_Iterator *it)
 {
    eina_iterator_free(it->real_iterator);
    eina_list_free(it->list);
-   eo_wref_del(it->object, &it->object);
+   efl_wref_del(it->object, &it->object);
    free(it);
 }
 
@@ -479,7 +479,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj, Edje_
    pit->iterator.next = FUNC_ITERATOR_NEXT(_table_item_iterator_next);
    pit->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_table_item_iterator_get_container);
    pit->iterator.free = FUNC_ITERATOR_FREE(_table_item_iterator_free);
-   eo_wref_add(obj, &pit->object);
+   efl_wref_add(obj, &pit->object);
 
    RETURN_VAL(&pit->iterator);
 }
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index f704a05626..460a2e9ffb 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -200,14 +200,14 @@ _edje_edit_efl_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const ch
    int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, group);
    if (!int_ret)
      {
-        eo_del(file_obj);
+        efl_del(file_obj);
         return ret;
      }
 
    eed->program_scripts = eina_hash_int32_new((Eina_Free_Cb)_edje_edit_program_script_free);
 
    ef = eet_open(file, EET_FILE_MODE_READ);
-   eo_del(file_obj);
+   efl_del(file_obj);
 
    snprintf(buf, sizeof(buf), "edje/scripts/embryo/source/%i",
             eed->base->collection->id);
@@ -247,17 +247,17 @@ edje_edit_object_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_edje_edit_eo_base_constructor(Eo *obj, Edje_Edit *eed)
+_edje_edit_efl_object_constructor(Eo *obj, Edje_Edit *eed)
 {
    eed->base = eo_data_ref(obj, EDJE_OBJECT_CLASS);
 
-   return eo_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
-_edje_edit_eo_base_destructor(Eo *obj, Edje_Edit *class_data EINA_UNUSED)
+_edje_edit_efl_object_destructor(Eo *obj, Edje_Edit *class_data EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
    eo_data_unref(obj, class_data);
 }
 
@@ -353,7 +353,7 @@ _edje_real_part_free(Edje *ed, Edje_Real_Part *rp)
    if ((rp->type == EDJE_RP_TYPE_SWALLOW) && (rp->typedata.swallow)
        && (rp->typedata.swallow->swallowed_object))
      {
-        eo_parent_set(rp->typedata.swallow->swallowed_object, evas_object_evas_get(ed->obj));
+        efl_parent_set(rp->typedata.swallow->swallowed_object, evas_object_evas_get(ed->obj));
         evas_object_smart_member_del(rp->typedata.swallow->swallowed_object);
         evas_object_event_callback_del(rp->typedata.swallow->swallowed_object,
                                        EVAS_CALLBACK_FREE, _edje_object_part_swallow_free_cb);
@@ -3195,7 +3195,7 @@ _edje_edit_real_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type
         evas_object_layer_set(rp->object, evas_object_layer_get(ed->obj));
         if (ep->type == EDJE_PART_TYPE_SWALLOW)
           {
-             eo_parent_set(rp->object, ed->obj);
+             efl_parent_set(rp->object, ed->obj);
           }
         else if (ep->type != EDJE_PART_TYPE_GROUP)
           {
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index aa0e8e6cb3..32986fe99e 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -8,8 +8,8 @@ class Edje.Edit (Edje.Object)
    legacy_prefix: edje_edit;
    data: Edje_Edit;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_del;
       Efl.File.file.set;
    }
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 59be38a16c..e0e21d3a81 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -258,7 +258,7 @@ edje_file_collection_list(const char *file)
    lst = edje_mmap_collection_list(f);
 
    eina_file_close(f);
-   eo_del(file_obj);
+   efl_del(file_obj);
    return lst;
 }
 
@@ -1792,7 +1792,7 @@ _edje_file_del(Edje *ed)
           free(runp);
      }
    _edje_animators = eina_list_remove(_edje_animators, ed);
-   eo_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
+   efl_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
    ecore_animator_del(ed->animator);
    ed->animator = NULL;
 
@@ -2568,7 +2568,7 @@ _edje_vector_data_free(Edje *ed)
 
    EINA_LIST_FREE(ed->vector_cache, vector)
      {
-        if (vector->vg) eo_del(vector->vg);
+        if (vector->vg) efl_del(vector->vg);
         free(vector);
      }
 }
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index f79b9e62f0..aaec75ae1e 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -10,14 +10,14 @@ static Eina_Bool outfail = EINA_FALSE;
 static void
 _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   eo_del(event->object);
+   efl_del(event->object);
 }
 
 static void
 _out_fail(void *data EINA_UNUSED, const Eo_Event *event)
 {
    outfail = EINA_TRUE;
-   eo_del(event->object);
+   efl_del(event->object);
    out = NULL;
 }
 
@@ -199,13 +199,13 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
              eet_data->vio.tell = eet_snd_file_tell;
              eet_data->offset = 0;
 
-             in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(eo_self, snd_id_str), ecore_audio_obj_in_speed_set(eo_self, speed), ecore_audio_obj_vio_set(eo_self, &eet_data->vio, eet_data, _free), eo_event_callback_add(eo_self, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+             in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(eo_self, snd_id_str), ecore_audio_obj_in_speed_set(eo_self, speed), ecore_audio_obj_vio_set(eo_self, &eet_data->vio, eet_data, _free), efl_event_callback_add(eo_self, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
              if (!out)
                {
 #if HAVE_COREAUDIO
                   out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
 #elif HAVE_PULSE
-                  out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+                  out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
 #endif
                   if (out) outs++;
                }
@@ -216,14 +216,14 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
 #elif HAVE_PULSE
                   ERR("Could not create multisense audio out (pulse)");
 #endif
-                  eo_del(in);
+                  efl_del(in);
                   return EINA_FALSE;
                }
              ret = ecore_audio_obj_out_input_attach(out, in);
              if (!ret)
                {
                   ERR("Could not attach input");
-                  eo_del(in);
+                  efl_del(in);
                   return EINA_FALSE;
                }
           }
@@ -268,16 +268,16 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
           {
              in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
              ecore_audio_obj_name_set(in, "tone");
-             eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value);
+             efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value);
              ecore_audio_obj_in_length_set(in, duration);
-             eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL);
+             efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL);
 
              if (!out)
                {
 #if HAVE_COREAUDIO
                   out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
 #elif HAVE_PULSE
-                  out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+                  out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
 #endif
                   if (out) outs++;
                }
@@ -286,7 +286,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
              if (!ret)
                {
                   ERR("Could not attach input");
-                  eo_del(in);
+                  efl_del(in);
                   return EINA_FALSE;
                }
           }
@@ -334,7 +334,7 @@ _edje_multisense_shutdown(void)
    if (out)
      {
         // XXX: this causes an abort inside of pa!!!!!
-        //eo_del(out);
+        //efl_del(out);
         out = NULL;
         outs = 0;
      }
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 3e3a9ede5d..a251ed9024 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -2037,9 +2037,9 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
       Efl.Canvas.Object.paragraph_direction.set;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 3aa1a76343..1e3c6bddc4 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -433,7 +433,7 @@ _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp)
    ed->actions = eina_list_remove(ed->actions, runp);
    if (!ed->actions)
      {
-        eo_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
+        efl_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
         ecore_animator_del(ed->animator);
         ed->animator = NULL;
      }
@@ -737,7 +737,7 @@ low_mem_current:
              if (!ed->actions)
                {
                   if (ed->canvas_animator)
-                    eo_event_callback_add(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
+                    efl_event_callback_add(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
                   else
                     ed->animator = ecore_animator_add(_edje_animator_cb, ed);
                }
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index f2073da239..b9dd19dfaa 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -25,7 +25,7 @@ edje_object_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_edje_object_eo_base_constructor(Eo *obj, Edje *ed)
+_edje_object_efl_object_constructor(Eo *obj, Edje *ed)
 {
    Eo *parent;
    Evas *e;
@@ -34,11 +34,11 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
    ed->base = eo_data_ref(obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
    ed->duration_scale = 1.0;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    _edje_lib_ref();
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    e = evas_object_evas_get(parent);
    tmp = ecore_evas_ecore_evas_get(e);
 
@@ -48,22 +48,22 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
 }
 
 EOLIAN static void
-_edje_object_eo_base_destructor(Eo *obj, Edje *class_data)
+_edje_object_efl_object_destructor(Eo *obj, Edje *class_data)
 {
    if (class_data->file_obj)
      {
-        eo_del(class_data->file_obj);
+        efl_del(class_data->file_obj);
         class_data->file_obj = NULL;
      }
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
    eo_data_unref(obj, class_data->base);
 }
 
 EOLIAN static void
-_edje_object_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root) EINA_ARG_NONNULL(3)
+_edje_object_efl_object_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Efl_Dbg_Info *root) EINA_ARG_NONNULL(3)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    const char *file, *edje_group;
    efl_file_get(eo_obj, &file, &edje_group);
@@ -372,7 +372,7 @@ _edje_object_efl_file_file_set(Eo *obj, Edje *ed, const char *file, const char *
 
    if (ed->file_obj)
      {
-        eo_del(ed->file_obj);
+        efl_del(ed->file_obj);
         ed->file_obj = NULL;
      }
    if (file)
@@ -388,7 +388,7 @@ _edje_object_efl_file_file_set(Eo *obj, Edje *ed, const char *file, const char *
         f = eina_file_open(file2, EINA_FALSE);
         if (!f)
           {
-             eo_del(ed->file_obj);
+             efl_del(ed->file_obj);
              ed->file_obj = NULL;
              if (ed->path) eina_stringshare_del(ed->path);
              ed->path = NULL;
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 3335e12085..73ee418f1e 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -809,7 +809,7 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
 }
 
 EOLIAN Eina_Bool
-_edje_object_global_color_class_set(Eo_Class *klass EINA_UNUSED, void *pd EINA_UNUSED,
+_edje_object_global_color_class_set(Efl_Class *klass EINA_UNUSED, void *pd EINA_UNUSED,
                                     const char *color_class, Edje_Color_Class_Mode mode, int r, int g, int b, int a)
 {
    Eina_Bool int_ret;
@@ -839,7 +839,7 @@ edje_color_class_get(const char *color_class, int *r, int *g, int *b, int *a, in
 }
 
 EOLIAN Eina_Bool
-_edje_object_global_color_class_get(Eo_Class *klass EINA_UNUSED, void *pd EINA_UNUSED,
+_edje_object_global_color_class_get(Efl_Class *klass EINA_UNUSED, void *pd EINA_UNUSED,
                                     const char *color_class, Edje_Color_Class_Mode mode, int *r, int *g, int *b, int *a)
 {
    Edje_Color_Class *cc;
@@ -5143,7 +5143,7 @@ _edje_child_add(Edje *ed, Edje_Real_Part *rp, Evas_Object *child)
    evas_object_event_callback_add(child, EVAS_CALLBACK_DEL, _edje_child_del_cb, rp);
    evas_object_data_set(child, ".edje", ed);
    if (!ed) return;
-   eo_parent_set(child, ed->obj);
+   efl_parent_set(child, ed->obj);
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
@@ -5155,9 +5155,9 @@ _edje_child_add(Edje *ed, Edje_Real_Part *rp, Evas_Object *child)
 static void
 _eo_unparent_helper(Eo *child, Eo *parent)
 {
-   if (eo_parent_get(child) == parent)
+   if (efl_parent_get(child) == parent)
      {
-        eo_parent_set(child, evas_object_evas_get(parent));
+        efl_parent_set(child, evas_object_evas_get(parent));
      }
 }
 
@@ -6587,7 +6587,7 @@ _edje_real_part_swallow(Edje *ed,
 #endif
    if (!obj_swallow) return;
    rp->typedata.swallow->swallowed_object = obj_swallow;
-   eo_parent_set(obj_swallow, ed->obj);
+   efl_parent_set(obj_swallow, ed->obj);
    evas_object_smart_member_add(rp->typedata.swallow->swallowed_object, ed->obj);
    if (rp->part->clip_to_id >= 0)
      {
diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo b/src/lib/edje/efl_canvas_layout_internal_box.eo
index 5a28833c2f..2dcb0f2a47 100644
--- a/src/lib/edje/efl_canvas_layout_internal_box.eo
+++ b/src/lib/edje/efl_canvas_layout_internal_box.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Canvas.Layout_Internal, Efl.Pack.Linear,
+class Efl.Canvas.Layout_Internal.Box (Efl.Object, Efl.Canvas.Layout_Internal, Efl.Pack.Linear,
                                       Efl.Orientation)
 {
    [[Represents a Box created as part of a layout.
@@ -8,7 +8,7 @@ class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Canvas.Layout_Internal, Efl.P
    ]]
    data: Edje_Box_Data;
    implements {
-      Eo.Base.finalize;
+      Efl.Object.finalize;
       Efl.Canvas.Layout_Internal.real_part.set;
       Efl.Container.content_iterate;
       Efl.Container.content_count;
diff --git a/src/lib/edje/efl_canvas_layout_internal_swallow.eo b/src/lib/edje/efl_canvas_layout_internal_swallow.eo
index dbfc694c6a..3cdcf5ab00 100644
--- a/src/lib/edje/efl_canvas_layout_internal_swallow.eo
+++ b/src/lib/edje/efl_canvas_layout_internal_swallow.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Internal.Swallow (Eo.Base, Efl.Canvas.Layout_Internal, Efl.Container)
+class Efl.Canvas.Layout_Internal.Swallow (Efl.Object, Efl.Canvas.Layout_Internal, Efl.Container)
 {
    [[Represents a SWALLOW part of an Edje object.
 
@@ -7,7 +7,7 @@ class Efl.Canvas.Layout_Internal.Swallow (Eo.Base, Efl.Canvas.Layout_Internal, E
    ]]
    data: Edje_Swallow_Data;
    implements {
-      Eo.Base.finalize;
+      Efl.Object.finalize;
       Efl.Canvas.Layout_Internal.real_part.set;
       Efl.Container.content.get;
       Efl.Container.content.set;
diff --git a/src/lib/edje/efl_canvas_layout_internal_table.eo b/src/lib/edje/efl_canvas_layout_internal_table.eo
index b52a244c42..70879673e9 100644
--- a/src/lib/edje/efl_canvas_layout_internal_table.eo
+++ b/src/lib/edje/efl_canvas_layout_internal_table.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Canvas.Layout_Internal, Efl.Pack.Grid)
+class Efl.Canvas.Layout_Internal.Table (Efl.Object, Efl.Canvas.Layout_Internal, Efl.Pack.Grid)
 {
    [[Represents a Table created as part of a layout.
 
@@ -7,7 +7,7 @@ class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Canvas.Layout_Internal, Efl
    ]]
    data: Edje_Table_Data;
    implements {
-      Eo.Base.finalize;
+      Efl.Object.finalize;
       Efl.Canvas.Layout_Internal.real_part.set;
       Efl.Container.content_iterate;
       Efl.Container.content_count;
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 3a00bb5b28..9ab419c9a7 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -94,8 +94,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 /* Core interface */
 #include "interfaces/efl_animator.eo.h"
 
-EAPI extern const Eo_Event_Description _EFL_GFX_CHANGED;
-EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;
+EAPI extern const Efl_Event_Description _EFL_GFX_CHANGED;
+EAPI extern const Efl_Event_Description _EFL_GFX_PATH_CHANGED;
 
 #define EFL_GFX_CHANGED (&(_EFL_GFX_CHANGED))
 #define EFL_GFX_PATH_CHANGED (&(_EFL_GFX_PATH_CHANGED))
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index 9f2362a3ae..7a5e97ec3c 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -46,7 +46,7 @@ struct _Efl_Event_Pointer_Data
    Efl_Pointer_Flags           button_flags;
    Efl_Event_Flags             event_flags;
    void                       *data; /* evas data - whatever that is */
-   const Eo_Event_Description *event_desc;
+   const Efl_Event_Description *event_desc;
    Eina_Bool                   window_pos; /* true if positions are window-relative
                                               (see input vs. feed: this is "input") */
    Evas_Modifier              *modifiers;
diff --git a/src/lib/efl/interfaces/efl_event.eo b/src/lib/efl/interfaces/efl_event.eo
index 223545f096..25069c6b38 100644
--- a/src/lib/efl/interfaces/efl_event.eo
+++ b/src/lib/efl/interfaces/efl_event.eo
@@ -1,4 +1,4 @@
-import eo_base;
+import efl_object;
 
 interface Efl.Event
 {
@@ -35,7 +35,7 @@ interface Efl.Event
       }
       instance_get @class @protected {
          params {
-            @in owner: Eo.Base;
+            @in owner: Efl.Object;
             @out priv: void*;
          }
          return: Efl.Event;
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c
index d0e3cadda6..bc6a284ca6 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -185,8 +185,8 @@ _efl_gfx_shape_path_set(Eo *obj, Efl_Gfx_Shape_Data *pd,
                                 &pd->current_ctrl.x, &pd->current_ctrl.y);
 
  end:
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -415,8 +415,8 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
    efl_gfx_shape_stroke_dash_set(obj, dash, property_to.dash_length);
    efl_gfx_shape_stroke_cap_set(obj, pos_map < 0.5 ? property_from.c : property_to.c);
    efl_gfx_shape_stroke_join_set(obj, pos_map < 0.5 ? property_from.j : property_to.j);
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -450,8 +450,8 @@ _efl_gfx_shape_reset(Eo *obj, Efl_Gfx_Shape_Data *pd)
    pd->current_ctrl.x = 0;
    pd->current_ctrl.y = 0;
    pd->convex = EINA_FALSE;
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -470,8 +470,8 @@ _efl_gfx_shape_append_move_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
    pd->current.x = x;
    pd->current.y = y;
 
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -490,8 +490,8 @@ _efl_gfx_shape_append_line_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
    pd->current.x = x;
    pd->current.y = y;
 
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -518,8 +518,8 @@ _efl_gfx_shape_append_cubic_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
    pd->current_ctrl.x = ctrl_x1;
    pd->current_ctrl.y = ctrl_y1;
 
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -1098,8 +1098,8 @@ _efl_gfx_shape_append_close(Eo *obj, Efl_Gfx_Shape_Data *pd)
    efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CLOSE,
                      pd, &offset_point);
 
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -1822,8 +1822,8 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
    _efl_gfx_shape_stroke_dash_set(obj, pd, from->public.stroke.dash, from->public.stroke.dash_length);
    _efl_gfx_shape_path_set(obj, pd, from->commands, from->points);
 
-   eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 #include "interfaces/efl_gfx_shape.eo.c"
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo b/src/lib/efl/interfaces/efl_gfx_shape.eo
index 9626361cd3..9cf053cf69 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -167,7 +167,7 @@ mixin Efl.Gfx.Shape
           @since 1.14
         ]]
         params {
-          @in dup_from: const(Eo.Base); [[Shape object from where data will be copied.]]
+          @in dup_from: const(Efl.Object); [[Shape object from where data will be copied.]]
         }
       }
       bounds_get {
@@ -369,15 +369,15 @@ mixin Efl.Gfx.Shape
       interpolate {
         return: bool;
         params {
-          @in from: const(Eo.Base);
-          @in to: const(Eo.Base);
+          @in from: const(Efl.Object);
+          @in to: const(Efl.Object);
           @in pos_map: double;
         }
       }
       equal_commands {
         return: bool;
         params {
-          @in with: const(Eo.Base);
+          @in with: const(Efl.Object);
         }
       }
    }
diff --git a/src/lib/efl/interfaces/efl_input_device.c b/src/lib/efl/interfaces/efl_input_device.c
index ee97b1e5c2..cae988aee7 100644
--- a/src/lib/efl/interfaces/efl_input_device.c
+++ b/src/lib/efl/interfaces/efl_input_device.c
@@ -9,16 +9,16 @@
 
 /* Efl Input Device = Evas Device */
 
-EOLIAN static Eo_Base *
-_efl_input_device_eo_base_constructor(Eo *obj, Efl_Input_Device_Data *pd)
+EOLIAN static Efl_Object *
+_efl_input_device_efl_object_constructor(Eo *obj, Efl_Input_Device_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS));
+   obj = efl_constructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS));
    pd->eo = obj;
    return obj;
 }
 
 EOLIAN static void
-_efl_input_device_eo_base_destructor(Eo *obj, Efl_Input_Device_Data *pd)
+_efl_input_device_efl_object_destructor(Eo *obj, Efl_Input_Device_Data *pd)
 {
    Eo *eo_child;
 
@@ -32,7 +32,7 @@ _efl_input_device_eo_base_destructor(Eo *obj, Efl_Input_Device_Data *pd)
      }
    eo_unref(pd->source);
 
-   return eo_destructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS));
+   return efl_destructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index 1591f61376..28b2fdf187 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -41,7 +41,7 @@ enum Efl.Input.Device.Sub_Class
 /* This represents Evas_Device */
 /* FIXME: no parent, no children and no Evas */
 
-class Efl.Input.Device (Eo.Base)
+class Efl.Input.Device (Efl.Object)
 {
    [[Represents a pointing device, such as a touch finger, a pen or a mouse.
 
@@ -84,7 +84,7 @@ class Efl.Input.Device (Eo.Base)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index d497be9107..b3d4c54486 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -34,11 +34,11 @@
 
 #include "interfaces/efl_screen.eo.c"
 
-EAPI const Eo_Event_Description _EFL_GFX_CHANGED =
-  EO_EVENT_DESCRIPTION("Graphics changed");
+EAPI const Efl_Event_Description _EFL_GFX_CHANGED =
+  EFL_EVENT_DESCRIPTION("Graphics changed");
 
-EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
-  EO_EVENT_DESCRIPTION("Graphics path changed");
+EAPI const Efl_Event_Description _EFL_GFX_PATH_CHANGED =
+  EFL_EVENT_DESCRIPTION("Graphics path changed");
 
 /* Packing & containers */
 #include "interfaces/efl_container.eo.c"
diff --git a/src/lib/efl/interfaces/efl_model.eo b/src/lib/efl/interfaces/efl_model.eo
index 3d8638225f..2799728548 100644
--- a/src/lib/efl/interfaces/efl_model.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -97,7 +97,7 @@ interface Efl.Model ()
                 @in count: uint; [[Range size. If count and start are 0 slice is
                                ignored.]]
             }
-            return: promise<accessor<Eo.Base> >; [[Promise of the children]]
+            return: promise<accessor<Efl.Object> >; [[Promise of the children]]
          }
          children_count_get {
                 [[Get children count.
@@ -124,7 +124,7 @@ interface Efl.Model ()
 
               @since 1.14
             ]]
-            return: Eo.Base;
+            return: Efl.Object;
          }
          child_del {
             [[Remove a child.
@@ -137,7 +137,7 @@ interface Efl.Model ()
               @since 1.14
             ]]
             params {
-               @in child: Eo.Base; [[Child to be removed]]
+               @in child: Efl.Object; [[Child to be removed]]
             }
          }
       }
diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c
index d25d1ff7a5..b5225b7618 100644
--- a/src/lib/efl/interfaces/efl_model_common.c
+++ b/src/lib/efl/interfaces/efl_model_common.c
@@ -94,7 +94,7 @@ efl_model_property_changed_notify(Efl_Model *model, const char *property)
    EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
 
    Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
-   eo_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+   efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
 
 on_error:
    eina_array_free(changed_properties);
@@ -110,7 +110,7 @@ efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
    EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
 
    Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties};
-   eo_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+   efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
 
 on_error:
    eina_array_free(invalidated_properties);
diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo
index e559b90667..7fcebe1595 100644
--- a/src/lib/efl/interfaces/efl_pack_layout.eo
+++ b/src/lib/efl/interfaces/efl_pack_layout.eo
@@ -14,8 +14,8 @@ interface Efl.Pack.Layout ()
          set {}
          get {}
          values {
-            /* FIXME: engine is an Eo.Class */
-            engine: const(Eo.Base); [[Must be an $Efl.Pack.Layout subclass.]]
+            /* FIXME: engine is an Efl.Class */
+            engine: const(Efl.Object); [[Must be an $Efl.Pack.Layout subclass.]]
             data: const(void_ptr);     [[Any data to pass along to $Efl.Pack.Layout.layout_do.
                                       Owned by the caller. Depends on the layout engine.]]
          }
diff --git a/src/lib/efl/interfaces/efl_part.eo b/src/lib/efl/interfaces/efl_part.eo
index 86ddadb865..124dad121e 100644
--- a/src/lib/efl/interfaces/efl_part.eo
+++ b/src/lib/efl/interfaces/efl_part.eo
@@ -1,4 +1,4 @@
-import eo_base;
+import efl_object;
 
 interface Efl.Part
 {
@@ -40,7 +40,7 @@ interface Efl.Part
          params {
             name: string; [[The part name.]]
          }
-         return: Eo.Base; [[A (proxy) object, valid for a single call.]]
+         return: Efl.Object; [[A (proxy) object, valid for a single call.]]
       }
    }
 }
diff --git a/src/lib/efl/interfaces/efl_vpath_core.c b/src/lib/efl/interfaces/efl_vpath_core.c
index 19d846ff49..79532da7d8 100644
--- a/src/lib/efl/interfaces/efl_vpath_core.c
+++ b/src/lib/efl/interfaces/efl_vpath_core.c
@@ -24,14 +24,14 @@ struct _Efl_Vpath_Core_Data
 
 static Efl_Vpath_Core *vpath_core = NULL;
 
-EOLIAN static Eo_Base *
-_efl_vpath_core_eo_base_constructor(Eo *obj, Efl_Vpath_Core_Data *pd)
+EOLIAN static Efl_Object *
+_efl_vpath_core_efl_object_constructor(Eo *obj, Efl_Vpath_Core_Data *pd)
 {
    char buf[PATH_MAX], bufhome[PATH_MAX];
    const char *home, *s;
 
    if (vpath_core) return NULL;
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    pd->meta = eina_hash_string_superfast_new
      ((Eina_Free_Cb)eina_stringshare_del);
    eina_spinlock_new(&(pd->lock));
@@ -206,13 +206,13 @@ _efl_vpath_core_eo_base_constructor(Eo *obj, Efl_Vpath_Core_Data *pd)
 }
 
 EOLIAN static void
-_efl_vpath_core_eo_base_destructor(Eo *obj, Efl_Vpath_Core_Data *pd)
+_efl_vpath_core_efl_object_destructor(Eo *obj, Efl_Vpath_Core_Data *pd)
 {
    eina_hash_free(pd->meta);
    pd->meta = NULL;
    eina_spinlock_free(&(pd->lock));
    if (vpath_core == obj) vpath_core = NULL;
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Efl_Vpath_Core *
diff --git a/src/lib/efl/interfaces/efl_vpath_core.eo b/src/lib/efl/interfaces/efl_vpath_core.eo
index 83746c0a89..9c959c6600 100644
--- a/src/lib/efl/interfaces/efl_vpath_core.eo
+++ b/src/lib/efl/interfaces/efl_vpath_core.eo
@@ -1,4 +1,4 @@
-class Efl.Vpath.Core (Eo.Base, Efl.Vpath)
+class Efl.Vpath.Core (Efl.Object, Efl.Vpath)
 {
    [[ Core EFL implementation of a Vpath system
 
@@ -26,8 +26,8 @@ class Efl.Vpath.Core (Eo.Base, Efl.Vpath)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Vpath.fetch;
    }
 }
diff --git a/src/lib/efl/interfaces/efl_vpath_file.c b/src/lib/efl/interfaces/efl_vpath_file.c
index e62ae1edb9..37613fca11 100644
--- a/src/lib/efl/interfaces/efl_vpath_file.c
+++ b/src/lib/efl/interfaces/efl_vpath_file.c
@@ -41,7 +41,7 @@ _efl_vpath_file_do(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd)
 {
    if (pd->called) return EINA_FALSE;
    pd->called = EINA_TRUE;
-   eo_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
+   efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
    return EINA_TRUE;
 }
 
@@ -52,9 +52,9 @@ _efl_vpath_file_wait(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd EINA_UNUSED)
      {
         pd->called = EINA_TRUE;
         if (pd->result)
-          eo_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
+          efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
         else
-          eo_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL);
+          efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL);
      }
 }
 
diff --git a/src/lib/efl/interfaces/efl_vpath_file.eo b/src/lib/efl/interfaces/efl_vpath_file.eo
index ce82c7ea94..e061a78bf3 100644
--- a/src/lib/efl/interfaces/efl_vpath_file.eo
+++ b/src/lib/efl/interfaces/efl_vpath_file.eo
@@ -1,4 +1,4 @@
-class Efl.Vpath.File (Eo.Base)
+class Efl.Vpath.File (Efl.Object)
 {
    [[ VPath File is an actual representation of a downloaded/mapped vpath file
 
diff --git a/src/lib/efl/interfaces/efl_vpath_file_core.c b/src/lib/efl/interfaces/efl_vpath_file_core.c
index 30c6e0834b..23ce4101d8 100644
--- a/src/lib/efl/interfaces/efl_vpath_file_core.c
+++ b/src/lib/efl/interfaces/efl_vpath_file_core.c
@@ -10,19 +10,19 @@ struct _Efl_Vpath_File_Core_Data
    int dummy;
 };
 
-EOLIAN static Eo_Base *
-_efl_vpath_file_core_eo_base_constructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
+EOLIAN static Efl_Object *
+_efl_vpath_file_core_efl_object_constructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    pd->dummy = 0;
    return obj;
 }
 
 EOLIAN static void
-_efl_vpath_file_core_eo_base_destructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
+_efl_vpath_file_core_efl_object_destructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
 {
    pd->dummy = 0;
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/efl/interfaces/efl_vpath_file_core.eo b/src/lib/efl/interfaces/efl_vpath_file_core.eo
index cee760fb7e..6a627f032e 100644
--- a/src/lib/efl/interfaces/efl_vpath_file_core.eo
+++ b/src/lib/efl/interfaces/efl_vpath_file_core.eo
@@ -6,8 +6,8 @@ class Efl.Vpath.File.Core (Efl.Vpath.File)
    ]]
    eo_prefix: efl_vpath_file_core;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Vpath.File.do;
       Efl.Vpath.File.wait;
    }
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index d3910c880a..df791d26b4 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -54,7 +54,7 @@ static void
 _cb_vpath_del(void *data, const Eo_Event *event)
 {
    efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object);
-   eo_event_callback_del(event->object, EO_EVENT_DEL, _cb_vpath_del, data);
+   efl_event_callback_del(event->object, EFL_EVENT_DEL, _cb_vpath_del, data);
 }
 
 EOLIAN static void
@@ -63,7 +63,7 @@ _efl_vpath_manager_register(Eo *obj, void *pd EINA_UNUSED, int priority, Efl_Vpa
    Efl_Vpath_Manager_Entry *entry = malloc(sizeof(Efl_Vpath_Manager_Entry));
    entry->vpath = vpath;
    entry->priority = priority;
-   eo_event_callback_add(vpath, EO_EVENT_DEL, _cb_vpath_del, obj);
+   efl_event_callback_add(vpath, EFL_EVENT_DEL, _cb_vpath_del, obj);
    vpath_manager.list = eina_list_sorted_insert
      (vpath_manager.list, EINA_COMPARE_CB(_register_sort_cb), entry);
 }
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.eo b/src/lib/efl/interfaces/efl_vpath_manager.eo
index 47f25f6004..4157171050 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.eo
+++ b/src/lib/efl/interfaces/efl_vpath_manager.eo
@@ -1,4 +1,4 @@
-class Efl.Vpath.Manager (Eo.Base)
+class Efl.Vpath.Manager (Efl.Object)
 {
    [[ Vpath Manager manages multiple VPath objects that remap/download
 
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 436f652085..a1f94d485e 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -110,7 +110,7 @@ _file_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error)
 /* Basic listing callbacks */
 
 static Eina_Bool
-_file_ls_filter_cb_helper(const Eo_Event_Description *event, void *data, const char *file)
+_file_ls_filter_cb_helper(const Efl_Event_Description *event, void *data, const char *file)
 {
    Job_Closure *operation = data;
 
@@ -124,7 +124,7 @@ _file_ls_filter_cb_helper(const Eo_Event_Description *event, void *data, const c
    event_info->file = file;
    event_info->filter = EINA_FALSE;
 
-   eo_event_callback_call(operation->pdata->object, event, event_info);
+   efl_event_callback_call(operation->pdata->object, event, event_info);
 
    Eina_Bool filter = event_info->filter;
 
@@ -213,7 +213,7 @@ _file_direct_ls_filter_cb(void *data, Eio_File *handle EINA_UNUSED, const Eina_F
    event_info.info = info;
    event_info.filter = EINA_FALSE;
 
-   eo_event_callback_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info);
+   efl_event_callback_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info);
 
    Eina_Bool filter = event_info.filter;
 
@@ -579,10 +579,10 @@ _efl_io_manager_file_close(Eo *obj,
    operation_data->file = handle;
 }
 
-static Eo_Base*
-_efl_io_manager_eo_base_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
+static Efl_Object*
+_efl_io_manager_efl_object_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
+   obj = efl_constructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
 
    pd->object = obj;
    pd->operations = NULL;
@@ -591,9 +591,9 @@ _efl_io_manager_eo_base_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED
 }
 
 static void
-_efl_io_manager_eo_base_destructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
+_efl_io_manager_efl_object_destructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
+   efl_destructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
 
    // FIXME: cancel all pending promise
 }
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index a89f59dd9b..f41a176757 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -29,7 +29,7 @@ struct Eio.Xattr.Data
 
 // FIXME: We should send list of stuff in progress not single item, callback cost is to high
 
-class Efl.Io.Manager (Eo.Base)
+class Efl.Io.Manager (Efl.Object)
 {
   [[Class representing an asynchronous file operation.]]
 
@@ -144,7 +144,7 @@ class Efl.Io.Manager (Eo.Base)
  }
 
  implements {
-    Eo.Base.constructor;
-    Eo.Base.destructor;
+    Efl.Object.constructor;
+    Efl.Object.destructor;
   }
 }
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 7f11a08d85..4f5ca4667a 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -358,7 +358,7 @@ eio_shutdown(void)
                    EINA_LOG_STATE_START,
                    EINA_LOG_STATE_SHUTDOWN);
 
-   eo_del(io_manager);
+   efl_del(io_manager);
    io_manager = NULL;
 
    EINA_LIST_FOREACH(tracked_thread, l, f)
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index d460199111..00b83c72eb 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -95,7 +95,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
    eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
    evt.changed_properties = properties;
 
-   eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+   efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
    eina_array_free(properties);
 }
 
@@ -180,7 +180,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event)
    eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
    eina_value_flush(&path);
 
-   eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
+   efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
 
    return EINA_TRUE;
 }
@@ -213,7 +213,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event)
              cevt.index = i;
              cevt.child = cur->data;
 
-             eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
+             efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
 
              priv->children_list = eina_list_remove_list(priv->children_list, cur);
              eo_unref(cevt.child);
@@ -649,9 +649,9 @@ _eio_model_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *pri
  * Class definitions
  */
 static Eo *
-_eio_model_eo_base_constructor(Eo *obj, Eio_Model_Data *priv)
+_eio_model_efl_object_constructor(Eo *obj, Eio_Model_Data *priv)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    unsigned int i;
    priv->obj = obj;
    priv->is_listed = priv->is_listing = EINA_FALSE;
@@ -675,7 +675,7 @@ _eio_model_path_set(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, const char *path)
 }
 
 static void
-_eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv)
+_eio_model_efl_object_destructor(Eo *obj , Eio_Model_Data *priv)
 {
    Eo *child;
 
@@ -690,14 +690,14 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv)
      eo_unref(child);
 
    eina_stringshare_del(priv->path);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 
 static Eo *
-_eio_model_eo_base_parent_get(Eo *obj , Eio_Model_Data *priv)
+_eio_model_efl_object_parent_get(Eo *obj , Eio_Model_Data *priv)
 {
-   Eo *model = eo_parent_get(eo_super(obj, MY_CLASS));
+   Eo *model = efl_parent_get(eo_super(obj, MY_CLASS));
 
    if (model == NULL || !eo_isa(model, EFL_MODEL_INTERFACE))
      {
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index b730665fbe..5cbde595a4 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -1,6 +1,6 @@
 type @extern Eio_Filter_Direct_Cb: __undefined_type;
 
-class Eio.Model (Eo.Base, Efl.Model)
+class Eio.Model (Efl.Object, Efl.Model)
 {
     [[Eio model class]]
 
@@ -34,9 +34,9 @@ class Eio.Model (Eo.Base, Efl.Model)
        }
     }
     implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.parent.get;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.parent.get;
       Efl.Model.properties.get;
       Efl.Model.property_set;
       Efl.Model.property_get;
diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c
index c0bf7b1d49..cc3f9429fe 100644
--- a/src/lib/eio/eio_sentry.c
+++ b/src/lib/eio/eio_sentry.c
@@ -28,7 +28,7 @@
 #include "eio_sentry_private.h"
 
 
-static const Eo_Event_Description*
+static const Efl_Event_Description*
 _translate_event(int input_event)
 {
    if (input_event == EIO_MONITOR_FILE_CREATED)
@@ -63,7 +63,7 @@ _handle_event(void *data, int type, void *event)
    EINA_SAFETY_ON_NULL_RETURN_VAL(data, ECORE_CALLBACK_PASS_ON);
    EINA_SAFETY_ON_NULL_RETURN_VAL(event, ECORE_CALLBACK_PASS_ON);
 
-   const Eo_Event_Description* translated_event = _translate_event(type);
+   const Efl_Event_Description* translated_event = _translate_event(type);
    Eio_Sentry_Data *pd = (Eio_Sentry_Data *)data;
    Eio_Monitor_Event *monitor_event = (Eio_Monitor_Event *)event;
 
@@ -73,7 +73,7 @@ _handle_event(void *data, int type, void *event)
    event_info->source = eio_monitor_path_get(monitor_event->monitor);
    event_info->trigger = monitor_event->filename;
 
-   eo_event_callback_call(pd->object, translated_event, event_info);
+   efl_event_callback_call(pd->object, translated_event, event_info);
 
    // If event was error, we must delete the monitor.
    if (type == EIO_MONITOR_ERROR)
@@ -145,9 +145,9 @@ _eio_sentry_del(Eo *obj EINA_UNUSED, Eio_Sentry_Data *pd, const char *path)
    eina_hash_del(pd->targets, path, NULL);
 }
 
-Eo_Base * _eio_sentry_eo_base_constructor(Eo *obj, Eio_Sentry_Data *pd)
+Efl_Object * _eio_sentry_efl_object_constructor(Eo *obj, Eio_Sentry_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, EIO_SENTRY_CLASS));
+   obj = efl_constructor(eo_super(obj, EIO_SENTRY_CLASS));
 
    pd->object = obj;
    pd->targets = eina_hash_string_small_new((Eina_Free_Cb)&eio_monitor_del);
@@ -156,11 +156,11 @@ Eo_Base * _eio_sentry_eo_base_constructor(Eo *obj, Eio_Sentry_Data *pd)
    return obj;
 }
 
-void _eio_sentry_eo_base_destructor(Eo *obj, Eio_Sentry_Data *pd)
+void _eio_sentry_efl_object_destructor(Eo *obj, Eio_Sentry_Data *pd)
 {
    eina_hash_free(pd->targets);
 
-   eo_destructor(eo_super(obj, EIO_SENTRY_CLASS));
+   efl_destructor(eo_super(obj, EIO_SENTRY_CLASS));
 }
 
 #include "eio_sentry.eo.c"
diff --git a/src/lib/eio/eio_sentry.eo b/src/lib/eio/eio_sentry.eo
index 4737e08015..8948358c7c 100644
--- a/src/lib/eio/eio_sentry.eo
+++ b/src/lib/eio/eio_sentry.eo
@@ -7,7 +7,7 @@ struct Eio.Sentry.Event
   source: string; [[The original monitored path.]]
 }
 
-class Eio.Sentry (Eo.Base)
+class Eio.Sentry (Efl.Object)
 {
   [[Monitors files and directories for changes.]]
 
@@ -41,7 +41,7 @@ class Eio.Sentry (Eo.Base)
  }
 
  implements {
-    Eo.Base.constructor;
-    Eo.Base.destructor;
+    Efl.Object.constructor;
+    Efl.Object.destructor;
   }
 }
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index fd6cb7c539..69c0c00c15 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -27,10 +27,10 @@ _eldbus_model_arguments_hash_free(Eina_Value *value)
    eina_value_free(value);
 }
 
-static Eo_Base*
-_eldbus_model_arguments_eo_base_constructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
+static Efl_Object*
+_eldbus_model_arguments_efl_object_constructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->properties_array = NULL;
@@ -58,7 +58,7 @@ _eldbus_model_arguments_constructor(Eo *obj EINA_UNUSED,
 }
 
 static void
-_eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
+_eldbus_model_arguments_efl_object_destructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
 {
    _eldbus_model_arguments_unload(pd);
 
@@ -67,7 +67,7 @@ _eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data
    eina_stringshare_del(pd->name);
    eldbus_proxy_unref(pd->proxy);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
@@ -290,7 +290,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
    if (eina_array_count(changed_properties))
      {
         Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
-        eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+        efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
      }
 
    result = EINA_TRUE;
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 3849fbf7b3..834580a30c 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model.Arguments (Eo.Base, Efl.Model) {
+class Eldbus.Model.Arguments (Efl.Object, Efl.Model) {
     [[Eldbus model arguments class]]
 
     methods {
@@ -23,8 +23,8 @@ class Eldbus.Model.Arguments (Eo.Base, Efl.Model) {
         }
     }
     implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Efl.Model.properties.get;
         Efl.Model.property_set;
         Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index d0ba9394a7..ab3df81544 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -17,10 +17,10 @@ static void _eldbus_model_connection_connect(Eldbus_Model_Connection_Data *);
 static void _eldbus_model_connection_disconnect(Eldbus_Model_Connection_Data *);
 static void _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *);
 
-static Eo_Base*
-_eldbus_model_connection_eo_base_constructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
+static Efl_Object*
+_eldbus_model_connection_efl_object_constructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->is_listed = EINA_FALSE;
@@ -49,13 +49,13 @@ _eldbus_model_connection_constructor(Eo *obj EINA_UNUSED,
 }
 
 static void
-_eldbus_model_connection_eo_base_destructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
+_eldbus_model_connection_efl_object_destructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
 {
    eina_stringshare_del(pd->address);
 
    _eldbus_model_connection_clear(pd);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
@@ -341,7 +341,7 @@ _eldbus_model_connection_names_list_cb(void *data,
    count = eina_list_count(pd->children_list);
 
    if (count)
-     eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
+     efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
 
    pd->is_listed = EINA_TRUE;
 
diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo
index 7aafd1d5e1..8a0a392f3b 100644
--- a/src/lib/eldbus/eldbus_model_connection.eo
+++ b/src/lib/eldbus/eldbus_model_connection.eo
@@ -1,4 +1,4 @@
-class Eldbus.Model.Connection (Eo.Base, Efl.Model) {
+class Eldbus.Model.Connection (Efl.Object, Efl.Model) {
     [[Eldbus model connection class]]
 
     methods {
@@ -32,8 +32,8 @@ class Eldbus.Model.Connection (Eo.Base, Efl.Model) {
         }
     }
     implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Efl.Model.properties.get;
         Efl.Model.property_set;
         Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index 76292ecdad..18ba147a62 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -16,10 +16,10 @@
 
 static void _eldbus_model_method_call_cb(void *, const Eldbus_Message *, Eldbus_Pending *);
 
-static Eo_Base*
-_eldbus_model_method_eo_base_constructor(Eo *obj, Eldbus_Model_Method_Data *pd)
+static Efl_Object*
+_eldbus_model_method_efl_object_constructor(Eo *obj, Eldbus_Model_Method_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->method = NULL;
@@ -95,7 +95,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi
    Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
 
    if (eldbus_model_arguments_process_arguments(args_data, msg, pending))
-     eo_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
+     efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
 }
 
 #include "eldbus_model_method.eo.c"
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index f7c13d03a0..f26bdf953b 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -23,7 +23,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) {
         }
     }
     implements {
-        Eo.Base.constructor;
+        Efl.Object.constructor;
     }
     constructors {
         .constructor;
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index ba6530b15f..e45ae5d6c0 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -22,10 +22,10 @@ static void _eldbus_model_object_introspect_nodes(Eldbus_Model_Object_Data *, co
 static char *_eldbus_model_object_concatenate_path(const char *, const char *);
 static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eldbus_Object *, Eina_List *);
 
-static Eo_Base*
-_eldbus_model_object_eo_base_constructor(Eo *obj, Eldbus_Model_Object_Data *pd)
+static Efl_Object*
+_eldbus_model_object_efl_object_constructor(Eo *obj, Eldbus_Model_Object_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->is_listed = EINA_FALSE;
@@ -81,7 +81,7 @@ _eldbus_model_object_connection_constructor(Eo *obj EINA_UNUSED,
 }
 
 static void
-_eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
+_eldbus_model_object_efl_object_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
 {
    eina_stringshare_del(pd->address);
    eina_stringshare_del(pd->bus);
@@ -89,7 +89,7 @@ _eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
 
    _eldbus_model_object_clear(pd);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo
index 18529fbab5..f02e8bbef7 100644
--- a/src/lib/eldbus/eldbus_model_object.eo
+++ b/src/lib/eldbus/eldbus_model_object.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model.Object (Eo.Base, Efl.Model) {
+class Eldbus.Model.Object (Efl.Object, Efl.Model) {
     [[Eldbus model object class]]
 
     data: Eldbus_Model_Object_Data;
@@ -59,8 +59,8 @@ class Eldbus.Model.Object (Eo.Base, Efl.Model) {
         }
     }
     implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Efl.Model.properties.get;
         Efl.Model.property_set;
         Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 430ccb2282..24ab831b99 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -46,10 +46,10 @@ _eldbus_model_proxy_hash_free(Eina_Value *value)
    eina_value_free(value);
 }
 
-static Eo_Base*
-_eldbus_model_proxy_eo_base_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
+static Efl_Object*
+_eldbus_model_proxy_efl_object_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->object = NULL;
@@ -82,7 +82,7 @@ _eldbus_model_proxy_constructor(Eo *obj EINA_UNUSED,
 }
 
 static void
-_eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
+_eldbus_model_proxy_efl_object_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
 {
    _eldbus_model_proxy_unload(pd);
 
@@ -91,7 +91,7 @@ _eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
    eina_stringshare_del(pd->name);
    eldbus_object_unref(pd->object);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
@@ -620,7 +620,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
           .changed_properties = changed_properties
         };
 
-        eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+        efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
      }
 
    eina_array_free(changed_properties);
@@ -686,7 +686,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
                          .changed_properties = pd->properties_array
                        };
 
-               eo_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+               efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
                efl_model_property_changed_notify(pd->obj, property_set_data->property);
 
            }
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index 7b9363069e..3ee8f0bc1f 100644
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model.Proxy (Eo.Base, Efl.Model) {
+class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
     [[Eldbus model proxy class]]
 
     methods {
@@ -22,8 +22,8 @@ class Eldbus.Model.Proxy (Eo.Base, Efl.Model) {
         }
     }
     implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Efl.Model.properties.get;
         Efl.Model.property_set;
         Efl.Model.property_get;
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 24a69f8c5e..251d6266a8 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -16,10 +16,10 @@ static void _eldbus_model_signal_handler_cb(void *, const Eldbus_Message *);
 static void _eldbus_model_signal_callback_add(Eldbus_Model_Signal_Data *);
 static void _eldbus_model_signal_callback_del(Eldbus_Model_Signal_Data *);
 
-static Eo_Base*
-_eldbus_model_signal_eo_base_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
+static Efl_Object*
+_eldbus_model_signal_efl_object_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
 {
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->handler = NULL;
@@ -43,11 +43,11 @@ _eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
 }
 
 static void
-_eldbus_model_signal_eo_base_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
+_eldbus_model_signal_efl_object_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
 {
    _eldbus_model_signal_callback_del(pd);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 096934b85b..fda4fd8e3b 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -13,8 +13,8 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
         }
     }
     implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
     }
     constructors {
         .constructor;
diff --git a/src/lib/elementary/efl_config_global.eo b/src/lib/elementary/efl_config_global.eo
index ae26b34a7b..c2b833c1cf 100644
--- a/src/lib/elementary/efl_config_global.eo
+++ b/src/lib/elementary/efl_config_global.eo
@@ -1,4 +1,4 @@
-class Efl.Config.Global (Eo.Base, Efl.Config)
+class Efl.Config.Global (Efl.Object, Efl.Config)
 {
    [[This class is a singleton representing the global configuration for the
      running application.
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 98b4daa6c3..fd8309b441 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -29,7 +29,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
    Evas_Object *box = data;
    Evas_Object_Box_Option *opt = event->info;
 
-   eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
+   efl_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
 }
 
 static void
@@ -38,7 +38,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
    Evas_Object *box = data;
    Evas_Object *child = event->info;
 
-   eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
+   efl_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
 }
 
 EOLIAN static Eina_Bool
@@ -151,7 +151,7 @@ EOLIAN static void
 _efl_ui_box_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Data *pd)
 {
    efl_pack_layout_do(pd->layout_engine, obj, pd->layout_data);
-   eo_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
+   efl_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
 }
 
 EOLIAN static void
@@ -168,7 +168,7 @@ _efl_ui_box_efl_pack_layout_layout_do(Eo *klass EINA_UNUSED,
 
 EOLIAN static void
 _efl_ui_box_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Box_Data *pd,
-                                              const Eo_Class *klass, const void *data)
+                                              const Efl_Class *klass, const void *data)
 {
    pd->layout_engine = klass ? klass : eo_class_get(obj);
    pd->layout_data = data;
@@ -178,7 +178,7 @@ _efl_ui_box_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Box_Data *pd,
 
 EOLIAN static void
 _efl_ui_box_efl_pack_layout_layout_engine_get(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd,
-                                              const Eo_Class **klass, const void **data)
+                                              const Efl_Class **klass, const void **data)
 {
    if (klass) *klass = pd->layout_engine;
    if (data) *data = pd->layout_data;
@@ -211,8 +211,8 @@ _efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
    efl_canvas_group_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   eo_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
-   eo_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj);
+   efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
+   efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
    elm_widget_highlight_ignore_set(obj, EINA_TRUE);
@@ -250,10 +250,10 @@ _efl_ui_box_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Box_Data *sd)
 }
 
 EOLIAN static Eo *
-_efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
+_efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
 {
    elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index 79658d77ee..74476a7f1f 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -2,7 +2,7 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
                   Efl.Orientation)
 {
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/elementary/efl_ui_box_flow.c b/src/lib/elementary/efl_ui_box_flow.c
index 2dbc2cbdaa..99042b7a8a 100644
--- a/src/lib/elementary/efl_ui_box_flow.c
+++ b/src/lib/elementary/efl_ui_box_flow.c
@@ -10,9 +10,9 @@ struct _Efl_Ui_Box_Flow_Data
 };
 
 EOLIAN static Eo *
-_efl_ui_box_flow_eo_base_constructor(Eo *obj, Efl_Ui_Box_Flow_Data *pd)
+_efl_ui_box_flow_efl_object_constructor(Eo *obj, Efl_Ui_Box_Flow_Data *pd)
 {
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
    efl_pack_layout_engine_set(obj, MY_CLASS, &pd->params);
    return obj;
 }
@@ -42,7 +42,7 @@ _efl_ui_box_flow_box_flow_max_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Box_Flow_Data
 }
 
 EOLIAN static void
-_efl_ui_box_flow_efl_pack_layout_layout_do(Eo_Class *klass EINA_UNUSED,
+_efl_ui_box_flow_efl_pack_layout_layout_do(Efl_Class *klass EINA_UNUSED,
                                            void *_pd EINA_UNUSED,
                                            Eo *obj, const void *data)
 {
diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo
index ca06e210f5..6deefe432f 100644
--- a/src/lib/elementary/efl_ui_box_flow.eo
+++ b/src/lib/elementary/efl_ui_box_flow.eo
@@ -24,7 +24,7 @@ class Efl.Ui.Box.Flow (Efl.Ui.Box, Efl.Pack.Layout)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Pack.Layout.layout_do;
    }
 }
diff --git a/src/lib/elementary/efl_ui_box_private.h b/src/lib/elementary/efl_ui_box_private.h
index dcff646f11..60ac2658fd 100644
--- a/src/lib/elementary/efl_ui_box_private.h
+++ b/src/lib/elementary/efl_ui_box_private.h
@@ -21,7 +21,7 @@ typedef struct _Box_Item_Iterator Box_Item_Iterator;
 
 struct _Efl_Ui_Box_Data
 {
-   const Eo_Class *layout_engine;
+   const Efl_Class *layout_engine;
    const void *layout_data;
 
    Efl_Orient orient;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 3a59663125..f06d9c5399 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1337,7 +1337,7 @@ _flip(Evas_Object *obj)
           sd->state = sd->next_state;
         _configure(obj);
         _flip_show_hide(obj);
-        eo_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
+        efl_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
 
         // update the new front and back object.
         _update_front_back(obj, sd);
@@ -1521,7 +1521,7 @@ _event_anim(void *data,
    _flip_show_hide(sd->obj);
    _configure(sd->obj);
    sd->animator = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1708,7 +1708,7 @@ _move_cb(void *data,
              evas_smart_objects_calculate(evas_object_evas_get(data));
              _configure(fl);
              // FIXME: end hack
-             eo_event_callback_call(fl, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
+             efl_event_callback_call(fl, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
           }
         else return;
      }
@@ -1869,9 +1869,9 @@ elm_flip_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_efl_ui_flip_eo_base_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
+_efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -1928,7 +1928,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
    evas_smart_objects_calculate(evas_object_evas_get(obj));
    _configure(obj);
    // FIXME: end hack
-   eo_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
+   efl_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
 
    // set focus to the content object when flip go to is called
    if (elm_object_focus_get(obj))
@@ -2254,7 +2254,7 @@ _efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Dat
 }
 
 static void
-_efl_ui_flip_class_constructor(Eo_Class *klass)
+_efl_ui_flip_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index 9792b90270..757eaff306 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -224,7 +224,7 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/efl_ui_flip_internal_part.eo b/src/lib/elementary/efl_ui_flip_internal_part.eo
index 3f95d5fa29..1e0373e491 100644
--- a/src/lib/elementary/efl_ui_flip_internal_part.eo
+++ b/src/lib/elementary/efl_ui_flip_internal_part.eo
@@ -1,8 +1,8 @@
-class Efl.Ui.Flip.Internal.Part (Eo.Base, Efl.Container)
+class Efl.Ui.Flip.Internal.Part (Efl.Object, Efl.Container)
 {
    data: Elm_Part_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content.set;
       Efl.Container.content.get;
       Efl.Container.content_unset;
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 4ce64b0ced..a8de44cbe5 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -111,7 +111,7 @@ _on_recalc_done(void *data,
    EFL_UI_FRAME_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
 
-   eo_event_callback_del
+   efl_event_callback_del
      (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data);
    sd->anim = EINA_FALSE;
 
@@ -131,12 +131,12 @@ _on_frame_clicked(void *data,
 
    if (sd->collapsible)
      {
-        eo_event_callback_add(wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data);
+        efl_event_callback_add(wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data);
         elm_layout_signal_emit(data, "elm,action,toggle", "elm");
         sd->collapsed++;
         sd->anim = EINA_TRUE;
      }
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
@@ -198,9 +198,9 @@ elm_frame_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_efl_ui_frame_eo_base_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
+_efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME);
@@ -246,7 +246,7 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
    if (sd->collapsed == collapse) return;
 
    elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
-   eo_event_callback_call
+   efl_event_callback_call
      (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj);
    sd->collapsed = collapse;
    sd->anim = EINA_TRUE;
@@ -259,7 +259,7 @@ _efl_ui_frame_collapse_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_frame_class_constructor(Eo_Class *klass)
+_efl_ui_frame_class_constructor(Efl_Class *klass)
 {
       evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index db718a45a7..9b8ee095f1 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -53,7 +53,7 @@ class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       class.constructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index a4b6f5b383..1fd7aa78ff 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -18,7 +18,7 @@ struct _Custom_Table_Data
 };
 
 EO_CALLBACKS_ARRAY_DEFINE(subobj_callbacks,
-                          { EO_EVENT_DEL, _subobj_del_cb });
+                          { EFL_EVENT_DEL, _subobj_del_cb });
 
 EOLIAN static Eina_Bool
 _efl_ui_grid_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd EINA_UNUSED)
@@ -127,7 +127,7 @@ _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
 static void
 _layout_updated_emit(Efl_Ui_Grid *obj)
 {
-   eo_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
+   efl_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
 }
 
 static void
@@ -165,11 +165,11 @@ _table_size_hints_changed(void *data, Evas *e EINA_UNUSED,
 /* Custom table class: overrides smart_calculate. */
 static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd);
 
-static const Eo_Op_Description custom_table_op_desc[] = {
+static const Efl_Op_Description custom_table_op_desc[] = {
    EO_OP_CLASS_FUNC_OVERRIDE(efl_canvas_group_calculate, _custom_table_calc),
 };
 
-static const Eo_Class_Description custom_table_class_desc = {
+static const Efl_Class_Description custom_table_class_desc = {
    EO_VERSION, "Efl.Ui.Grid.Internal", EO_CLASS_TYPE_REGULAR,
    EO_CLASS_DESCRIPTION_OPS(custom_table_op_desc), NULL,
    sizeof(Custom_Table_Data), NULL, NULL
@@ -194,7 +194,7 @@ _custom_table_calc(Eo *obj, Custom_Table_Data *pd)
 /* End of custom table class */
 
 EOLIAN static void
-_efl_ui_grid_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Grid_Data *pd, const Eo_Class *engine, const void *data)
+_efl_ui_grid_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Grid_Data *pd, const Efl_Class *engine, const void *data)
 {
    pd->layout_engine = engine ? engine : eo_class_get(obj);
    pd->layout_data = data;
@@ -202,7 +202,7 @@ _efl_ui_grid_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Grid_Data *pd, co
 }
 
 EOLIAN static void
-_efl_ui_grid_efl_pack_layout_layout_engine_get(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, const Eo_Class **engine, const void **data)
+_efl_ui_grid_efl_pack_layout_layout_engine_get(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, const Efl_Class **engine, const void **data)
 {
    if (engine) *engine = pd->layout_engine;
    if (data) *data = pd->layout_data;
@@ -290,9 +290,9 @@ _efl_ui_grid_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSE
 }
 
 EOLIAN static Eo *
-_efl_ui_grid_eo_base_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
+_efl_ui_grid_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
@@ -343,7 +343,7 @@ _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->object, subobj_callbacks(), data);
+   efl_event_callback_array_del(event->object, subobj_callbacks(), data);
    _item_remove(obj, pd, event->object);
 
    if (!elm_widget_sub_object_del(obj, event->object))
@@ -381,7 +381,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj,
 
    if (obj == elm_widget_parent_widget_get(subobj))
      {
-        gi = eo_key_data_get(subobj, GRID_ITEM_KEY);
+        gi = efl_key_data_get(subobj, GRID_ITEM_KEY);
         if (gi)
           {
              gi->col = col;
@@ -406,10 +406,10 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj,
         pd->items = (Grid_Item *)
               eina_inlist_append(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
 
-        eo_key_data_set(subobj, GRID_ITEM_KEY, gi);
+        efl_key_data_set(subobj, GRID_ITEM_KEY, gi);
         elm_widget_sub_object_add(obj, subobj);
-        eo_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
-        eo_event_callback_array_add(subobj, subobj_callbacks(), obj);
+        efl_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
+        efl_event_callback_array_add(subobj, subobj_callbacks(), obj);
      }
 
    return evas_object_table_pack(wd->resize_obj, subobj, col, row, colspan, rowspan);
@@ -438,7 +438,7 @@ _efl_ui_grid_efl_pack_grid_grid_position_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_
         goto end;
      }
 
-   gi = eo_key_data_get(subobj, GRID_ITEM_KEY);
+   gi = efl_key_data_get(subobj, GRID_ITEM_KEY);
    if (gi)
      {
         c = gi->col;
@@ -468,7 +468,7 @@ _efl_ui_grid_efl_pack_grid_grid_content_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_U
 static void
 _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
 {
-   Grid_Item *gi = eo_key_data_get(subobj, GRID_ITEM_KEY);
+   Grid_Item *gi = efl_key_data_get(subobj, GRID_ITEM_KEY);
    Grid_Item *gi2, *last = NULL;
 
    if (!gi)
@@ -514,11 +514,11 @@ _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
      }
 
 end:
-   eo_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj);
+   efl_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj);
    pd->items = (Grid_Item *)
          eina_inlist_remove(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
    pd->count--;
-   eo_key_data_set(subobj, GRID_ITEM_KEY, NULL);
+   efl_key_data_set(subobj, GRID_ITEM_KEY, NULL);
    free(gi);
 }
 
@@ -639,7 +639,7 @@ _efl_ui_grid_efl_pack_grid_grid_contents_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_
    list = evas_object_table_children_get(wd->resize_obj);
    EINA_LIST_FREE(list, sobj)
      {
-        Grid_Item *gi = eo_key_data_get(sobj, GRID_ITEM_KEY);
+        Grid_Item *gi = efl_key_data_get(sobj, GRID_ITEM_KEY);
         if (!gi) continue;
 
         if ((gi->col == col) && (gi->row == row))
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 63d40c5b26..25dd207f9a 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -2,7 +2,7 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout,
                    Efl.Orientation)
 {
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/elementary/efl_ui_grid_private.h b/src/lib/elementary/efl_ui_grid_private.h
index ab2aa85a20..fbefdcd624 100644
--- a/src/lib/elementary/efl_ui_grid_private.h
+++ b/src/lib/elementary/efl_ui_grid_private.h
@@ -29,7 +29,7 @@ struct _Grid_Item
 
 struct _Efl_Ui_Grid_Data
 {
-   const Eo_Class *layout_engine;
+   const Efl_Class *layout_engine;
    const void     *layout_data;
 
    Grid_Item *items;
diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c
index 90130161d3..94f7bf9773 100644
--- a/src/lib/elementary/efl_ui_grid_static.c
+++ b/src/lib/elementary/efl_ui_grid_static.c
@@ -5,11 +5,11 @@
 #define MY_CLASS_NAME_LEGACY "elm_grid"
 
 EOLIAN static Eo *
-_efl_ui_grid_static_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED)
+_efl_ui_grid_static_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
 {
    Efl_Ui_Grid_Data *gd;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
@@ -22,7 +22,7 @@ _efl_ui_grid_static_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_efl_ui_grid_static_efl_pack_layout_layout_do(Eo_Class *klass EINA_UNUSED,
+_efl_ui_grid_static_efl_pack_layout_layout_do(Efl_Class *klass EINA_UNUSED,
                                               void *_pd EINA_UNUSED,
                                               Eo *obj, const void *data EINA_UNUSED)
 {
@@ -37,7 +37,7 @@ _efl_ui_grid_static_efl_pack_layout_layout_do(Eo_Class *klass EINA_UNUSED,
    if (!gd->items) return;
 
    e = evas_object_evas_get(obj);
-   eo_event_freeze(e);
+   efl_event_freeze(e);
 
    efl_gfx_position_get(obj, &x, &y);
    efl_gfx_size_get(obj, &w, &h);
@@ -75,7 +75,7 @@ _efl_ui_grid_static_efl_pack_layout_layout_do(Eo_Class *klass EINA_UNUSED,
         efl_gfx_size_set(gi->object, x2 - x1, y2 - y1);
      }
 
-   eo_event_thaw(e);
+   efl_event_thaw(e);
 }
 
 #include "efl_ui_grid_static.eo.c"
diff --git a/src/lib/elementary/efl_ui_grid_static.eo b/src/lib/elementary/efl_ui_grid_static.eo
index 1514dbb1fd..e2fdd7e442 100644
--- a/src/lib/elementary/efl_ui_grid_static.eo
+++ b/src/lib/elementary/efl_ui_grid_static.eo
@@ -2,7 +2,7 @@ class Efl.Ui.Grid.Static (Efl.Ui.Grid)
 {
    data: null;
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Pack.Layout.layout_do;
    }
 }
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 6410d54dbb..d1e9001346 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -79,7 +79,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!wd->still_in) return;
 
-   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static Eina_Bool
@@ -381,7 +381,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         ERR("Async open failed for an unknown reason.");
         sd->async_failed = EINA_TRUE;
         eina_spinlock_release(&sd->async.lck);
-        eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
+        efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
         return;
      }
 
@@ -411,7 +411,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         sd->async_failed = EINA_FALSE;
         ELM_SAFE_FREE(sd->async.file, eina_stringshare_del);
         ELM_SAFE_FREE(sd->async.key, eina_stringshare_del);
-        eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
+        efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
         _efl_ui_image_internal_sizing_eval(obj, sd);
      }
    else
@@ -419,7 +419,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         // TODO: Implement Efl.File async,error event_info type
         sd->async_failed = EINA_TRUE;
         // keep file,key around for file_get
-        eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
+        efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
      }
 
    // close f, map and free strings
@@ -566,7 +566,7 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj,
         DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj),
               SIG_DND, (char *)drop->data);
 
-        eo_event_callback_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data);
+        efl_event_callback_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data);
         return EINA_TRUE;
      }
 
@@ -748,7 +748,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
 static Eina_Bool
 _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
    return EINA_TRUE;
 }
 
@@ -875,9 +875,9 @@ elm_image_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
+_efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
@@ -978,7 +978,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
 
         free(sd->remote_data);
         sd->remote_data = NULL;
-        eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
+        efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
      }
    else
      {
@@ -988,7 +988,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
              evas_object_image_preload(sd->img, EINA_FALSE);
           }
 
-        eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
+        efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
      }
 
    ELM_SAFE_FREE(sd->key, eina_stringshare_del);
@@ -1001,7 +1001,7 @@ _efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int er
    Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
    Efl_Ui_Image_Error err = { error, EINA_FALSE };
 
-   eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
+   efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
 
    sd->remote = NULL;
    ELM_SAFE_FREE(sd->key, eina_stringshare_del);
@@ -1015,7 +1015,7 @@ _efl_ui_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, doub
 
    progress.now = now;
    progress.total = total;
-   eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
+   efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
 }
 
 static const char *remote_uri[] = {
@@ -1050,7 +1050,7 @@ _efl_ui_image_efl_file_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file
                                         obj);
           if (sd->remote)
             {
-               eo_event_callback_call
+               efl_event_callback_call
                      (obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_START, NULL);
                eina_stringshare_replace(&sd->key, key);
                return EINA_TRUE;
@@ -1411,7 +1411,7 @@ _efl_ui_image_efl_player_play_get(Eo *obj, Efl_Ui_Image_Data *sd)
 }
 
 static void
-_efl_ui_image_class_constructor(Eo_Class *klass)
+_efl_ui_image_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 3b9a8ef7af..ac23147ecd 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -130,7 +130,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
       Efl.File.mmap.set;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 64d4bc21cf..abecff9690 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -357,7 +357,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
 
    char *tmp = efl_canvas_text_range_text_get(obj, en->sel_start, en->sel_end);
 
-   eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
+   efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
 
    free(tmp);
 
@@ -506,7 +506,7 @@ _sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Efl_Canvas_Text_Cursor *obj = data;
 
-   eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
 }
 
 static void
@@ -515,10 +515,10 @@ _sel_init(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Interac
    if (en->have_selection)
       return;
 
-   eo_event_freeze(o);
+   efl_event_freeze(o);
    evas_textblock_cursor_copy(c, en->sel_start);
    evas_textblock_cursor_copy(c, en->sel_end);
-   eo_event_thaw(o);
+   efl_event_thaw(o);
 
    en->have_selection = EINA_FALSE;
    if (en->selection)
@@ -597,7 +597,7 @@ _range_del_emit(Evas_Object *obj, Efl_Canvas_Text_Cursor *cur1, Efl_Canvas_Text_
    tmp = efl_canvas_text_range_text_get(obj, cur1, cur2);
    info.content = tmp;
 
-   eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
+   efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
 
    if (tmp) free(tmp);
 
@@ -628,7 +628,7 @@ _delete_emit(Evas_Textblock_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data *en
    info.length = 1;
    info.content = tmp;
 
-   eo_event_callback_call((Eo *) efl_canvas_text_cursor_text_object_get(c),
+   efl_event_callback_call((Eo *) efl_canvas_text_cursor_text_object_get(c),
          EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
    if (tmp) free(tmp);
 
@@ -821,7 +821,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
 
              _range_del_emit(obj, cur, tc);
 
-             eo_del(tc);
+             efl_del(tc);
           }
         else if ((alt) && (shift))
           {
@@ -859,7 +859,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
 
              _range_del_emit(obj, cur, tc);
 
-             eo_del(tc);
+             efl_del(tc);
           }
         else if (shift)
           {
@@ -1016,7 +1016,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
              info.position = efl_canvas_text_cursor_position_get(cur);
              info.length = eina_unicode_utf8_get_len(string);
 
-             eo_event_callback_call(obj,
+             efl_event_callback_call(obj,
                    EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
 
              efl_canvas_text_cursor_text_insert(cur, string);
@@ -1272,17 +1272,17 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
      }
 }
 
-EOLIAN static Eo_Base *
-_efl_ui_internal_text_interactive_eo_base_constructor(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
+EOLIAN static Efl_Object *
+_efl_ui_internal_text_interactive_efl_object_constructor(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
    en->select_allow = EINA_TRUE;
    en->multiline = EINA_TRUE;
    en->editable = EINA_TRUE;
-   return eo_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(eo_super(obj, MY_CLASS));
 }
 
-EOLIAN static Eo_Base *
-_efl_ui_internal_text_interactive_eo_base_finalize(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
+EOLIAN static Efl_Object *
+_efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FOCUS_IN, _focus_in_cb, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FOCUS_OUT, _focus_out_cb, NULL);
@@ -1294,9 +1294,9 @@ _efl_ui_internal_text_interactive_eo_base_finalize(Eo *obj, Efl_Ui_Internal_Text
    en->sel_start = evas_object_textblock_cursor_new(obj);
    en->sel_end = evas_object_textblock_cursor_new(obj);
 
-   eo_event_callback_add(en->sel_start, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
+   efl_event_callback_add(en->sel_start, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
          _sel_cursor_changed, obj);
-   eo_event_callback_add(en->sel_end, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
+   efl_event_callback_add(en->sel_end, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
          _sel_cursor_changed, obj);
 
    en->input_panel_enable = EINA_TRUE;
@@ -1363,7 +1363,7 @@ _efl_ui_internal_text_interactive_eo_base_finalize(Eo *obj, Efl_Ui_Internal_Text
 #endif
 
 done:
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index 2bd1fd13d5..cca60c2c11 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -5,8 +5,8 @@ class Efl.Ui.Internal.Text.Interactive (Efl.Canvas.Text, Efl.Ui.Text.Interactive
      This object is in charge of processing input, moving the text caret and etc.
    ]]
    implements {
-      Eo.Base.constructor;
-      Eo.Base.finalize;
+      Efl.Object.constructor;
+      Efl.Object.finalize;
       Efl.Ui.Text.Interactive.selection_allowed;
       Efl.Ui.Text.Interactive.selection_cursors.get;
       Efl.Ui.Text.Interactive.multiline;
diff --git a/src/lib/elementary/efl_ui_layout_internal_box.eo b/src/lib/elementary/efl_ui_layout_internal_box.eo
index d8aa6c5a38..a83f6953d2 100644
--- a/src/lib/elementary/efl_ui_layout_internal_box.eo
+++ b/src/lib/elementary/efl_ui_layout_internal_box.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear,
+class Efl.Ui.Layout_Internal.Box (Efl.Object, Efl.Pack.Linear,
                                   Efl.Orientation)
 {
    [[Represents a Box created as part of a layout.
@@ -11,13 +11,13 @@ class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear,
       @property real_part @protected {
          set {}
          values {
-            layout: Eo.Base;
+            layout: Efl.Object;
             part: string;
          }
       }
    }
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content_iterate;
       Efl.Container.content_count;
       Efl.Container.content_remove;
diff --git a/src/lib/elementary/efl_ui_layout_internal_table.eo b/src/lib/elementary/efl_ui_layout_internal_table.eo
index 5e4f8bf54a..df2ebf8883 100644
--- a/src/lib/elementary/efl_ui_layout_internal_table.eo
+++ b/src/lib/elementary/efl_ui_layout_internal_table.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Internal.Table (Eo.Base, Efl.Pack.Grid)
+class Efl.Ui.Layout_Internal.Table (Efl.Object, Efl.Pack.Grid)
 {
    [[Represents a Table created as part of a layout.
 
@@ -10,13 +10,13 @@ class Efl.Ui.Layout_Internal.Table (Eo.Base, Efl.Pack.Grid)
       @property real_part @protected {
          set {}
          values {
-            layout: Eo.Base;
+            layout: Efl.Object;
             part: string;
          }
       }
    }
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content_iterate;
       Efl.Container.content_count;
       Efl.Container.content_remove;
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index b195a5fd09..c8fd3a174a 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -31,10 +31,10 @@ static const Elm_Action key_actions[] = {
    {NULL, NULL}
 };
 
-EOLIAN static Eo_Base *
-_efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
+EOLIAN static Efl_Object *
+_efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    //TODO: Add ATSPI call here
@@ -58,7 +58,7 @@ _state_active(Evas_Object *obj, Efl_Ui_Nstate_Data *sd)
    elm_layout_signal_emit(obj, buf, "elm");
    edje_object_message_signal_process(elm_layout_edje_get(obj));
    elm_obj_layout_sizing_eval(obj);
-   eo_event_callback_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
 }
 
 static void
@@ -177,7 +177,7 @@ _efl_ui_nstate_activate(Eo *obj, Efl_Ui_Nstate_Data *_pd)
 }
 
 EOLIAN static void
-_efl_ui_nstate_class_constructor(Eo_Class *klass)
+_efl_ui_nstate_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
 }
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index bf49059414..ceb294010a 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -32,7 +32,7 @@ class Efl.Ui.Nstate(Elm.Button)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index c1193166de..5dcc078c4c 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -443,7 +443,7 @@ _validate(Evas_Object *obj)
    if (sd->validators == 0) return;
 
    vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
-   res = eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
+   res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
    buf = eina_strbuf_new();
    eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
    edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
@@ -1022,7 +1022,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   eo_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    evas_object_unref(obj);
 
@@ -1034,7 +1034,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
 {
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CURSOR_CHANGED, NULL);
 
    Evas_Coord x, y, w, h;
    Evas_Coord x2, y2, w2, h2;
@@ -1125,7 +1125,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-        eo_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
         _return_key_enabled_check(obj);
@@ -1143,7 +1143,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item
         if (top && top_is_win && sd->input_panel_enable &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-        eo_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 
@@ -1384,7 +1384,7 @@ _paste_cb(Eo *obj)
 
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SELECTION_PASTE, NULL);
 
    sd->selection_asked = EINA_TRUE;
@@ -1449,7 +1449,7 @@ _cut_cb(Eo *obj)
    Efl_Canvas_Text_Cursor *start, *end;
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SELECTION_CUT, NULL);
    /* Store it */
    sd->sel_mode = EINA_FALSE;
@@ -1479,7 +1479,7 @@ _copy_cb(Eo *obj)
 {
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SELECTION_COPY, NULL);
    sd->sel_mode = EINA_FALSE;
    if (!_elm_config->desktop_entry)
@@ -1539,7 +1539,7 @@ _menu_call(Evas_Object *obj)
 
    if (sd->anchor_hover.hover) return;
 
-   eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL);
+   efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL);
 
    if ((sd->api) && (sd->api->obj_longpress))
      {
@@ -1576,7 +1576,7 @@ _menu_call(Evas_Object *obj)
 
         if (top) elm_hoversel_hover_parent_set(sd->hoversel, top);
 
-        eo_event_callback_add
+        efl_event_callback_add
           (sd->hoversel, ELM_HOVERSEL_EVENT_DISMISSED, _hover_dismissed_cb, obj);
         if (sd->have_selection)
           {
@@ -1822,7 +1822,7 @@ _long_press_cb(void *data)
    sd->long_pressed = EINA_TRUE;
 
    sd->longpress_timer = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -2031,7 +2031,7 @@ _mouse_move_cb(void *data,
 
 static void
 _entry_changed_handle(void *data,
-                      const Eo_Event_Description* event)
+                      const Efl_Event_Description* event)
 {
    Evas_Coord minh;
    const char *text;
@@ -2069,7 +2069,7 @@ _entry_changed_handle(void *data,
    /* callback - this could call callbacks that delete the
     * entry... thus... any access to sd after this could be
     * invalid */
-   eo_event_callback_call(data, event, NULL);
+   efl_event_callback_call(data, event, NULL);
 }
 
 static void
@@ -2085,11 +2085,11 @@ _entry_changed_user_signal_cb(void *data,
    if (edje_info)
      {
         memcpy(&info, edje_info, sizeof(info));
-        eo_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, &info);
+        efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, &info);
      }
    else
      {
-        eo_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, NULL);
+        efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, NULL);
      }
    if (_elm_config->atspi_mode)
      {
@@ -2126,7 +2126,7 @@ _entry_undo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EFL_UI_TEXT_EVENT_UNDO_REQUEST, NULL);
+   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_UNDO_REQUEST, NULL);
 }
 
 static void
@@ -2135,7 +2135,7 @@ _entry_redo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EFL_UI_TEXT_EVENT_REDO_REQUEST, NULL);
+   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_REDO_REQUEST, NULL);
 }
 
 static void
@@ -2161,7 +2161,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
                                        const char *emission EINA_UNUSED,
                                        const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
@@ -2220,7 +2220,7 @@ _entry_anchor_down_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_DOWN, &ei);
+     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_DOWN, &ei);
 }
 
 static void
@@ -2243,7 +2243,7 @@ _entry_anchor_up_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_UP, &ei);
+     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_UP, &ei);
 }
 
 static void
@@ -2324,8 +2324,8 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
         ei.hover_right = tmp;
      }
 
-   eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_ANCHOR_HOVER_OPENED, &ei);
-   eo_event_callback_add
+   efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_ANCHOR_HOVER_OPENED, &ei);
+   efl_event_callback_add
      (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
 
    /* FIXME: Should just check if there's any callback registered to
@@ -2364,7 +2364,7 @@ _entry_anchor_clicked_signal_cb(void *data,
 
    if (!sd->disabled)
      {
-        eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_CLICKED, &ei);
+        efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_CLICKED, &ei);
         _entry_hover_anchor_clicked_do(data, &ei);
      }
 }
@@ -2394,7 +2394,7 @@ _entry_anchor_in_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_IN, &ei);
+     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_IN, &ei);
 }
 
 static void
@@ -2414,7 +2414,7 @@ _entry_anchor_out_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_OUT, &ei);
+     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_OUT, &ei);
 }
 
 static void
@@ -2423,7 +2423,7 @@ _entry_key_enter_signal_cb(void *data,
                            const char *emission EINA_UNUSED,
                            const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ACTIVATED, NULL);
+   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ACTIVATED, NULL);
 }
 
 static void
@@ -2432,7 +2432,7 @@ _entry_key_escape_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EFL_UI_TEXT_EVENT_ABORTED, NULL);
+   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ABORTED, NULL);
 }
 
 static void
@@ -2441,7 +2441,7 @@ _entry_mouse_down_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EFL_UI_TEXT_EVENT_PRESS, NULL);
+   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_PRESS, NULL);
 }
 
 static void
@@ -2450,7 +2450,7 @@ _entry_mouse_clicked_signal_cb(void *data,
                                const char *emission EINA_UNUSED,
                                const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
@@ -2460,7 +2460,7 @@ _entry_mouse_double_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
 }
 
@@ -2470,7 +2470,7 @@ _entry_mouse_triple_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
 }
 
@@ -2623,7 +2623,7 @@ _text_append_idler(void *data)
         free(sd->append_text_left);
         sd->append_text_left = NULL;
         sd->append_text_idler = NULL;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
         return ECORE_CALLBACK_CANCEL;
      }
@@ -2783,7 +2783,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
                }
              edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
                    EDJE_CURSOR_MAIN, sd->cursor_pos);
-             eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
+             efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
           }
      }
 }
@@ -3205,7 +3205,7 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
     * trigger a layout_sizing_eval call and requires the canvas text object to
     * be instantiated. */
    text_obj = eo_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
-   eo_composite_attach(obj, text_obj);
+   efl_composite_attach(obj, text_obj);
 
    efl_canvas_group_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
@@ -3236,13 +3236,13 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
    evas_object_size_hint_align_set
       (priv->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
    efl_canvas_text_style_set(text_obj, NULL, "DEFAULT='font=Sans font_size=14 color=#fff wrap=word'");
-   eo_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
+   efl_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
          _efl_ui_text_changed_cb, obj);
-   eo_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
+   efl_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
          _efl_ui_text_changed_cb, obj);
-   eo_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
+   efl_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
          _efl_ui_text_selection_changed_cb, obj);
-   eo_event_callback_add(efl_canvas_text_cursor_get(text_obj), EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
+   efl_event_callback_add(efl_canvas_text_cursor_get(text_obj), EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
          _efl_ui_text_cursor_changed_cb, obj);
    evas_object_event_callback_add(priv->entry_edje, EVAS_CALLBACK_MOVE,
          _efl_ui_text_move_cb, obj);
@@ -3480,13 +3480,13 @@ _efl_ui_text_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Text_Data *sd)
      }
 
    text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
-   eo_event_callback_del(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
+   efl_event_callback_del(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
          _efl_ui_text_changed_cb, obj);
-   eo_event_callback_del(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
+   efl_event_callback_del(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
          _efl_ui_text_changed_cb, obj);
-   eo_event_callback_del(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
+   efl_event_callback_del(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
          _efl_ui_text_selection_changed_cb, obj);
-   eo_event_callback_del(efl_canvas_text_cursor_get(text_obj), EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
+   efl_event_callback_del(efl_canvas_text_cursor_get(text_obj), EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED,
          _efl_ui_text_cursor_changed_cb, obj);
    evas_object_event_callback_del_full(sd->entry_edje, EVAS_CALLBACK_MOVE,
          _efl_ui_text_move_cb, obj);
@@ -3556,7 +3556,7 @@ _efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd E
 static void
 _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->info;
+   const Efl_Callback_Array_Item *event = ev->info;
 
    EFL_UI_TEXT_DATA_GET(ev->object, sd);
    if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE)
@@ -3566,7 +3566,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 static void
 _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->info;
+   const Efl_Callback_Array_Item *event = ev->info;
 
    EFL_UI_TEXT_DATA_GET(ev->object, sd);
    if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE)
@@ -3576,24 +3576,24 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 }
 
 EOLIAN static Eo *
-_efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
+_efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
    efl_ui_text_interactive_editable_set(obj, EINA_FALSE);
 
    return obj;
 }
 
 EOLIAN static void
-_efl_ui_text_eo_base_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd)
+_efl_ui_text_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd)
 {
    ecore_job_del(pd->deferred_decoration_job);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -3723,7 +3723,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
         edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
      }
    if (sd->have_selection)
-     eo_event_callback_call
+     efl_event_callback_call
        (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
 
    sd->have_selection = EINA_FALSE;
@@ -3937,7 +3937,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
 {
    EFL_UI_TEXT_DATA_GET(obj, sd);
    /* here we need to emit the signal that the elm_scroller would have done */
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 
    if (sd->have_selection)
@@ -4283,7 +4283,7 @@ _efl_ui_text_elm_widget_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Elm
    if (!elm_widget_disabled_get(obj) &&
        !evas_object_freeze_events_get(obj))
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_CLICKED, NULL);
         if (sd->editable && sd->input_panel_enable)
           edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
@@ -4304,7 +4304,7 @@ _efl_ui_text_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_T
 }
 
 static void
-_efl_ui_text_class_constructor(Eo_Class *klass)
+_efl_ui_text_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -5049,7 +5049,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
         rect = eina_list_data_get(l);
         if (rect)
           {
-             if (rect->obj_bg) eo_del(rect->obj_bg);
+             if (rect->obj_bg) efl_del(rect->obj_bg);
              free(rect);
           }
         sd->rects = eina_list_remove_list(sd->rects, l);
@@ -5255,8 +5255,8 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd)
    efl_canvas_text_cursor_paragraph_last(end);
 
    it = efl_canvas_text_range_annotations_get(obj, start, end);
-   eo_del(start);
-   eo_del(end);
+   efl_del(start);
+   efl_del(end);
 
    /* Add 'item' type of annotations. */
    while ((item = _anchor_next_get(obj, it, &x, &y, &w, &h)))
@@ -5468,9 +5468,9 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
 #define MY_CLASS EFL_UI_TEXT_EDITABLE_CLASS
 
 EOLIAN static Eo *
-_efl_ui_text_editable_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
+_efl_ui_text_editable_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_ui_text_interactive_editable_set(obj, EINA_TRUE);
 
    return obj;
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 58260570e2..25f62b37ce 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -368,8 +368,8 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/efl_ui_text_editable.eo b/src/lib/elementary/efl_ui_text_editable.eo
index 1abbcc1d5f..e801b1ba4a 100644
--- a/src/lib/elementary/efl_ui_text_editable.eo
+++ b/src/lib/elementary/efl_ui_text_editable.eo
@@ -2,6 +2,6 @@ class Efl.Ui.Text.Editable (Efl.Ui.Text)
 {
    data: null;
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 50bb003432..1112114928 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -253,11 +253,11 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv)
 
    elm_layout_content_set(obj, "elm.swallow.video", priv->emotion);
 
-   eo_event_callback_array_add(priv->emotion, _video_cb(), obj);
+   efl_event_callback_array_add(priv->emotion, _video_cb(), obj);
 
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL);
-   eo_composite_attach(obj, priv->emotion);
+   efl_composite_attach(obj, priv->emotion);
 
    priv->timer = ecore_timer_add(20.0, _suspend_cb, obj);
 }
@@ -280,9 +280,9 @@ elm_video_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_efl_ui_video_eo_base_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED)
+_efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
@@ -394,7 +394,7 @@ _efl_ui_video_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_
 }
 
 EOLIAN static void
-_efl_ui_video_class_constructor(Eo_Class *klass)
+_efl_ui_video_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index 5dc0aad55b..d0ffab435c 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -61,7 +61,7 @@ class Efl.Ui.Video (Elm.Layout, Efl.File,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index be5de246a2..5560e5f18d 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -65,7 +65,7 @@ static const Elm_Win_Trap *trap = NULL;
          {                                                      \
             edje_object_signal_emit(cursd->edje, \
                         "elm,action,hide_blocker", "elm");      \
-            eo_event_callback_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
+            efl_event_callback_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
          }                                                      \
     }
 
@@ -81,7 +81,7 @@ static const Elm_Win_Trap *trap = NULL;
          {                                                      \
             edje_object_signal_emit(cursd->edje, \
                              "elm,action,show_blocker", "elm"); \
-            eo_event_callback_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
+            efl_event_callback_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
          }                                                      \
     }
 
@@ -840,7 +840,7 @@ _elm_win_move(Ecore_Evas *ee)
    ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
    sd->screen.x = x;
    sd->screen.y = y;
-   eo_event_callback_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
+   efl_event_callback_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
    evas_nochange_push(evas_object_evas_get(sd->obj));
    sd->response++;
    evas_object_move(sd->obj, x, y);
@@ -1290,7 +1290,7 @@ _elm_win_profile_update(Efl_Ui_Win_Data *sd)
    EINA_LIST_FOREACH(sub, l, ee2)
      ecore_evas_window_profile_set(ee2, sd->profile.name);
 
-   eo_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
+   efl_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
 }
 
 #ifdef HAVE_ELEMENTARY_WL2
@@ -1443,16 +1443,16 @@ _elm_win_state_change(Ecore_Evas *ee)
    if ((ch_withdrawn) || (ch_iconified))
      {
         if (sd->withdrawn)
-          eo_event_callback_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL);
+          efl_event_callback_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL);
         else if (sd->iconified)
           {
-             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
+             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_minimized_signal_emit(obj);
           }
         else
           {
-             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
+             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1460,9 +1460,9 @@ _elm_win_state_change(Ecore_Evas *ee)
    if (ch_sticky)
      {
         if (sd->sticky)
-          eo_event_callback_call(obj, EFL_UI_WIN_EVENT_STICK, NULL);
+          efl_event_callback_call(obj, EFL_UI_WIN_EVENT_STICK, NULL);
         else
-          eo_event_callback_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL);
+          efl_event_callback_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL);
      }
    if (ch_fullscreen)
      {
@@ -1486,7 +1486,7 @@ _elm_win_state_change(Ecore_Evas *ee)
              if (need_frame)
                sd->wl.opaque_dirty = 1;
 #endif
-             eo_event_callback_call
+             efl_event_callback_call
                (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL);
           }
         else
@@ -1498,7 +1498,7 @@ _elm_win_state_change(Ecore_Evas *ee)
                   _elm_win_frame_obj_update(sd);
                }
 #endif
-             eo_event_callback_call
+             efl_event_callback_call
                (obj, EFL_UI_WIN_EVENT_UNFULLSCREEN, NULL);
           }
      }
@@ -1506,13 +1506,13 @@ _elm_win_state_change(Ecore_Evas *ee)
      {
         if (sd->maximized)
           {
-             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
+             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_maximized_signal_emit(obj);
           }
         else
           {
-             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
+             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1531,9 +1531,9 @@ _elm_win_state_change(Ecore_Evas *ee)
         _elm_win_xwin_update(sd);
 #endif
         elm_widget_orientation_set(obj, sd->rot);
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_WIN_EVENT_WM_ROTATION_CHANGED, NULL);
      }
 }
@@ -1675,7 +1675,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
    if (evas_focus_get(evas_object_evas_get(win)) == win)
      return;
 
-   eo_event_callback_call(win, ev->desc, evt);
+   efl_event_callback_call(win, ev->desc, evt);
 }
 
 static void
@@ -1689,7 +1689,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
    if (!evdata || evdata->win_fed)
      return;
 
-   eo_event_callback_call(win, ev->desc, evt);
+   efl_event_callback_call(win, ev->desc, evt);
 }
 
 /* feed events from the window to evas - for fake inputs */
@@ -1708,7 +1708,7 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
      return;
    evdata->win_fed = EINA_TRUE;
 
-   eo_event_callback_call(evas, ev->desc, evt);
+   efl_event_callback_call(evas, ev->desc, evt);
    evdata->win_fed = EINA_FALSE;
    evdata->evas_done = EINA_FALSE;
 }
@@ -1728,7 +1728,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
      return;
    evdata->win_fed = EINA_TRUE;
 
-   eo_event_callback_call(evas, ev->desc, evt);
+   efl_event_callback_call(evas, ev->desc, evt);
    evdata->win_fed = EINA_FALSE;
    evdata->evas_done = EINA_FALSE;
 }
@@ -1753,7 +1753,7 @@ _elm_win_evas_render_post(void *data,
    Efl_Gfx_Event_Render_Post *ev = event_info;
    Eo *win = data;
 
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
 }
 
 static void
@@ -1765,7 +1765,7 @@ _elm_win_evas_render_pre(void *data,
    Eo *win = data;
 
    _elm_win_throttle_ok = EINA_TRUE;
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
 }
 
 static void
@@ -1777,7 +1777,7 @@ _elm_win_evas_focus_in(void *data,
    Eo *win = data;
 
    _elm_win_throttle_ok = EINA_TRUE;
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
 }
 
 static void
@@ -1788,7 +1788,7 @@ _elm_win_evas_focus_out(void *data,
 {
    Eo *win = data;
 
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
 }
 
 static void
@@ -1801,7 +1801,7 @@ _elm_win_evas_object_focus_in(void *data,
    Eo *win = data;
 
    _elm_win_throttle_ok = EINA_TRUE;
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
 }
 
 static void
@@ -1813,7 +1813,7 @@ _elm_win_evas_object_focus_out(void *data,
    Eo *object = event_info;
    Eo *win = data;
 
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
 }
 
 static void
@@ -1825,13 +1825,13 @@ _elm_win_evas_device_changed(void *data,
    Eo *device = event_info;
    Eo *win = data;
 
-   eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
+   efl_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
 }
 
 static void
 _win_event_add_cb(void *data, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *array = ev->info;
+   const Efl_Callback_Array_Item *array = ev->info;
    Efl_Ui_Win_Data *sd = data;
    Efl_Ui_Win *win = ev->object;
    int i;
@@ -1841,55 +1841,55 @@ _win_event_add_cb(void *data, const Eo_Event *ev)
         if (ev->info == EFL_EVENT_POINTER_MOVE)
           {
              if (!(sd->event_forward.pointer_move++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_DOWN)
           {
              if (!(sd->event_forward.pointer_down++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_UP)
           {
              if (!(sd->event_forward.pointer_up++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_IN)
           {
              if (!(sd->event_forward.pointer_in++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_OUT)
           {
              if (!(sd->event_forward.pointer_out++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_CANCEL)
           {
              if (!(sd->event_forward.pointer_cancel++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_WHEEL)
           {
              if (!(sd->event_forward.pointer_wheel++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_KEY_DOWN)
           {
              if (!(sd->event_forward.key_down++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_key_cb, win);
           }
         else if (ev->info == EFL_EVENT_KEY_UP)
           {
              if (!(sd->event_forward.key_up++))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_key_cb, win);
           }
         else if (ev->info == EFL_CANVAS_EVENT_RENDER_POST)
@@ -1940,7 +1940,7 @@ _win_event_add_cb(void *data, const Eo_Event *ev)
 static void
 _win_event_del_cb(void *data, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *array = ev->info;
+   const Efl_Callback_Array_Item *array = ev->info;
    Efl_Ui_Win_Data *sd = data;
    Efl_Ui_Win *win = ev->object;
    int i;
@@ -1950,55 +1950,55 @@ _win_event_del_cb(void *data, const Eo_Event *ev)
         if (ev->info == EFL_EVENT_POINTER_MOVE)
           {
              if (!(--sd->event_forward.pointer_move))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_DOWN)
           {
              if (!(--sd->event_forward.pointer_down))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_UP)
           {
              if (!(--sd->event_forward.pointer_up))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_IN)
           {
              if (!(--sd->event_forward.pointer_in))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_OUT)
           {
              if (!(--sd->event_forward.pointer_out))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_CANCEL)
           {
              if (!(--sd->event_forward.pointer_cancel))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_POINTER_WHEEL)
           {
              if (!(--sd->event_forward.pointer_wheel))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_pointer_cb, win);
           }
         else if (ev->info == EFL_EVENT_KEY_DOWN)
           {
              if (!(--sd->event_forward.key_down))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_key_cb, win);
           }
         else if (ev->info == EFL_EVENT_KEY_UP)
           {
              if (!(--sd->event_forward.key_up))
-               eo_event_callback_add(sd->evas, array[i].desc,
+               efl_event_callback_add(sd->evas, array[i].desc,
                                      _evas_event_key_cb, win);
           }
         else if (ev->info == EFL_CANVAS_EVENT_RENDER_POST)
@@ -2446,9 +2446,9 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
                                        _elm_win_on_resize_obj_changed_size_hints,
                                        obj);
 
-   eo_event_callback_del(obj, EO_EVENT_CALLBACK_ADD, _win_event_add_cb, sd);
-   eo_event_callback_del(obj, EO_EVENT_CALLBACK_DEL, _win_event_del_cb, sd);
-   eo_event_callback_array_del(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
+   efl_event_callback_del(obj, EFL_EVENT_CALLBACK_ADD, _win_event_add_cb, sd);
+   efl_event_callback_del(obj, EFL_EVENT_CALLBACK_DEL, _win_event_del_cb, sd);
+   efl_event_callback_array_del(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
 
    evas_object_del(sd->box);
    evas_object_del(sd->edje);
@@ -2591,7 +2591,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
           {
              sd->screen.x = x;
              sd->screen.y = y;
-             eo_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
+             efl_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
           }
         return;
      }
@@ -2607,7 +2607,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
      {
         sd->screen.x = x;
         sd->screen.y = y;
-        eo_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
+        efl_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
      }
    if (sd->frame_obj)
      {
@@ -2661,7 +2661,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(obj);
-   eo_event_callback_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
+   efl_event_callback_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(obj);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -3225,7 +3225,7 @@ _elm_win_property_change(void *data,
         if (e->win == sd->x.xwin)
           {
              sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win);
-             eo_event_callback_call
+             efl_event_callback_call
                (sd->obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
           }
      }
@@ -3586,7 +3586,7 @@ _elm_win_frame_cb_close(void *data,
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(win);
-   eo_event_callback_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
+   efl_event_callback_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(win);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -3838,7 +3838,7 @@ _elm_x_io_err(void *data EINA_UNUSED)
    Evas_Object *obj;
 
    EINA_LIST_FOREACH(_elm_win_list, l, obj)
-     eo_event_callback_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL);
+     efl_event_callback_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL);
    elm_exit();
 }
 #endif
@@ -3976,7 +3976,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
 
    Efl_Ui_Win_Data tmp_sd;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
 
    /* just to store some data while trying out to create a canvas */
    memset(&tmp_sd, 0, sizeof(Efl_Ui_Win_Data));
@@ -4322,9 +4322,9 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
    if (!sd->accel_pref)
      eina_stringshare_replace(&sd->accel_pref, elm_config_accel_preference_get());
 
-   eo_parent_set(obj, ecore_evas_get(tmp_sd.ee));
+   efl_parent_set(obj, ecore_evas_get(tmp_sd.ee));
 
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
@@ -4576,11 +4576,11 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
      elm_interface_atspi_window_created_signal_emit(obj);
 
    // attach config API
-   eo_composite_attach(obj, eo_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
+   efl_composite_attach(obj, efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
 
-   eo_event_callback_array_add(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _win_event_add_cb, sd);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_DEL, _win_event_del_cb, sd);
+   efl_event_callback_array_add(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _win_event_add_cb, sd);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _win_event_del_cb, sd);
 
    evas_object_show(sd->edje);
 
@@ -4593,18 +4593,18 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
 }
 
 EOLIAN static Eo *
-_efl_ui_win_eo_base_finalize(Eo *obj, Efl_Ui_Win_Data *_pd)
+_efl_ui_win_efl_object_finalize(Eo *obj, Efl_Ui_Win_Data *_pd)
 {
    obj = _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type);
    if (obj)
      {
-        obj = eo_finalize(eo_super(obj, MY_CLASS));
+        obj = efl_finalize(eo_super(obj, MY_CLASS));
      }
    return obj;
 }
 
 EOLIAN static Eo *
-_efl_ui_win_eo_base_constructor(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
+_efl_ui_win_efl_object_constructor(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
 {
    /* Do nothing. */
    /* XXX: We are calling the constructor chain from the finalizer. It's
@@ -4634,7 +4634,7 @@ _efl_ui_win_efl_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 EOLIAN static void
 _efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type)
 {
-   if (eo_finalized_get(obj))
+   if (efl_finalized_get(obj))
      {
         ERR("This function is only allowed during construction.");
         return;
@@ -4651,7 +4651,7 @@ _efl_ui_win_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 EOLIAN static void
 _efl_ui_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name)
 {
-   if (eo_finalized_get(obj))
+   if (efl_finalized_get(obj))
      {
         ERR("This function is only allowed during construction.");
         return;
@@ -4668,7 +4668,7 @@ _efl_ui_win_name_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 EOLIAN static void
 _efl_ui_win_accel_preference_set(Eo *obj, Efl_Ui_Win_Data *pd, const char *accel)
 {
-   if (eo_finalized_get(obj))
+   if (efl_finalized_get(obj))
      {
         ERR("This function is only allowed during construction.");
         return;
@@ -5351,7 +5351,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
 #endif
    _elm_win_frame_obj_update(sd);
    elm_widget_orientation_set(obj, rotation);
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
 }
 
@@ -5607,7 +5607,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
    edje_object_scale_set(sd->edje,
                          elm_widget_scale_get(obj) * elm_config_scale_get());
 
-   eo_event_callback_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
    ret = elm_obj_widget_disable(obj);
 
    if (!ret) int_ret = ELM_THEME_APPLY_FAILED;
@@ -5822,7 +5822,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSE
 }
 
 EOLIAN static void
-_efl_ui_win_class_constructor(Eo_Class *klass)
+_efl_ui_win_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
@@ -5830,7 +5830,7 @@ _efl_ui_win_class_constructor(Eo_Class *klass)
      {
         Eo *bridge = _elm_atspi_bridge_get();
         if (bridge)
-           eo_event_callback_add(bridge, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, _on_atspi_bus_connected, NULL);
+           efl_event_callback_add(bridge, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, _on_atspi_bus_connected, NULL);
      }
 }
 
@@ -6294,7 +6294,7 @@ elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode)
             (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
      }
 #endif
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
@@ -6330,7 +6330,7 @@ elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opacity_Mode m
             (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT);
      }
 #endif
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 8617f75154..c4ef976b30 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -603,7 +603,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
          [[The hardware acceleration preference for this window.
 
            This is a constructor function, and can only be called before
-           @Eo.Base.finalize.
+           @Efl.Object.finalize.
 
            This property overrides the global EFL configuration option
            "accel_preference" for this single window, and accepts the same
@@ -813,8 +813,8 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.finalize;
+      Efl.Object.constructor;
+      Efl.Object.finalize;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_move;
diff --git a/src/lib/elementary/efl_ui_win_standard.c b/src/lib/elementary/efl_ui_win_standard.c
index e7446239b2..ed9b01da03 100644
--- a/src/lib/elementary/efl_ui_win_standard.c
+++ b/src/lib/elementary/efl_ui_win_standard.c
@@ -13,9 +13,9 @@
 #define MY_CLASS EFL_UI_WIN_STANDARD_CLASS
 
 EOLIAN static Eo *
-_efl_ui_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
+_efl_ui_win_standard_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
 {
-   obj = eo_finalize(eo_super(obj, MY_CLASS));
+   obj = efl_finalize(eo_super(obj, MY_CLASS));
    if (!obj)
      return NULL;
 
diff --git a/src/lib/elementary/efl_ui_win_standard.eo b/src/lib/elementary/efl_ui_win_standard.eo
index d2a72c3b07..916c5fb3c6 100644
--- a/src/lib/elementary/efl_ui_win_standard.eo
+++ b/src/lib/elementary/efl_ui_win_standard.eo
@@ -2,6 +2,6 @@ class Efl.Ui.Win.Standard (Efl.Ui.Win)
 {
    data: null;
    implements {
-      Eo.Base.finalize;
+      Efl.Object.finalize;
    }
 }
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 89a909a7b7..0554c072f7 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -119,7 +119,7 @@ _hover_end_finished(void *data,
      {
         sd->expanded = EINA_FALSE;
         evas_object_hide(sd->hover);
-        eo_event_callback_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
+        efl_event_callback_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
      }
 }
 
@@ -194,7 +194,7 @@ _activate(Evas_Object *obj)
    evas_object_show(sd->genlist);
    elm_genlist_item_selected_set(sd->item, EINA_TRUE);
    evas_object_show(sd->hover);
-   eo_event_callback_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL);
+   efl_event_callback_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL);
 }
 
 static void
@@ -203,13 +203,13 @@ _on_item_selected(void *data , Evas_Object *obj EINA_UNUSED, void *event)
    ELM_COMBOBOX_DATA_GET(data, sd);
    elm_object_focus_set(sd->entry, EINA_TRUE);
 
-   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
+   efl_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
 }
 
 static void
 _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
 {
-   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
+   efl_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
 }
 
 static void
@@ -226,7 +226,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
         return;
      }
 
-   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
+   efl_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
 
    if (sd->count > 0)
      {
@@ -254,7 +254,7 @@ _on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
 static void
 _on_changed(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
+   efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -271,7 +271,7 @@ _elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNU
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
 
-   eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
+   efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
 
    //What are you doing here?
    elm_obj_widget_theme_apply(obj);
@@ -314,13 +314,13 @@ elm_combobox_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
+_elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
 {
    Evas_Object *gl;
    Evas_Object *entry;
    char buf[128];
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    sd->first_filter = EINA_TRUE;
 
@@ -340,7 +340,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
               elm_widget_style_get(obj));
    elm_object_style_set(sd->hover, buf);
 
-   eo_event_callback_add
+   efl_event_callback_add
      (sd->hover, EFL_UI_EVENT_CLICKED, _on_hover_clicked, obj);
    elm_layout_signal_callback_add
      (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
@@ -366,7 +366,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
    evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_smart_callback_add(gl, "selected", _on_item_selected, obj);
    evas_object_smart_callback_add(gl, "pressed", _on_item_pressed, obj);
-   eo_event_callback_add(gl, ELM_GENLIST_EVENT_FILTER_DONE, _gl_filter_finished_cb, obj);
+   efl_event_callback_add(gl, ELM_GENLIST_EVENT_FILTER_DONE, _gl_filter_finished_cb, obj);
    elm_genlist_homogeneous_set(gl, EINA_TRUE);
    elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
    elm_table_pack(sd->tbl, gl, 0, 0, 1, 1);
@@ -380,15 +380,15 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
                            ELM_SCROLLER_POLICY_OFF);
    elm_entry_scrollable_set(entry, EINA_TRUE);
    elm_entry_single_line_set(entry, EINA_TRUE);
-   eo_event_callback_add(entry, ELM_ENTRY_EVENT_CHANGED_USER, _on_changed, obj);
-   eo_event_callback_add(entry, ELM_ENTRY_EVENT_ABORTED, _on_aborted, obj);
+   efl_event_callback_add(entry, ELM_ENTRY_EVENT_CHANGED_USER, _on_changed, obj);
+   efl_event_callback_add(entry, ELM_ENTRY_EVENT_ABORTED, _on_aborted, obj);
    evas_object_show(entry);
 
    elm_object_part_content_set(obj, "elm.swallow.content", entry);
    elm_object_style_set(entry, buf);
 
-   eo_composite_attach(obj, gl);
-   eo_composite_attach(obj, entry);
+   efl_composite_attach(obj, gl);
+   efl_composite_attach(obj, entry);
 
    return obj;
 }
@@ -415,7 +415,7 @@ _elm_combobox_hover_end(Eo *obj, Elm_Combobox_Data *sd)
      {
         sd->expanded = EINA_FALSE;
         evas_object_hide(sd->hover);
-        eo_event_callback_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
+        efl_event_callback_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
 
@@ -461,7 +461,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
      elm_combobox_hover_begin(obj);
    else
      {
-        eo_event_callback_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
+        efl_event_callback_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
         elm_entry_cursor_end_set(sd->entry);
      }
    return EINA_TRUE;
@@ -484,7 +484,7 @@ _elm_combobox_elm_widget_event(Eo *obj, Elm_Combobox_Data *sd,
 }
 
 static void
-_elm_combobox_class_constructor(Eo_Class *klass)
+_elm_combobox_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 29cc142ce0..495527062a 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -670,7 +670,7 @@ _elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd)
 
    _show_signals_emit(obj, sd->dir);
 
-   eo_event_callback_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect);
+   efl_event_callback_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect);
 }
 
 static void
@@ -708,7 +708,7 @@ _on_parent_resize(void *data,
         sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
 
         evas_object_hide(data);
-        eo_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
+        efl_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
      }
    else
      {
@@ -1011,7 +1011,7 @@ _hide_finished_cb(void *data,
                   const char *source EINA_UNUSED)
 {
    evas_object_hide(data);
-   eo_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
+   efl_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
 }
 
 static void
@@ -1037,7 +1037,7 @@ _list_del(Elm_Ctxpopup_Data *sd)
 }
 
 EOLIAN static void
-_elm_ctxpopup_item_eo_base_destructor(Eo *eo_ctxpopup_it,
+_elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
                                       Elm_Ctxpopup_Item_Data *ctxpopup_it)
 {
    Evas_Object *list;
@@ -1060,7 +1060,7 @@ _elm_ctxpopup_item_eo_base_destructor(Eo *eo_ctxpopup_it,
         if (sd->list_visible) elm_layout_sizing_eval(WIDGET(ctxpopup_it));
      }
 
-   eo_destructor(eo_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
+   efl_destructor(eo_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -1147,7 +1147,7 @@ _elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd)
    ELM_SAFE_FREE(sd->bg, evas_object_del);
 
    EINA_LIST_FREE(sd->items, it)
-     eo_del(it);
+     efl_del(it);
 
    efl_canvas_group_del(eo_super(obj, MY_CLASS));
 }
@@ -1174,9 +1174,9 @@ elm_ctxpopup_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
+_elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
@@ -1248,9 +1248,9 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
 }
 
 EOLIAN static Eo *
-_elm_ctxpopup_item_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
+_elm_ctxpopup_item_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
 {
-   obj = eo_constructor(eo_super(obj, ELM_CTXPOPUP_ITEM_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_CTXPOPUP_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -1322,7 +1322,7 @@ _elm_ctxpopup_auto_hide_disabled_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
 }
 
 EOLIAN static void
-_elm_ctxpopup_class_constructor(Eo_Class *klass)
+_elm_ctxpopup_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -1406,7 +1406,7 @@ _elm_ctxpopup_item_init(Eo *eo_item,
           const void *data)
 {
    Eo *obj;
-   obj = eo_parent_get(eo_item);
+   obj = efl_parent_get(eo_item);
    Elm_Ctxpopup_Data *sd = eo_data_scope_get(obj, ELM_CTXPOPUP_CLASS);
    if (!sd->list)
      {
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index cb8e2eb84d..512ac619d7 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -81,14 +81,14 @@ static void
 _monitoring_start(Elm_Fileselector *fs, Elm_Fileselector_Data *sd, Efl_Model *model)
 {
    sd->monitoring = EINA_TRUE;
-   eo_event_callback_array_add(model, monitoring_callbacks(), fs);
+   efl_event_callback_array_add(model, monitoring_callbacks(), fs);
 }
 
 static void
 _monitoring_stop(Elm_Fileselector *fs, Elm_Fileselector_Data *sd, Efl_Model *model)
 {
    sd->monitoring = EINA_FALSE;
-   eo_event_callback_array_del(model, monitoring_callbacks(), fs);
+   efl_event_callback_array_del(model, monitoring_callbacks(), fs);
 }
 
 static void
@@ -624,7 +624,7 @@ _signal_first(Listing_Request *lreq)
      }
 
    // EVENTS: should not call legacy
-   //eo_event_callback_call
+   //efl_event_callback_call
    //  (lreq->obj, ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->model);
 
    evas_object_smart_callback_call(lreq->obj, "directory,open", (void *)lreq->path);
@@ -1052,7 +1052,7 @@ _on_item_activated(void *data, const Eo_Event *event)
    if (!it_data->is_dir)
      {
         // EVENTS: should not call legacy
-        //eo_event_callback_call
+        //efl_event_callback_call
         //  (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model);
         evas_object_smart_callback_call(data, "activated", (void *)it_data->path);
         return;
@@ -1138,7 +1138,7 @@ _on_item_selected(void *data, const Eo_Event *event)
           elm_object_text_set(sd->name_entry, it_data->filename);
 
         // EVENTS: should not call legacy
-        //eo_event_callback_call
+        //efl_event_callback_call
         //  (data, EFL_UI_EVENT_SELECTED, (void *)it_data->model);
         evas_object_smart_callback_call(data, "selected", (void *)it_data->path);
      }
@@ -1234,7 +1234,7 @@ _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
 
    ELM_FILESELECTOR_DATA_GET(fs, sd);
 
-   parent = eo_parent_get(sd->model);
+   parent = efl_parent_get(sd->model);
    if (!parent)
      return;
    _populate(fs, parent, NULL, NULL);
@@ -1282,7 +1282,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
    if (!sd->model || !sd->path)
      {
         // EVENTS: should not call legacy
-        //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
+        //efl_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
         evas_object_smart_callback_call(fs, "done", NULL);
         return;
      }
@@ -1301,7 +1301,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
         _model_str_property_set(selected_model, "path", selection, NULL);
 
         // EVENTS: should not call legacy
-        //eo_event_callback_call
+        //efl_event_callback_call
         //  (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model);
         evas_object_smart_callback_call(fs, "done", (void *) selection);
 
@@ -1314,12 +1314,12 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
         if (it_data)
           {
              // EVENTS: should not call legacy
-             //eo_event_callback_call
+             //efl_event_callback_call
              //  (fs, ELM_FILESELECTOR_EVENT_DONE, it_data->model);
              evas_object_smart_callback_call(fs, "done", (void *) it_data->path);
           }
         // EVENTS: should not call legacy
-        //eo_event_callback_call
+        //efl_event_callback_call
         //  (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model);
         evas_object_smart_callback_call(fs, "done", (void *) sd->path);
      }
@@ -1331,17 +1331,17 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED)
    Evas_Object *fs = data;
 
    // EVENTS: should not call legacy
-   //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
+   //efl_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
    evas_object_smart_callback_call(fs, "done", NULL);
 }
 
 static void
 _text_activated_free_fs_data(Elm_Fileselector *fs)
 {
-   Eina_Stringshare *str = eo_key_data_get(fs, _text_activated_path_key);
+   Eina_Stringshare *str = efl_key_data_get(fs, _text_activated_path_key);
    eina_stringshare_del(str);
-   eo_key_data_set(fs, _text_activated_path_key, NULL);
-   eo_key_ref_set(fs, _text_activated_model_key, NULL);
+   efl_key_data_set(fs, _text_activated_path_key, NULL);
+   efl_key_ref_set(fs, _text_activated_model_key, NULL);
    eo_unref(fs);
 }
 
@@ -1352,8 +1352,8 @@ _text_activated_is_dir_then(void *data, void *value)
    Eina_Bool is_dir = EINA_FALSE;
    ELM_FILESELECTOR_DATA_GET(fs, sd);
 
-   Efl_Model *model = eo_key_ref_get(fs, _text_activated_model_key);
-   Eina_Stringshare *str = eo_key_data_get(fs, _text_activated_path_key);
+   Efl_Model *model = efl_key_ref_get(fs, _text_activated_model_key);
+   Eina_Stringshare *str = efl_key_data_get(fs, _text_activated_path_key);
 
    eina_value_get(value, &is_dir);
    if (is_dir)
@@ -1368,14 +1368,14 @@ _text_activated_is_dir_then(void *data, void *value)
         if (sd->only_folder)
           {
              // EVENTS: should not call legacy
-             //eo_event_callback_call
+             //efl_event_callback_call
              //  (fs, EFL_UI_EVENT_SELECTED, (void *)model);
              evas_object_smart_callback_call(fs, "selected", (void *) str);
           }
      }
    else
      {
-        Efl_Model *parent = eo_parent_get(model);
+        Efl_Model *parent = efl_parent_get(model);
         if (!parent)
           {
              ERR("Efl.Model allocation error");
@@ -1387,7 +1387,7 @@ _text_activated_is_dir_then(void *data, void *value)
              if (sd->only_folder)
                {
                   // EVENTS: should not call legacy
-                  //eo_event_callback_call
+                  //efl_event_callback_call
                   //  (fs, EFL_UI_EVENT_SELECTED, (void *)model);
                   evas_object_smart_callback_call(fs, "selected", (void *) str);
                }
@@ -1422,16 +1422,16 @@ static void
 _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
 {
    Evas_Object *fs = data;
-   /* Efl_Model *model = eo_key_data_get(fs, _text_activated_model_key); */
-   Eina_Stringshare *str = eo_key_data_get(fs, _text_activated_path_key);
+   /* Efl_Model *model = efl_key_data_get(fs, _text_activated_model_key); */
+   Eina_Stringshare *str = efl_key_data_get(fs, _text_activated_path_key);
 
    // EVENTS: should not call legacy
-   //eo_event_callback_call
+   //efl_event_callback_call
    //  (fs, EFL_UI_EVENT_SELECTED, (void *)model);
    evas_object_smart_callback_call(fs, "selected", (void *)str);
 
    // EVENTS: should not call legacy
-   //eo_event_callback_call
+   //efl_event_callback_call
    //  (fs, ELM_FILESELECTOR_EVENT_SELECTED_INVALID, (void *)model);
    evas_object_smart_callback_call(fs, "selected,invalid", (void *)str);
 
@@ -1458,8 +1458,8 @@ _on_text_activated(void *data, const Eo_Event *event)
 
    _model_str_property_set(model, "path", path, &promise);
 
-   eo_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
-   eo_key_ref_set(fs, _text_activated_model_key, model);
+   efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
+   efl_key_ref_set(fs, _text_activated_model_key, model);
    eo_ref(fs);
    eina_promise_then(promise,
                      _on_text_activated_set_path_then,
@@ -1572,21 +1572,21 @@ _files_list_add(Evas_Object *obj)
    evas_object_data_set(li, "parent", obj);
    elm_widget_mirrored_automatic_set(li, EINA_FALSE);
 
-   eo_event_callback_add
+   efl_event_callback_add
      (li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, ELM_GENLIST_EVENT_EXPAND_REQUEST, _on_list_expand_req, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, ELM_GENLIST_EVENT_CONTRACT_REQUEST, _on_list_contract_req, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, ELM_GENLIST_EVENT_EXPANDED, _on_list_expanded, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, ELM_GENLIST_EVENT_CONTRACTED, _on_list_contracted, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (li, EFL_EVENT_KEY_DOWN, _files_key_down, obj);
 
    return li;
@@ -1609,13 +1609,13 @@ _files_grid_add(Evas_Object *obj)
 
    elm_gengrid_align_set(grid, 0.0, 0.0);
 
-   eo_event_callback_add
+   efl_event_callback_add
      (grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (grid, EFL_EVENT_KEY_DOWN, _files_key_down, obj);
 
    return grid;
@@ -1871,7 +1871,7 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
    elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up"));
-   eo_event_callback_add
+   efl_event_callback_add
      (bt, EFL_UI_EVENT_CLICKED, _on_dir_up, obj);
 
    priv->up_button = bt;
@@ -1885,7 +1885,7 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
    elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home"));
-   eo_event_callback_add
+   efl_event_callback_add
      (bt, EFL_UI_EVENT_CLICKED, _home, obj);
 
    priv->home_button = bt;
@@ -1906,7 +1906,7 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
                                                 PACKAGE, N_("Search"));
    elm_object_part_content_set(en, "icon", ic);
    elm_entry_icon_visible_set(en, EINA_TRUE);
-   eo_event_callback_add
+   efl_event_callback_add
      (en, ELM_ENTRY_EVENT_CHANGED, _preedit_cb, obj);
    evas_object_data_set(obj, "search", en);
 
@@ -1935,13 +1935,13 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
    elm_entry_single_line_set(en, EINA_TRUE);
    elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
 
-   eo_event_callback_add
+   efl_event_callback_add
      (en, ELM_ENTRY_EVENT_ANCHOR_CLICKED, _anchor_clicked, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (en, ELM_WIDGET_EVENT_FOCUSED, _on_text_focused, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (en, ELM_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (en, ELM_ENTRY_EVENT_ACTIVATED, _on_text_activated, obj);
 
    priv->path_entry = en;
@@ -2016,9 +2016,9 @@ elm_fileselector_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd)
+_elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
@@ -2106,7 +2106,7 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Cancel"));
 
-        eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _canc, obj);
+        efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _canc, obj);
 
         sd->cancel_button = bt;
         elm_object_part_content_set(obj, "elm.swallow.cancel", sd->cancel_button);
@@ -2116,7 +2116,7 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_object_domain_translatable_text_set(bt, PACKAGE, N_("OK"));
 
-        eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ok, obj);
+        efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ok, obj);
 
         sd->ok_button = bt;
         elm_object_part_content_set(obj, "elm.swallow.ok", sd->ok_button);
@@ -2171,7 +2171,7 @@ elm_fileselector_path_set(Evas_Object *obj,
                           const char *_path)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   const Eo_Class *cls = eo_class_get(obj);
+   const Efl_Class *cls = eo_class_get(obj);
    if (cls == ELM_FILESELECTOR_CLASS)
      _elm_fileselector_path_set_internal(obj, _path);
    else if (cls == ELM_FILESELECTOR_ENTRY_CLASS)
@@ -2205,7 +2205,7 @@ EAPI const char *
 elm_fileselector_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
-   const Eo_Class *cls = eo_class_get(obj);
+   const Efl_Class *cls = eo_class_get(obj);
    if (cls == ELM_FILESELECTOR_CLASS)
      return _elm_fileselector_path_get_internal(obj);
    else if (cls == ELM_FILESELECTOR_ENTRY_CLASS)
@@ -2451,15 +2451,15 @@ clean_up:
 static void
 _selected_model_set_free_fs_data(Elm_Fileselector *fs)
 {
-   eo_key_ref_set(fs, _selected_model_set_model_key, NULL);
-   eo_key_data_set(fs, _selected_model_set_promise_owner_key, NULL);
+   efl_key_ref_set(fs, _selected_model_set_model_key, NULL);
+   efl_key_data_set(fs, _selected_model_set_promise_owner_key, NULL);
    eo_unref(fs);
 }
 
 static void
 _selected_model_set_then_error(void *data, Eina_Error err)
 {
-   Eina_Promise_Owner *promise_owner = eo_key_data_get(data, _selected_model_set_promise_owner_key);
+   Eina_Promise_Owner *promise_owner = efl_key_data_get(data, _selected_model_set_promise_owner_key);
    if (promise_owner)
      eina_promise_owner_error_set(promise_owner, err);
    _selected_model_set_free_fs_data(data);
@@ -2470,8 +2470,8 @@ _selected_model_set_is_dir_then(void *data, void *value)
 {
    Elm_Fileselector *fs = data;
    Eina_Bool is_dir = EINA_FALSE;
-   Efl_Model *model = eo_key_ref_get(fs, _selected_model_set_model_key);
-   Eina_Promise_Owner *promise_owner = eo_key_data_get(fs, _selected_model_set_promise_owner_key);
+   Efl_Model *model = efl_key_ref_get(fs, _selected_model_set_model_key);
+   Eina_Promise_Owner *promise_owner = efl_key_data_get(fs, _selected_model_set_promise_owner_key);
    ELM_FILESELECTOR_DATA_GET(fs, sd);
 
    eina_value_get(value, &is_dir);
@@ -2486,7 +2486,7 @@ _selected_model_set_is_dir_then(void *data, void *value)
      }
    else
      {
-        Efl_Model *parent = eo_parent_get(model);
+        Efl_Model *parent = efl_parent_get(model);
         if (parent)
           {
              _schedule_populate(fs, sd, parent, model);
@@ -2518,9 +2518,9 @@ _elm_fileselector_elm_interface_fileselector_selected_model_set(Eo *obj, Elm_Fil
      }
    promise = efl_model_property_get(model, "is_dir");
 
-   eo_key_ref_set(obj, _selected_model_set_model_key, model);
+   efl_key_ref_set(obj, _selected_model_set_model_key, model);
    if (promise_owner)
-     eo_key_data_set(obj, _selected_model_set_promise_owner_key, promise_owner);
+     efl_key_data_set(obj, _selected_model_set_promise_owner_key, promise_owner);
 
    eina_promise_then(promise, _selected_model_set_is_dir_then, _selected_model_set_then_error, eo_ref(obj));
 }
@@ -2970,7 +2970,7 @@ _elm_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data
 }
 
 EOLIAN static void
-_elm_fileselector_class_constructor(Eo_Class *klass)
+_elm_fileselector_class_constructor(Efl_Class *klass)
 {
    unsigned int i;
 
@@ -3002,7 +3002,7 @@ _elm_fileselector_class_constructor(Eo_Class *klass)
 }
 
 EOLIAN static void
-_elm_fileselector_class_destructor(Eo_Class *klass EINA_UNUSED)
+_elm_fileselector_class_destructor(Efl_Class *klass EINA_UNUSED)
 {
    unsigned int i;
 
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 324808e5c9..19b251ad2a 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -107,7 +107,7 @@ _selection_done(void *data, const Eo_Event *event)
    evas_object_del(del);
 
    // EVENTS: should not call legacy
-   //eo_event_callback_call
+   //efl_event_callback_call
    //  (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model);
 }
 
@@ -135,7 +135,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
    win = elm_win_add(NULL, "fileselector_button", ELM_WIN_DIALOG_BASIC);
    elm_win_title_set(win, sd->window_title);
    elm_win_autodel_set(win, EINA_TRUE);
-   eo_event_callback_add
+   efl_event_callback_add
          (win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _selection_done, sd);
 
    bg = elm_bg_add(win);
@@ -190,7 +190,7 @@ _activate(Elm_Fileselector_Button_Data *sd)
      (sd->fs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(sd->fs, EVAS_HINT_FILL, EVAS_HINT_FILL);
    // EVENTS: should not call legacy
-   //eo_event_callback_add
+   //efl_event_callback_add
    //      (sd->fs, ELM_FILESELECTOR_EVENT_DONE, _selection_done, sd);
    evas_object_smart_callback_add(sd->fs, "done", _selection_done_path, sd);
    evas_object_show(sd->fs);
@@ -235,7 +235,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
 
-   eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv);
+   efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv);
 
    elm_obj_widget_theme_apply(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -270,9 +270,9 @@ elm_fileselector_button_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd)
+_elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index ae4ba755e9..02c95ffe59 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -49,7 +49,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
   static void                                                               \
   _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED)                                          \
   {                                                                         \
-     eo_event_callback_call(data, event, ev->info);          \
+     efl_event_callback_call(data, event, ev->info);          \
   }
 SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
 SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
@@ -94,7 +94,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
    eina_promise_then(promise, _file_chosen_path_then, NULL, data);
 
    // EVENTS: should not call legacy
-   //eo_event_callback_call
+   //efl_event_callback_call
    //  (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
 }
 
@@ -132,7 +132,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
          elm_interface_fileselector_model_set(sd->button, model);
      }
 
-   eo_event_callback_call
+   efl_event_callback_call
      (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
 }
 
@@ -325,7 +325,7 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
      (priv->button, _elm_config->fileselector_expand_enable);
 
 #define SIG_FWD(name, event) \
-  eo_event_callback_add(priv->button, event, _##name##_fwd, obj)
+  efl_event_callback_add(priv->button, event, _##name##_fwd, obj)
    SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
    SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED);
    // EVENTS: should not call legacy
@@ -342,7 +342,7 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
    elm_entry_editable_set(priv->entry, EINA_TRUE);
 
 #define SIG_FWD(name, event) \
-  eo_event_callback_add(priv->entry, event, _##name##_fwd, obj)
+  efl_event_callback_add(priv->entry, event, _##name##_fwd, obj)
    SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
    SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
    SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
@@ -386,9 +386,9 @@ elm_fileselector_entry_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
+_elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING);
@@ -650,7 +650,7 @@ elm_fileselector_entry_inwin_mode_get(const Eo *obj)
 }
 
 EOLIAN static void
-_elm_fileselector_entry_class_constructor(Eo_Class *klass)
+_elm_fileselector_entry_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 20e569fd6d..0ca7139501 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -161,7 +161,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
    ELM_HOVERSEL_DATA_GET(obj2, sd);
 
    if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
-   eo_event_callback_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
+   efl_event_callback_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
 
    evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
 
@@ -173,7 +173,7 @@ _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Hoversel_Item_Data *it = data;
 
-   eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
 }
 
 static void
@@ -181,7 +181,7 @@ _item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Hoversel_Item_Data *it = data;
 
-   eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
 }
 
 static void
@@ -349,7 +349,7 @@ _hover_del(Evas_Object *obj)
    sd->scr = NULL;
    sd->last_location = NULL;
 
-   eo_event_callback_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL);
+   efl_event_callback_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL);
 }
 
 static void
@@ -403,7 +403,7 @@ _activate(Evas_Object *obj)
 
    elm_object_style_set(sd->hover, buf);
 
-   eo_event_callback_add
+   efl_event_callback_add
      (sd->hover, EFL_UI_EVENT_CLICKED, _on_hover_clicked, obj);
    elm_layout_signal_callback_add
      (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
@@ -429,7 +429,7 @@ _activate(Evas_Object *obj)
    _resizing_eval(obj, sd);
    elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
 
-   eo_event_callback_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL);
+   efl_event_callback_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL);
    evas_object_show(sd->hover);
 }
 
@@ -515,7 +515,7 @@ _elm_hoversel_item_elm_widget_item_focus_get(Eo *eo_it EINA_UNUSED,
 }
 
 EOLIAN static void
-_elm_hoversel_item_eo_base_destructor(Eo *eo_item, Elm_Hoversel_Item_Data *item)
+_elm_hoversel_item_efl_object_destructor(Eo *eo_item, Elm_Hoversel_Item_Data *item)
 {
    ELM_HOVERSEL_DATA_GET_OR_RETURN(WIDGET(item), sd);
 
@@ -525,7 +525,7 @@ _elm_hoversel_item_eo_base_destructor(Eo *eo_item, Elm_Hoversel_Item_Data *item)
    eina_stringshare_del(item->icon_file);
    eina_stringshare_del(item->icon_group);
 
-   eo_destructor(eo_super(eo_item, ELM_HOVERSEL_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_HOVERSEL_ITEM_CLASS));
 }
 
 static void
@@ -553,7 +553,7 @@ _elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *priv)
    efl_canvas_group_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
+   efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
 
    //What are you doing here?
    elm_obj_widget_theme_apply(obj);
@@ -571,7 +571,7 @@ _elm_hoversel_efl_canvas_group_group_del(Eo *obj, Elm_Hoversel_Data *sd)
      {
         ELM_HOVERSEL_ITEM_DATA_GET(eo_item, it);
         ELM_SAFE_FREE(VIEW(it), evas_object_del);
-        eo_del(eo_item);
+        efl_del(eo_item);
      }
    elm_hoversel_hover_parent_set(obj, NULL);
 
@@ -613,9 +613,9 @@ elm_hoversel_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
+_elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
@@ -624,14 +624,14 @@ _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_hoversel_eo_base_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
+_elm_hoversel_efl_object_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
    elm_obj_hoversel_clear(obj);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(_on_parent,
-                          { EO_EVENT_DEL, _on_parent_del },
+                          { EFL_EVENT_DEL, _on_parent_del },
                           { EFL_GFX_EVENT_RESIZE, _on_parent_resize });
 
 EOLIAN static void
@@ -639,13 +639,13 @@ _elm_hoversel_hover_parent_set(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *pare
 {
    if (sd->hover_parent)
      {
-        eo_event_callback_array_del(sd->hover_parent, _on_parent(), obj);
+        efl_event_callback_array_del(sd->hover_parent, _on_parent(), obj);
      }
 
    sd->hover_parent = parent;
    if (sd->hover_parent)
      {
-        eo_event_callback_array_add(sd->hover_parent, _on_parent(), obj);
+        efl_event_callback_array_add(sd->hover_parent, _on_parent(), obj);
      }
 }
 
@@ -737,9 +737,9 @@ _elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
 }
 
 EOLIAN static Eo *
-_elm_hoversel_item_eo_base_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
+_elm_hoversel_item_efl_object_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
 {
-   obj = eo_constructor(eo_super(obj, ELM_HOVERSEL_ITEM_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_HOVERSEL_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -787,9 +787,9 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
 
     evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
     evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item);
-    eo_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
-    eo_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
+    efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item);
+    efl_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
+    efl_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
 
    sd->items = eina_list_append(sd->items, eo_item);
 
@@ -938,7 +938,7 @@ _elm_hoversel_elm_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src,
 }
 
 static void
-_elm_hoversel_class_constructor(Eo_Class *klass)
+_elm_hoversel_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index d13b851e8b..6c4ecb1e34 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -264,7 +264,7 @@ _shrink_mode_set(Evas_Object *obj,
                   evas_object_show(sd->end);
 
                   sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1);
                   break;
                }
@@ -297,7 +297,7 @@ _shrink_mode_set(Evas_Object *obj,
           }
 
         sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
      }
 
@@ -353,7 +353,7 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
                   elm_entry_input_panel_show(sd->entry);
                }
           }
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
      }
    else
@@ -363,7 +363,7 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
              _view_update(sd);
              elm_entry_input_panel_hide(sd->entry);
           }
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
      }
 
@@ -380,7 +380,7 @@ _item_del(Elm_Multibuttonentry_Item_Data *item)
 
    elm_box_unpack(sd->box, VIEW(item));
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item));
 
    if (sd->selected_it == item)
@@ -409,7 +409,7 @@ _current_item_state_change(Evas_Object *obj,
      {
       case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
         elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item));
         break;
       case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
@@ -508,7 +508,7 @@ _on_item_clicked(void *data,
    _item_select(WIDGET(it), it);
 
    if (sd->selected_it)
-     eo_event_callback_call
+     efl_event_callback_call
        (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it);
 }
 
@@ -557,7 +557,7 @@ _long_press_cb(void *data)
 
    sd->longpress_timer = NULL;
 
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
@@ -649,14 +649,14 @@ _elm_multibuttonentry_item_elm_widget_item_part_text_get(Eo *eo_item EINA_UNUSED
 }
 
 EOLIAN static void
-_elm_multibuttonentry_item_eo_base_destructor(Eo *eo_it,
+_elm_multibuttonentry_item_efl_object_destructor(Eo *eo_it,
                                               Elm_Multibuttonentry_Item_Data *it)
 {
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it);
    _item_del(it);
 
-   eo_destructor(eo_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
+   efl_destructor(eo_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
 }
 
 static void
@@ -707,9 +707,9 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
 }
 
 EOLIAN static Eo *
-_elm_multibuttonentry_item_eo_base_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
+_elm_multibuttonentry_item_efl_object_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
 {
-   eo_item = eo_constructor(eo_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
+   eo_item = efl_constructor(eo_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -917,7 +917,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
         break;
      }
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item);
 
    if (_elm_config->atspi_mode)
@@ -965,7 +965,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
                          const char *emission EINA_UNUSED,
                          const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -985,10 +985,10 @@ _box_resize_cb(void *data,
    elm_box_padding_get(obj, &hpad, NULL);
 
    if (sd->h_box < h)
-     eo_event_callback_call
+     efl_event_callback_call
        (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL);
    else if (sd->h_box > h)
-     eo_event_callback_call
+     efl_event_callback_call
        (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL);
 
    if (sd->items && sd->w_box != w)
@@ -1178,7 +1178,7 @@ _callbacks_register(Evas_Object *obj)
      (sd->entry, EVAS_CALLBACK_KEY_DOWN, _entry_key_down_cb, obj);
    evas_object_event_callback_add
      (sd->entry, EVAS_CALLBACK_RESIZE, _entry_resize_cb, obj);
-   eo_event_callback_array_add(sd->entry, _multi_buttonentry_cb(), obj);
+   efl_event_callback_array_add(sd->entry, _multi_buttonentry_cb(), obj);
 }
 
 static void
@@ -1582,7 +1582,7 @@ _elm_multibuttonentry_efl_canvas_group_group_del(Eo *obj, Elm_Multibuttonentry_D
    Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
 
    EINA_LIST_FREE(sd->items, eo_item)
-     eo_del(eo_item);
+     efl_del(eo_item);
 
    sd->items = NULL;
 
@@ -1699,9 +1699,9 @@ elm_multibuttonentry_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
+_elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
@@ -1986,7 +1986,7 @@ _elm_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Elm_Multibuttonent
 }
 
 static void
-_elm_multibuttonentry_class_constructor(Eo_Class *klass)
+_elm_multibuttonentry_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
@@ -2033,7 +2033,7 @@ static Eina_Bool
 _key_action_longpress(Eo *obj, const char *params EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it);
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj);
    return EINA_TRUE;
 }
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 9485243cdb..98695c9a1d 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -344,7 +344,7 @@ _on_item_title_transition_finished(void *data,
 {
    Elm_Naviframe_Item_Data *it = data;
 
-   eo_event_callback_call
+   efl_event_callback_call
          (WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it));
 }
 
@@ -542,7 +542,7 @@ _elm_naviframe_item_elm_widget_item_part_text_get(Eo *nit EINA_UNUSED,
 }
 
 EOLIAN static void
-_elm_naviframe_item_eo_base_destructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
+_elm_naviframe_item_efl_object_destructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
 {
    Eina_List *l;
    Elm_Naviframe_Op *nfo;
@@ -594,7 +594,7 @@ end:
 
    _item_free(nit);
 
-   eo_destructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
 }
 
 static void
@@ -695,8 +695,8 @@ _item_title_prev_btn_unset(Elm_Naviframe_Item_Data *it)
 
    evas_object_event_callback_del
      (content, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb);
-   Eo* parent = eo_parent_get(content);
-   eo_event_callback_del(content, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, parent);
+   Eo* parent = efl_parent_get(content);
+   efl_event_callback_del(content, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, parent);
    it->title_prev_btn = NULL;
    if (it->auto_pushed_btn) it->auto_pushed_btn = NULL;
    return content;
@@ -960,7 +960,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->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data);
+   efl_event_callback_del(event->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data);
    elm_naviframe_item_pop(data);
 }
 
@@ -973,7 +973,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
    btn = elm_button_add(obj);
 
    if (!btn) return NULL;
-   eo_event_callback_add
+   efl_event_callback_add
          (btn, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
    snprintf
      (buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj));
@@ -1089,7 +1089,7 @@ _on_item_title_clicked(void *data,
 {
    Elm_Naviframe_Item_Data *it = data;
 
-   eo_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it));
 }
 
 /* "elm,state,cur,pushed"
@@ -1155,7 +1155,7 @@ _on_item_show_finished(void *data,
 
    it->pushing = EINA_FALSE;
 
-   eo_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it));
 }
 
 static void
@@ -1190,9 +1190,9 @@ _access_prev_btn_info_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
 }
 
 EOLIAN static Eo *
-_elm_naviframe_item_eo_base_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
+_elm_naviframe_item_efl_object_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
 {
-   eo_item = eo_constructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
+   eo_item = efl_constructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -1439,7 +1439,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
         free(nfo);
      }
 
-   eo_event_callback_del(nfd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, nfd);
+   efl_event_callback_del(nfd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, nfd);
 }
 
 EOLIAN static void
@@ -1491,7 +1491,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
    ///Leave for compatibility.
    ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
    if (it->title_prev_btn)
-     eo_event_callback_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
+     efl_event_callback_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -1523,7 +1523,7 @@ static void
 _schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd)
 {
    if (!sd->ops)
-     eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, sd);
+     efl_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, sd);
 
    sd->ops = eina_list_append(sd->ops, nfo);
 }
@@ -1589,9 +1589,9 @@ elm_naviframe_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd)
+_elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
@@ -1726,7 +1726,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
                      Since the item is not popped or deleted here, the deleted
                      callback of the auto pushed button should be restored. */
                   if (it->auto_pushed_btn)
-                    eo_event_callback_add
+                    efl_event_callback_add
                           (it->auto_pushed_btn, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
                   it->popping = EINA_FALSE;
                }
@@ -1989,7 +1989,7 @@ _elm_naviframe_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Navifra
 }
 
 static void
-_elm_naviframe_class_constructor(Eo_Class *klass)
+_elm_naviframe_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index c4b6d6074a..65f72a457f 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -315,21 +315,21 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED)
    elm_video_play_position_set(sd->video, pos);
 
    elm_layout_signal_emit(data, "elm,button,forward", "elm");
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
 }
 
 static void
 _info(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,info", "elm");
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
 }
 
 static void
 _next(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,next", "elm");
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
 }
 
 static void
@@ -339,7 +339,7 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,player,pause", "elm");
    elm_video_pause(sd->video);
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
 }
 
 static void
@@ -349,13 +349,13 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,player,play", "elm");
    elm_video_play(sd->video);
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
 }
 
 static void
 _prev(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
    elm_layout_signal_emit(data, "elm,button,prev", "elm");
 }
 
@@ -371,14 +371,14 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED)
    elm_video_play_position_set(sd->video, pos);
 
    elm_layout_signal_emit(data, "elm,button,rewind", "elm");
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
 }
 
 static void
 _stop(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,stop", "elm");
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
 }
 
 static void
@@ -388,7 +388,7 @@ _eject(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,button,eject", "elm");
    emotion_object_eject(elm_video_emotion_get(sd->video));
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
 }
 
 static void
@@ -413,7 +413,7 @@ _volume(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,volume", "elm");
    _mute_toggle(data);
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
 }
 
 static void
@@ -421,7 +421,7 @@ _mute(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,mute", "elm");
    _mute_toggle(data);
-   eo_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
 }
 
 static void
@@ -437,7 +437,7 @@ _play_finished(void *data, const Eo_Event *event EINA_UNUSED)
 }
 
 static void
-_on_video_del(Elm_Player_Data *sd)
+_on_videfl_del(Elm_Player_Data *sd)
 {
    elm_object_disabled_set(sd->forward, EINA_TRUE);
    elm_object_disabled_set(sd->info, EINA_TRUE);
@@ -458,18 +458,18 @@ _on_video_del(Elm_Player_Data *sd)
 }
 
 static void
-_video_del(void *data,
+_videfl_del(void *data,
            Evas *e EINA_UNUSED,
            Evas_Object *obj EINA_UNUSED,
            void *event_info EINA_UNUSED)
 {
-   _on_video_del(data);
+   _on_videfl_del(data);
 }
 
 static Evas_Object *
 _player_button_add(Evas_Object *obj,
                    const char *name,
-                   Eo_Event_Cb func)
+                   Efl_Event_Cb func)
 {
    Evas_Object *ic;
    Evas_Object *bt;
@@ -489,7 +489,7 @@ _player_button_add(Evas_Object *obj,
    snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
             elm_widget_style_get(obj));
    elm_object_style_set(bt, buf);
-   eo_event_callback_add
+   efl_event_callback_add
             (bt, EFL_UI_EVENT_CLICKED, func, obj);
    snprintf(buf, sizeof(buf), "elm.swallow.media_player.%s", name);
    if (!elm_layout_content_set(obj, buf, bt))
@@ -574,7 +574,7 @@ _elm_player_content_set(Eo *obj, Elm_Player_Data *sd, const char *part, Evas_Obj
    sd->emotion = elm_video_emotion_get(sd->video);
    emotion_object_priority_set(sd->emotion, EINA_TRUE);
    evas_object_event_callback_add
-     (sd->video, EVAS_CALLBACK_DEL, _video_del, sd);
+     (sd->video, EVAS_CALLBACK_DEL, _videfl_del, sd);
 
    seekable = elm_video_is_seekable_get(sd->video);
    length = elm_video_play_length_get(sd->video);
@@ -592,7 +592,7 @@ _elm_player_content_set(Eo *obj, Elm_Player_Data *sd, const char *part, Evas_Obj
      elm_layout_signal_emit(obj, "elm,player,play", "elm");
    else elm_layout_signal_emit(obj, "elm,player,pause", "elm");
 
-   eo_event_callback_array_add(sd->emotion, _emotion_cb(), obj);
+   efl_event_callback_array_add(sd->emotion, _emotion_cb(), obj);
 
    /* FIXME: track info from video */
 end:
@@ -640,7 +640,7 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
      (priv->slider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_layout_content_set(obj, "elm.swallow.media_player.positionslider",
                           priv->slider);
-   eo_event_callback_array_add(priv->slider, _slider_cb(), obj);
+   efl_event_callback_array_add(priv->slider, _slider_cb(), obj);
 
    priv->vslider = elm_slider_add(obj);
    elm_slider_indicator_show_set(priv->vslider, EINA_FALSE);
@@ -656,7 +656,7 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
      (priv->vslider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_layout_content_set(obj, "elm.swallow.media_player.volumeslider",
                           priv->vslider);
-   eo_event_callback_add
+   efl_event_callback_add
      (priv->vslider, ELM_SLIDER_EVENT_CHANGED, _update_volume, obj);
 
    elm_layout_sizing_eval(obj);
@@ -677,9 +677,9 @@ elm_player_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
+_elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
@@ -688,7 +688,7 @@ _elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_player_class_constructor(Eo_Class *klass)
+_elm_player_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index de1ab74710..0742f2aec9 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -104,20 +104,20 @@ _visuals_set(Evas_Object *obj)
 static void
 _block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
 }
 
 static void
 _timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    evas_object_hide(data);
-   eo_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
+   efl_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
 }
 
 static void
 _hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
+   efl_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
 }
 
 
@@ -233,7 +233,7 @@ _elm_popup_efl_canvas_group_group_del(Eo *obj, Elm_Popup_Data *sd)
    evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_MOVE, _parent_geom_cb, obj);
    evas_object_event_callback_del_full(sd->notify, EVAS_CALLBACK_RESIZE, _notify_resize_cb, obj);
 
-   eo_event_callback_array_del(sd->notify, _notify_cb(), obj);
+   efl_event_callback_array_del(sd->notify, _notify_cb(), obj);
    evas_object_event_callback_del
      (sd->content, EVAS_CALLBACK_DEL, _on_content_del);
    evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _on_show);
@@ -854,7 +854,7 @@ _elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it)
 }
 
 EOLIAN static void
-_elm_popup_item_eo_base_destructor(Eo *eo_it, Elm_Popup_Item_Data *it)
+_elm_popup_item_efl_object_destructor(Eo *eo_it, Elm_Popup_Item_Data *it)
 {
    ELM_POPUP_ITEM_CHECK_OR_RETURN(it);
    ELM_POPUP_DATA_GET(WIDGET(it), sd);
@@ -867,7 +867,7 @@ _elm_popup_item_eo_base_destructor(Eo *eo_it, Elm_Popup_Item_Data *it)
         sd->items = NULL;
         _list_del(sd);
      }
-   eo_destructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
+   efl_destructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -883,7 +883,7 @@ _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Popup_Item_Data *it = data;
 
-   eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
 }
 
 static void
@@ -891,13 +891,13 @@ _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Popup_Item_Data *it = data;
 
-   eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
 }
 
 EOLIAN static Eo *
-_elm_popup_item_eo_base_constructor(Eo *eo_it, Elm_Popup_Item_Data *it)
+_elm_popup_item_efl_object_constructor(Eo *eo_it, Elm_Popup_Item_Data *it)
 {
-   eo_it = eo_constructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
+   eo_it = efl_constructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
    return eo_it;
@@ -919,9 +919,9 @@ _item_new(Elm_Popup_Item_Data *it)
         elm_layout_signal_callback_add(VIEW(it), "elm,action,click", "*",
                                        _item_select_cb, it);
         evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
-        eo_event_callback_add
+        efl_event_callback_add
               (VIEW(it), ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, it);
-        eo_event_callback_add
+        efl_event_callback_add
               (VIEW(it), ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it);
         evas_object_show(VIEW(it));
      }
@@ -1534,7 +1534,7 @@ _elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv)
          _size_hints_changed_cb, priv->main_layout);
 
    priv->content_text_wrap_type = ELM_WRAP_MIXED;
-   eo_event_callback_array_add(priv->notify, _notify_cb(), obj);
+   efl_event_callback_array_add(priv->notify, _notify_cb(), obj);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
    elm_widget_can_focus_set(priv->main_layout, EINA_TRUE);
@@ -1603,9 +1603,9 @@ elm_popup_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
+_elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
@@ -1847,7 +1847,7 @@ _elm_popup_dismiss(Eo *obj EINA_UNUSED, Elm_Popup_Data *pd)
 }
 
 static void
-_elm_popup_class_constructor(Eo_Class *klass)
+_elm_popup_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -1855,7 +1855,7 @@ _elm_popup_class_constructor(Eo_Class *klass)
 static Eina_Bool
 _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
+   efl_event_callback_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 2e81391303..568fd481c9 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -1242,9 +1242,9 @@ _elm_access_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
+_elm_access_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
@@ -1447,7 +1447,7 @@ elm_access_highlight_next_set(Evas_Object *obj, Elm_Highlight_Direction dir, Eva
 }
 
 EOLIAN static void
-_elm_access_class_constructor(Eo_Class *klass)
+_elm_access_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index e0d9fc17b4..43dbf353f4 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -6,7 +6,7 @@ class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action)
    data: null;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.activate;
       Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 70b0b1f39e..e506475d8c 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -155,13 +155,13 @@ _drag_button_move_cb(void *data,
    edje_object_part_drag_value_get
      (wd->resize_obj, "elm.drag_button_base", &pos, NULL);
    if (pos == 0.0)
-     eo_event_callback_call
+     efl_event_callback_call
        (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right");
    else if (pos == 1.0)
-     eo_event_callback_call
+     efl_event_callback_call
        (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left");
    else if (pos >= 0.45 && pos <= 0.55)
-     eo_event_callback_call
+     efl_event_callback_call
        (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
 }
 
@@ -232,15 +232,15 @@ _button_animator(void *data)
 
         if ((!sd->final_position) &&
             (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
-          eo_event_callback_call
+          efl_event_callback_call
             (obj, EFL_UI_EVENT_SELECTED, (char *)left);
         else if ((sd->final_position == 0.5) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
-          eo_event_callback_call
+          efl_event_callback_call
             (obj, EFL_UI_EVENT_SELECTED, (char *)center);
         else if ((sd->final_position == 1) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
-          eo_event_callback_call
+          efl_event_callback_call
             (obj, EFL_UI_EVENT_SELECTED, (char *)right);
 
         sd->button_animator = NULL;
@@ -278,7 +278,7 @@ _drag_button_up_cb(void *data,
         (elm_widget_mirrored_get(obj) && position == 1.0)))
      {
         sd->final_position = 0;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_SELECTED, (char *)left);
 
         return;
@@ -288,7 +288,7 @@ _drag_button_up_cb(void *data,
        (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
      {
         sd->final_position = 0.5;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_SELECTED, (char *)center);
 
         ecore_animator_del(sd->button_animator);
@@ -302,7 +302,7 @@ _drag_button_up_cb(void *data,
         (elm_widget_mirrored_get(obj) && position == 0.0)))
      {
         sd->final_position = 1;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_SELECTED, (char *)right);
         return;
      }
@@ -372,13 +372,13 @@ _track_move_cb(void *data,
           {
              if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
                {
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
                   sd->final_position = 0.5;
                }
              else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)
                {
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
                   sd->final_position = 1.0;
                }
@@ -386,7 +386,7 @@ _track_move_cb(void *data,
         else if ((sd->final_position == 0.5) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
           {
-             eo_event_callback_call
+             efl_event_callback_call
                (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
              sd->final_position = 1.0;
           }
@@ -395,7 +395,7 @@ _track_move_cb(void *data,
      {
         if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
           {
-             eo_event_callback_call
+             efl_event_callback_call
                (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
              sd->final_position = 0.5;
           }
@@ -406,13 +406,13 @@ _track_move_cb(void *data,
           {
              if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
                {
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
                   sd->final_position = 0.5;
                }
              else if (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)
                {
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left");
                   sd->final_position = 0.0;
                }
@@ -420,7 +420,7 @@ _track_move_cb(void *data,
         else if (sd->final_position == 0.5 &&
                 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
           {
-             eo_event_callback_call
+             efl_event_callback_call
                (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left");
              sd->final_position = 0.0;
           }
@@ -537,9 +537,9 @@ elm_actionslider_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
+_elm_actionslider_efl_object_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
@@ -647,7 +647,7 @@ _elm_actionslider_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm
 }
 
 static void
-_elm_actionslider_class_constructor(Eo_Class *klass)
+_elm_actionslider_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index d3a416d04f..85f5e1f3af 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -70,7 +70,7 @@ class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_app_client.c b/src/lib/elementary/elm_app_client.c
index b3884ea143..1c4309210d 100644
--- a/src/lib/elementary/elm_app_client.c
+++ b/src/lib/elementary/elm_app_client.c
@@ -42,7 +42,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
         view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, obj_path));
         eina_hash_add(data->views, obj_path, view);
         if (!loading_list)
-          eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
+          efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
 }
 
@@ -61,7 +61,7 @@ _objects_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA
    while (eldbus_message_iter_get_and_next(array_path, '{', &path))
      _sub_path_process(eo, path, cdata, EINA_TRUE);
 
-   eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, NULL);
+   efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, NULL);
 }
 
 static void _iface_add(void *data, const Eldbus_Message *msg)
@@ -105,8 +105,8 @@ _iface_del(void *data, const Eldbus_Message *msg)
           }
 
         eina_hash_del(cdata->views, path, NULL);
-        eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
-        eo_del(view);
+        efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
+        efl_del(view);
      }
 }
 
@@ -146,8 +146,8 @@ _pkg_name_owner_changed_cb(void *data, const char *bus EINA_UNUSED, const char *
           }
 
         eina_hash_del(cdata->views, path, NULL);
-        eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
-        eo_del(view);
+        efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
+        efl_del(view);
      }
 }
 
@@ -215,7 +215,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
      {
         view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, view_path));
         eina_hash_add(cdata->views, view_path, view);
-        eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
+        efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
 
    if (!view)
@@ -298,15 +298,15 @@ _elm_app_client_view_open_cancel(Eo *eo EINA_UNUSED, Elm_App_Client_Data *_pd EI
 }
 
 EOLIAN static Eo *
-_elm_app_client_eo_base_finalize(Eo *obj, Elm_App_Client_Data *data)
+_elm_app_client_efl_object_finalize(Eo *obj, Elm_App_Client_Data *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->views, NULL);
 
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
-_elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
+_elm_app_client_efl_object_destructor(Eo *eo, Elm_App_Client_Data *data)
 {
    Eldbus_Object *obj;
    Eldbus_Connection *conn;
@@ -315,7 +315,7 @@ _elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
 
    iter = eina_hash_iterator_data_new(data->views);
    EINA_ITERATOR_FOREACH(iter, view)
-     eo_del(view);
+     efl_del(view);
    eina_iterator_free(iter);
    eina_hash_free(data->views);
 
@@ -328,7 +328,7 @@ _elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
    eldbus_connection_unref(conn);
    eldbus_shutdown();
 
-   eo_destructor(eo_super(eo, MY_CLASS));
+   efl_destructor(eo_super(eo, MY_CLASS));
 }
 
 #include "elm_app_client.eo.c"
diff --git a/src/lib/elementary/elm_app_client.eo b/src/lib/elementary/elm_app_client.eo
index 61163b324a..d682c25808 100644
--- a/src/lib/elementary/elm_app_client.eo
+++ b/src/lib/elementary/elm_app_client.eo
@@ -3,7 +3,7 @@ import eina_types;
 type Elm_App_Client_Open_View_Cb: __undefined_type;
 type Elm_App_Client_Pending: __undefined_type;
 
-class Elm.App.Client (Eo.Base)
+class Elm.App.Client (Efl.Object)
 {
    methods {
       @property views {
@@ -52,8 +52,8 @@ class Elm.App.Client (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
    constructors {
       .constructor;
diff --git a/src/lib/elementary/elm_app_client_view.c b/src/lib/elementary/elm_app_client_view.c
index 7ea6d8a29d..fc723bc351 100644
--- a/src/lib/elementary/elm_app_client_view.c
+++ b/src/lib/elementary/elm_app_client_view.c
@@ -58,26 +58,26 @@ _prop_changed(void *user_data, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info
    Elm_App_Client_View_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
 
    if (!strcmp(prop_event->name, "Title"))
-     eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void *) _string_prop_get(v));
+     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void *) _string_prop_get(v));
    else if (!strcmp(prop_event->name, "IconName"))
-     eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, (void *) _string_prop_get(v));
+     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, (void *) _string_prop_get(v));
    else if (!strcmp(prop_event->name, "IconPixels"))
-     eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, NULL);
+     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, NULL);
    else if (!strcmp(prop_event->name, "NewEvents"))
-     eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
+     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
    else if (!strcmp(prop_event->name, "Progress"))
-     eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, (void *)(uintptr_t)_short_prop_get(v));
+     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, (void *)(uintptr_t)_short_prop_get(v));
    else if (!strcmp(prop_event->name, "State"))
      {
         cdata->state = _string_state_to_id(_string_prop_get(v));
-        eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
+        efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
      }
    else if (!strcmp(prop_event->name, "WindowId"))
-     eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
+     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
    else
       return;
 
-   eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, (void *) prop_event->name);
+   efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, (void *) prop_event->name);
 }
 
 static void
@@ -115,18 +115,18 @@ elm_app_client_view_internal_state_set(Eo *eo, Elm_App_View_State state)
    cdata->state = state;
    if (!changed)
      return;
-   eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
+   efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
 }
 
 EOLIAN static Eo *
-_elm_app_client_view_eo_base_finalize(Eo *eo, Elm_App_Client_View_Data *data)
+_elm_app_client_view_efl_object_finalize(Eo *eo, Elm_App_Client_View_Data *data)
 {
    Elm_App_Client *parent = NULL;
    const char *package = data->path;
    Eldbus_Connection *conn;
    Eldbus_Object *obj;
 
-   parent = eo_parent_get(eo);
+   parent = efl_parent_get(eo);
    EINA_SAFETY_ON_TRUE_RETURN_VAL((!parent) ||
                             (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), NULL);
 
@@ -147,7 +147,7 @@ _elm_app_client_view_eo_base_finalize(Eo *eo, Elm_App_Client_View_Data *data)
                                    ELDBUS_PROXY_EVENT_PROPERTY_LOADED,
                                    _props_loaded, eo);
 
-   return eo_finalize(eo_super(eo, MY_CLASS));
+   return efl_finalize(eo_super(eo, MY_CLASS));
 }
 
 static void
@@ -265,7 +265,7 @@ _elm_app_client_view_window_get(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *da
 EOLIAN static void
 _elm_app_client_view_path_set(Eo *eo, Elm_App_Client_View_Data *data, const char *path)
 {
-   if (eo_finalized_get(eo))
+   if (efl_finalized_get(eo))
      {
         ERR("Can't set id after object has been created.");
         return;
@@ -293,7 +293,7 @@ _elm_app_client_view_package_get(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *d
 }
 
 EOLIAN static void
-_elm_app_client_view_eo_base_destructor(Eo *eo, Elm_App_Client_View_Data *data)
+_elm_app_client_view_efl_object_destructor(Eo *eo, Elm_App_Client_View_Data *data)
 {
    Eldbus_Object *obj;
    Eldbus_Connection *conn;
@@ -309,7 +309,7 @@ _elm_app_client_view_eo_base_destructor(Eo *eo, Elm_App_Client_View_Data *data)
 
    eina_stringshare_del(data->path);
 
-   eo_destructor(eo_super(eo, MY_CLASS));
+   efl_destructor(eo_super(eo, MY_CLASS));
 }
 
 #include "elm_app_client_view.eo.c"
diff --git a/src/lib/elementary/elm_app_client_view.eo b/src/lib/elementary/elm_app_client_view.eo
index 3c335abc28..3d3acaee86 100644
--- a/src/lib/elementary/elm_app_client_view.eo
+++ b/src/lib/elementary/elm_app_client_view.eo
@@ -2,7 +2,7 @@ import elm_general;
 
 type Elm_App_Client_View_Cb: __undefined_type;
 
-class Elm.App.Client.View (Eo.Base)
+class Elm.App.Client.View (Efl.Object)
 {
    methods {
       @property state {
@@ -112,8 +112,8 @@ class Elm.App.Client.View (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
    events {
       state,changed; [[State of view changed.]]
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 2c426cb24a..020fca09a2 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -45,12 +45,12 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
    if (eina_hash_find(data->views, view_id))
      {
         ERR("%p already have a view with id=%s", data->pkg, view_id);
-        eo_del(view);
+        efl_del(view);
         return EINA_FALSE;
      }
 
    eina_hash_add(data->views, view_id, view);
-   eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, data);
+   efl_event_callback_add(view, EFL_EVENT_DEL, _view_del_cb, data);
    return EINA_TRUE;
 }
 
@@ -130,7 +130,7 @@ _method_terminate(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbu
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
 
-   eo_event_callback_call(eo, ELM_APP_SERVER_EVENT_TERMINATE, NULL);
+   efl_event_callback_call(eo, ELM_APP_SERVER_EVENT_TERMINATE, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -262,7 +262,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
              elm_app_server_view_icon_set(view, icon_name);
              elm_app_server_view_progress_set(view, progress);
              elm_app_server_view_new_events_set(view, new_events);
-             eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, data);
+             efl_event_callback_add(view, EFL_EVENT_DEL, _view_del_cb, data);
              elm_app_server_view_shallow(view);
 
              eina_hash_add(data->views, view_id, view);
@@ -304,7 +304,7 @@ _elm_app_server_save(Eo *obj EINA_UNUSED, Elm_App_Server_Data *data)
         icon_name = elm_app_server_view_icon_get(view);
         new_events = elm_app_server_view_new_events_get(view);
         progress = elm_app_server_view_progress_get(view);
-        eo_event_callback_call(view, ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL);
+        efl_event_callback_call(view, ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL);
 
         view_props = elm_app_server_view_props_new(id, title, icon_name,
                                                    new_events, progress);
@@ -415,15 +415,15 @@ _elm_app_server_view_add(Eo *obj EINA_UNUSED, Elm_App_Server_Data *data, Elm_App
 }
 
 EOLIAN static Eo *
-_elm_app_server_eo_base_finalize(Eo *obj, Elm_App_Server_Data *data)
+_elm_app_server_efl_object_finalize(Eo *obj, Elm_App_Server_Data *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->pkg, NULL);
 
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
-_elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
+_elm_app_server_efl_object_destructor(Eo *obj, Elm_App_Server_Data *data)
 {
    Eina_Iterator *iter;
    Elm_App_Server_View *view;
@@ -432,8 +432,8 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
    EINA_ITERATOR_FOREACH(iter, view)
      {
         //do not modify hash when iterating
-        eo_event_callback_del(view, EO_EVENT_DEL, _view_del_cb, data);
-        eo_del(view);
+        efl_event_callback_del(view, EFL_EVENT_DEL, _view_del_cb, data);
+        efl_del(view);
      }
    eina_iterator_free(iter);
    eina_hash_free(data->views);
@@ -446,7 +446,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
    eldbus_service_interface_unregister(data->iface);
    eldbus_connection_unref(data->conn);
    eldbus_shutdown();
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 #include "elm_app_server.eo.c"
diff --git a/src/lib/elementary/elm_app_server.eo b/src/lib/elementary/elm_app_server.eo
index 1f77c7a32d..cdae4de8e1 100644
--- a/src/lib/elementary/elm_app_server.eo
+++ b/src/lib/elementary/elm_app_server.eo
@@ -3,7 +3,7 @@ import elm_general;
 
 type Elm_App_Server_Create_View_Cb: __undefined_type;
 
-class Elm.App.Server (Eo.Base)
+class Elm.App.Server (Efl.Object)
 {
    eo_prefix: elm_app_server;
    methods {
@@ -94,8 +94,8 @@ class Elm.App.Server (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
    constructors {
       .constructor;
diff --git a/src/lib/elementary/elm_app_server_view.c b/src/lib/elementary/elm_app_server_view.c
index c13a8abba4..b9f4ebf720 100644
--- a/src/lib/elementary/elm_app_server_view.c
+++ b/src/lib/elementary/elm_app_server_view.c
@@ -43,7 +43,7 @@ _method_close(const Eldbus_Service_Interface *iface, const Eldbus_Message *messa
    Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
-   eo_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
+   efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -55,7 +55,7 @@ _method_pause(const Eldbus_Service_Interface *iface, const Eldbus_Message *messa
    Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
-   eo_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
+   efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -67,7 +67,7 @@ _method_resume(const Eldbus_Service_Interface *iface, const Eldbus_Message *mess
    Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_LIVE);
-   eo_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
+   efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -170,28 +170,28 @@ EOLIAN static void
 _elm_app_server_view_resume(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_LIVE);
-   eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
+   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
 }
 
 EOLIAN static void
 _elm_app_server_view_pause(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
-   eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
+   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
 }
 
 EOLIAN static void
 _elm_app_server_view_close(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
-   eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
+   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
 }
 
 EOLIAN static void
 _elm_app_server_view_shallow(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_SHALLOW);
-   eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL);
+   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL);
 }
 
 EOLIAN static Elm_App_View_State
@@ -303,13 +303,13 @@ _elm_app_server_view_id_set(Eo *obj, Elm_App_Server_View_Data *data, const char
 {
    Elm_App_Server *server = NULL;
 
-   if (eo_finalized_get(obj))
+   if (efl_finalized_get(obj))
      {
         ERR("Can't set id after object has been created.");
         return;
      }
 
-   server = eo_parent_get(obj);
+   server = efl_parent_get(obj);
    EINA_SAFETY_ON_TRUE_RETURN(!server || !eo_isa(server, ELM_APP_SERVER_CLASS));
 
    if (!id)
@@ -339,13 +339,13 @@ _elm_app_server_view_id_set(Eo *obj, Elm_App_Server_View_Data *data, const char
 }
 
 EOLIAN static Eo *
-_elm_app_server_view_eo_base_finalize(Eo *obj, Elm_App_Server_View_Data *data)
+_elm_app_server_view_efl_object_finalize(Eo *obj, Elm_App_Server_View_Data *data)
 {
    const char *server_path = NULL;
    char view_path[PATH_MAX];
    Elm_App_Server *server = NULL;
 
-   server = eo_parent_get(obj);
+   server = efl_parent_get(obj);
    EINA_SAFETY_ON_TRUE_RETURN_VAL(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), NULL);
 
 
@@ -368,11 +368,11 @@ _elm_app_server_view_eo_base_finalize(Eo *obj, Elm_App_Server_View_Data *data)
    data->title = eina_stringshare_add("");
    data->icon_name = eina_stringshare_add("");
 
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
-_elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data *data)
+_elm_app_server_view_efl_object_destructor(Eo *obj, Elm_App_Server_View_Data *data)
 {
    eina_stringshare_del(data->title);
    eina_stringshare_del(data->icon_name);
@@ -382,7 +382,7 @@ _elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data *data)
    eldbus_connection_unref(data->conn);
    eldbus_shutdown();
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 #include "elm_app_server_view.eo.c"
diff --git a/src/lib/elementary/elm_app_server_view.eo b/src/lib/elementary/elm_app_server_view.eo
index 6aad03e108..6405734318 100644
--- a/src/lib/elementary/elm_app_server_view.eo
+++ b/src/lib/elementary/elm_app_server_view.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.App.Server.View (Eo.Base)
+class Elm.App.Server.View (Efl.Object)
 {
    eo_prefix: elm_app_server_view;
    methods {
@@ -94,8 +94,8 @@ class Elm.App.Server.View (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
    events {
       resumed; [[Called when view must be resumed]]
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 33abe5f473..3327193a47 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -18,11 +18,11 @@ struct _Elm_Atspi_App_Object_Data
 };
 
 EOLIAN static void
-_elm_atspi_app_object_eo_base_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd)
+_elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd)
 {
    if (_pd->descr) eina_stringshare_del(_pd->descr);
 
-   eo_destructor(eo_super(obj, ELM_ATSPI_APP_OBJECT_CLASS));
+   efl_destructor(eo_super(obj, ELM_ATSPI_APP_OBJECT_CLASS));
 }
 
 EOLIAN static Eina_List*
diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo
index 05e8fb308a..84b3c13e6c 100644
--- a/src/lib/elementary/elm_atspi_app_object.eo
+++ b/src/lib/elementary/elm_atspi_app_object.eo
@@ -1,9 +1,9 @@
-class Elm.Atspi.App.Object (Eo.Base, Elm.Interface.Atspi_Accessible)
+class Elm.Atspi.App.Object (Efl.Object, Elm.Interface.Atspi_Accessible)
 {
    legacy_prefix: elm_atspi_app_object;
    data: Elm_Atspi_App_Object_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Elm.Interface.Atspi_Accessible.name.get;
       Elm.Interface.Atspi_Accessible.description.get;
       Elm.Interface.Atspi_Accessible.description.set;
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index e33de9b41a..81e9696dfa 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -144,8 +144,8 @@ static void _on_object_add(void *data, const Eo_Event *event);
 static void _on_object_del(void *data, const Eo_Event *event);
 
 typedef struct {
-     const Eo_Event_Description *desc;
-     const Eo_Event_Cb callback;
+     const Efl_Event_Description *desc;
+     const Efl_Event_Cb callback;
 } Elm_Atspi_Bridge_Event_Handler;
 
 static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
@@ -2500,7 +2500,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
    //Get interfaces to match
    while (eldbus_message_iter_get_and_next(ifc_iter, 's', &ifc_name))
      {
-        const Eo_Class *class = NULL;
+        const Efl_Class *class = NULL;
         if (!strcmp(ifc_name, "action"))
           class = ELM_INTERFACE_ATSPI_ACTION_MIXIN;
         else if (!strcmp(ifc_name, "component"))
@@ -2529,7 +2529,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
 static Eina_Bool
 _collection_match_interfaces_helper(Eo *obj, Eina_List *ifcs, Eina_Bool condition, Eina_Bool ret_if_true, Eina_Bool ret_if_false)
 {
-   Eo_Class *class;
+   Efl_Class *class;
    Eina_List *l;
 
    EINA_LIST_FOREACH(ifcs, l, class)
@@ -3792,7 +3792,7 @@ _registered_listeners_get(void *data, const Eldbus_Message *msg, Eldbus_Pending
      }
 
    if (!pd->connected)
-      eo_event_callback_call(data, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, NULL);
+      efl_event_callback_call(data, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, NULL);
    pd->connected = EINA_TRUE;
 }
 
@@ -3823,14 +3823,14 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
 
    if (!STATE_TYPE_GET(pd->object_state_broadcast_mask, state_data->type))
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
    if ((state_data->type > ELM_ATSPI_STATE_LAST_DEFINED) ||
         (int)state_data->type < 0)
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -3887,13 +3887,13 @@ _property_changed_signal_send(void *data, const Eo_Event *event)
    if (prop == ATSPI_OBJECT_PROPERTY_LAST)
      {
         ERR("Unrecognized property name!");
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
    if (!STATE_TYPE_GET(pd->object_property_broadcast_mask, prop))
      {
         DBG("Masking property %s changed event.", property);
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -3908,7 +3908,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))
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -3927,7 +3927,7 @@ _active_descendant_changed_signal_send(void *data, const Eo_Event *event)
 
    if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED))
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -3952,7 +3952,7 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
 
    if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, type))
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -3970,7 +3970,7 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
 
    if (!atspi_desc)
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -4002,20 +4002,20 @@ _window_signal_send(void *data, const Eo_Event *event)
      type = ATSPI_WINDOW_EVENT_RESTORE;
    else
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
    if (!STATE_TYPE_GET(pd->window_signal_broadcast_mask, type))
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
    if (!pd->a11y_bus)
      {
         ERR("A11Y connection closed. Unable to send ATSPI event.");
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -4030,7 +4030,7 @@ _selection_signal_send(void *data, const Eo_Event *event)
 
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED))
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
 
@@ -4295,7 +4295,7 @@ _a11y_connection_shutdown(Eo *bridge)
    elm_interface_atspi_accessible_event_handler_del(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, pd->event_hdlr);
    pd->event_hdlr = NULL;
 
-   eo_event_callback_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
+   efl_event_callback_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
    pd->connected = EINA_FALSE;
 }
 
@@ -4357,7 +4357,7 @@ _bridge_accessible_event_dispatch(void *data, const Eo_Event *event)
 
    _bridge_object_register(data, event->object);
 
-   Eo_Event_Cb cb = eina_hash_find(pd->event_hash, &event->desc);
+   Efl_Event_Cb cb = eina_hash_find(pd->event_hash, &event->desc);
    return cb ? cb(data, event) : EINA_TRUE;
 }
 
@@ -4495,7 +4495,7 @@ _elm_atspi_bridge_shutdown(void)
 {
    if (_init_count)
      {
-        eo_del(_instance);
+        efl_del(_instance);
         _init_count = 0;
      }
 }
@@ -4677,13 +4677,13 @@ _properties_changed_cb(void *data, Eldbus_Proxy *proxy EINA_UNUSED, void *event)
      }
 }
 
-EOLIAN Eo_Base*
-_elm_atspi_bridge_eo_base_constructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
+EOLIAN Efl_Object*
+_elm_atspi_bridge_efl_object_constructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
 {
    Eldbus_Proxy *proxy;
    Eldbus_Pending *req;
 
-   eo_constructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
+   efl_constructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
 
    elm_need_eldbus();
 
@@ -4725,14 +4725,14 @@ obj_err:
 }
 
 EOLIAN void
-_elm_atspi_bridge_eo_base_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
+_elm_atspi_bridge_efl_object_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
 {
    _a11y_connection_shutdown(obj);
 
    if (pd->bus_obj) eldbus_object_unref(pd->bus_obj);
    if (pd->session_bus) eldbus_connection_unref(pd->session_bus);
 
-   eo_destructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
+   efl_destructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
 }
 
 #include "elm_atspi_bridge.eo.c"
diff --git a/src/lib/elementary/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo
index f1fe41739c..404dfcf6f4 100644
--- a/src/lib/elementary/elm_atspi_bridge.eo
+++ b/src/lib/elementary/elm_atspi_bridge.eo
@@ -1,4 +1,4 @@
-class Elm.Atspi.Bridge (Eo.Base)
+class Elm.Atspi.Bridge (Efl.Object)
 {
    legacy_prefix: elm_atspi_bridge;
    eo_prefix: elm_obj_atspi_bridge;
@@ -14,8 +14,8 @@ class Elm.Atspi.Bridge (Eo.Base)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
    events {
       connected;
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index a019102f55..f1d4ceb226 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -119,10 +119,10 @@ elm_bg_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
+_elm_bg_efl_object_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
 {
    elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED);
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
@@ -268,7 +268,7 @@ _elm_bg_load_size_set(Eo *obj EINA_UNUSED, Elm_Bg_Data *sd, Evas_Coord w, Evas_C
 }
 
 static void
-_elm_bg_class_constructor(Eo_Class *klass)
+_elm_bg_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo
index 99afa09722..bf5a377cb3 100644
--- a/src/lib/elementary/elm_bg.eo
+++ b/src/lib/elementary/elm_bg.eo
@@ -95,7 +95,7 @@ class Elm.Bg (Elm.Layout, Efl.File)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 9532f8f175..1d266f8305 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -34,7 +34,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
    Evas_Object_Box_Option *opt = event->info;
-   eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
+   efl_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
 }
 
 static void
@@ -42,7 +42,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
    Evas_Object *child = event->info;
-   eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
+   efl_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
 }
 
 EOLIAN static Eina_Bool
@@ -299,9 +299,9 @@ _transition_layout_animation_start(Evas_Object *obj,
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb,
      layout_data);
-   eo_event_callback_add
+   efl_event_callback_add
      (obj, ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, layout_data);
-   eo_event_callback_add
+   efl_event_callback_add
      (obj, ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, layout_data);
 
    if (!layout_data->animator)
@@ -375,9 +375,9 @@ _elm_box_efl_canvas_group_group_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
    efl_canvas_group_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   eo_event_callback_add
+   efl_event_callback_add
       (wd->resize_obj, ELM_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (wd->resize_obj, ELM_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -421,10 +421,10 @@ elm_box_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
+_elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
 {
    elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
@@ -634,8 +634,8 @@ elm_box_transition_free(void *data)
 
    evas_object_event_callback_del
      (box_data->box, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb);
-   eo_event_callback_del(box_data->box, ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, box_data);
-   eo_event_callback_del(box_data->box, ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, box_data);
+   efl_event_callback_del(box_data->box, ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, box_data);
+   efl_event_callback_del(box_data->box, ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, box_data);
    ecore_animator_del(box_data->animator);
 
    free(data);
@@ -695,7 +695,7 @@ _elm_box_recalculate(Eo *obj, Elm_Box_Data *sd)
 }
 
 static void
-_elm_box_class_constructor(Eo_Class *klass)
+_elm_box_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 96ad6051a5..49137b101e 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -284,7 +284,7 @@ class Elm.Box (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index e6177257d2..acff629654 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -71,7 +71,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      return;
 
-   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 /* overriding layout's focus_next() in order to just cycle through the
@@ -225,9 +225,9 @@ elm_bubble_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
+_elm_bubble_efl_object_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
@@ -282,7 +282,7 @@ _elm_bubble_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Bubble_Data
 }
 
 EOLIAN static void
-_elm_bubble_class_constructor(Eo_Class *klass)
+_elm_bubble_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 0af6b717f2..02ff316092 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -37,7 +37,7 @@ class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 3bb22faddc..48393f66f0 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -69,7 +69,7 @@ _activate(Evas_Object *obj)
           _elm_access_say(E_("Clicked"));
         if (!elm_widget_disabled_get(obj) &&
             !evas_object_freeze_events_get(obj))
-          eo_event_callback_call
+          efl_event_callback_call
             (obj, EFL_UI_EVENT_CLICKED, NULL);
      }
 }
@@ -93,7 +93,7 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A
    if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
    if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_CLICKED, NULL);
    elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
 
@@ -201,7 +201,7 @@ _autorepeat_send(void *data)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_REPEATED, NULL);
    if (!sd->repeating)
      {
@@ -242,7 +242,7 @@ _on_pressed_signal(void *data,
               (sd->ar_initial_timeout, _autorepeat_initial_send, data);
      }
 
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_PRESSED, NULL);
 }
 
@@ -256,7 +256,7 @@ _on_unpressed_signal(void *data,
 
    ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_FALSE;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_UNPRESSED, NULL);
 }
 
@@ -332,9 +332,9 @@ elm_button_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
+_elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
@@ -440,7 +440,7 @@ _elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
 }
 
 static void
-_elm_button_class_constructor(Eo_Class *klass)
+_elm_button_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index b034835436..3b9d8fcaa6 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/elm_button.eo
@@ -74,7 +74,7 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.activate;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 2782ec35b4..8d46de0d10 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -935,9 +935,9 @@ _update_data(Evas_Object *obj, Eina_Bool month,
           sd->selected_time.tm_mday = maxdays;
 
         _fix_selected_time(sd);
-        eo_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
+        efl_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
      }
-   eo_event_callback_call(obj, ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1221,7 +1221,7 @@ _update_sel_it(Evas_Object *obj,
    sd->selected_time.tm_mday = day;
    _fix_selected_time(sd);
    _select(obj, sel_it);
-   eo_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -1588,9 +1588,9 @@ elm_calendar_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd)
+_elm_calendar_efl_object_constructor(Eo *obj, Elm_Calendar_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -1848,7 +1848,7 @@ _elm_calendar_displayed_time_get(const Eo *obj EINA_UNUSED, Elm_Calendar_Data *s
 }
 
 static void
-_elm_calendar_class_constructor(Eo_Class *klass)
+_elm_calendar_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 41418e2d55..db137d3ecd 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -382,7 +382,7 @@ class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index 918f9ce4cb..ccd4a100a0 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -75,7 +75,7 @@ _activate(Evas_Object *obj)
              _elm_access_say(E_("State: Off"));
      }
 
-   eo_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(obj,
@@ -251,7 +251,7 @@ _on_check_off(void *data,
    if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
 
    elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
-   eo_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -272,7 +272,7 @@ _on_check_on(void *data,
    efl_ui_nstate_value_set(obj, 1);
    if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
    elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
-   eo_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -364,9 +364,9 @@ elm_check_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
+_elm_check_efl_object_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX);
@@ -430,7 +430,7 @@ _elm_check_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
 }
 
 static void
-_elm_check_class_constructor(Eo_Class *klass)
+_elm_check_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo
index 7cb1dfbbcf..d2ebb37a73 100644
--- a/src/lib/elementary/elm_check.eo
+++ b/src/lib/elementary/elm_check.eo
@@ -23,7 +23,7 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.activate;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 838269dc3f..df618084b1 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -73,7 +73,7 @@ _on_clock_val_up(void *data)
    sd->interval = sd->interval / 1.05;
    ecore_timer_interval_set(sd->spin, sd->interval);
    _time_update(data, EINA_FALSE);
-   eo_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
    return ECORE_CALLBACK_RENEW;
 
 clock_val_up_cancel:
@@ -128,7 +128,7 @@ _on_clock_val_down(void *data)
    sd->interval = sd->interval / 1.05;
    ecore_timer_interval_set(sd->spin, sd->interval);
    _time_update(data, EINA_FALSE);
-   eo_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
    return ECORE_CALLBACK_RENEW;
 
 clock_val_down_cancel:
@@ -795,9 +795,9 @@ elm_clock_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
+_elm_clock_efl_object_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT);
@@ -949,7 +949,7 @@ _elm_clock_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Clock_
 }
 
 static void
-_elm_clock_class_constructor(Eo_Class *klass)
+_elm_clock_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index 1f500daa10..004eb96aa5 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -162,7 +162,7 @@ class Elm.Clock (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index cc6c64e8bd..f1c8a212e1 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -314,7 +314,7 @@ _dropable_list_geom_find(Evas *evas, Evas_Coord px, Evas_Coord py)
          */
         while (object)
           {
-             dropable = eo_key_data_get(object, "__elm_dropable");
+             dropable = efl_key_data_get(object, "__elm_dropable");
              if (dropable)
                {
                   Eina_Bool exist = EINA_FALSE;
@@ -437,7 +437,7 @@ static void
 _all_drop_targets_cbs_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
 {
    Dropable *dropable = NULL;
-   dropable = eo_key_data_get(obj, "__elm_dropable");
+   dropable = efl_key_data_get(obj, "__elm_dropable");
    if (dropable)
      {
         Dropable_Cbs *cbs;
@@ -449,7 +449,7 @@ _all_drop_targets_cbs_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Obje
                                  cbs->poscb, cbs->posdata, cbs->dropcb, cbs->dropdata);
              // If elm_drop_target_del() happened to delete dropabale, then
              // re-fetch it each loop to make sure it didn't
-             dropable = eo_key_data_get(obj, "__elm_dropable");
+             dropable = efl_key_data_get(obj, "__elm_dropable");
              if (!dropable) break;
           }
      }
@@ -1818,7 +1818,7 @@ _x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
                     {
                        Evas_Object *win = elm_widget_top_get(dragwidget);
                        if (win && eo_isa(win, EFL_UI_WIN_CLASS))
-                         eo_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
+                         efl_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                     }
                }
 
@@ -2089,7 +2089,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
    cbs->dropdata = dropdata;
    cbs->types = format;
 
-   dropable = eo_key_data_get(obj, "__elm_dropable");
+   dropable = efl_key_data_get(obj, "__elm_dropable");
    if (!dropable)
      {
         /* Create new drop */
@@ -2099,7 +2099,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
         drops = eina_list_append(drops, dropable);
         if (!drops) goto error;
         dropable->obj = obj;
-        eo_key_data_set(obj, "__elm_dropable", dropable);
+        efl_key_data_set(obj, "__elm_dropable", dropable);
      }
    dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
 
@@ -2274,7 +2274,7 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
         if (win && eo_isa(win, EFL_UI_WIN_CLASS))
           {
              elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
-             eo_event_callback_add(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
+             efl_event_callback_add(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
           }
      }
 
@@ -2713,7 +2713,7 @@ _wl_data_preparer_uri(Wl_Cnp_Selection *sel, Elm_Selection_Data *ddata, Ecore_Wl
 
    cnp_debug("In\n");
 
-   drop = eo_key_data_get(sel->requestwidget, "__elm_dropable");
+   drop = efl_key_data_get(sel->requestwidget, "__elm_dropable");
    if (drop) type = drop->last.type;
 
    if ((type) && (!strcmp(type, "text/uri-list")))
@@ -3076,7 +3076,7 @@ _wl_selection_send(void *data, int type EINA_UNUSED, void *event)
           {
              cnp_debug("Found a type: %s\n", _atoms[i].name);
              Dropable *drop;
-             drop = eo_key_data_get(sel->requestwidget, "__elm_dropable");
+             drop = efl_key_data_get(sel->requestwidget, "__elm_dropable");
              if (drop)
                drop->last.type = _atoms[i].name;
              if (_atoms[i].wl_converter)
@@ -3251,7 +3251,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
    cbs->dropdata = dropdata;
    cbs->types = format;
 
-   dropable = eo_key_data_get(obj, "__elm_dropable");
+   dropable = efl_key_data_get(obj, "__elm_dropable");
    if (!dropable)
      {
         /* Create new drop */
@@ -3260,7 +3260,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
         drops = eina_list_append(drops, dropable);
         if (!drops) goto error;
         dropable->obj = obj;
-        eo_key_data_set(obj, "__elm_dropable", dropable);
+        efl_key_data_set(obj, "__elm_dropable", dropable);
      }
 
    dropable->cbs_list =
@@ -3741,7 +3741,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, Ecore_Wl2_Event_Selection_Data_R
    Ecore_Wl2_Window *win;
 
    cnp_debug("In\n");
-   drop = eo_key_data_get(sel->requestwidget, "__elm_dropable");
+   drop = efl_key_data_get(sel->requestwidget, "__elm_dropable");
    if (drop)
      {
         Cnp_Atom *atom = NULL;
@@ -4391,7 +4391,7 @@ _local_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
 
    _local_elm_cnp_init();
 
-   dropable = eo_key_data_get(obj, "__elm_dropable");
+   dropable = efl_key_data_get(obj, "__elm_dropable");
    if (dropable)
      {
         Eina_Inlist *itr;
@@ -4412,7 +4412,7 @@ _local_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
         if (!dropable->cbs_list)
           {
              drops = eina_list_remove(drops, dropable);
-             eo_key_data_set(obj, "__elm_dropable", NULL);
+             efl_key_data_set(obj, "__elm_dropable", NULL);
              free(dropable);
              dropable = NULL;
              evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
@@ -5661,7 +5661,7 @@ elm_drag_cancel(Evas_Object *obj)
                {
                   Evas_Object *win = elm_widget_top_get(dragwidget);
                   if (win && eo_isa(win, EFL_UI_WIN_CLASS))
-                     eo_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
+                     efl_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                }
           }
         goto end;
diff --git a/src/lib/elementary/elm_code.c b/src/lib/elementary/elm_code.c
index dab4fb830b..ef1b6ec981 100644
--- a/src/lib/elementary/elm_code.c
+++ b/src/lib/elementary/elm_code.c
@@ -12,10 +12,10 @@
 static int _elm_code_init = 0;
 EAPI int _elm_code_lib_log_dom = -1;
 
-EAPI const Eo_Event_Description ELM_CODE_EVENT_LINE_LOAD_DONE =
-    EO_EVENT_DESCRIPTION("line,load,done");
-EAPI const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE =
-    EO_EVENT_DESCRIPTION("file,load,done");
+EAPI const Efl_Event_Description ELM_CODE_EVENT_LINE_LOAD_DONE =
+    EFL_EVENT_DESCRIPTION("line,load,done");
+EAPI const Efl_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE =
+    EFL_EVENT_DESCRIPTION("file,load,done");
 
 
 EAPI int
@@ -102,14 +102,14 @@ elm_code_free(Elm_Code *code)
 }
 
 EAPI void
-elm_code_callback_fire(Elm_Code *code, const Eo_Event_Description *signal, void *data)
+elm_code_callback_fire(Elm_Code *code, const Efl_Event_Description *signal, void *data)
 {
    Eina_List *item;
    Eo *widget;
 
    EINA_LIST_FOREACH(code->widgets, item, widget)
      {
-        eo_event_callback_call(widget, signal, data);
+        efl_event_callback_call(widget, signal, data);
      }
 }
 
diff --git a/src/lib/elementary/elm_code.h b/src/lib/elementary/elm_code.h
index f317fd763c..e93e30bd10 100644
--- a/src/lib/elementary/elm_code.h
+++ b/src/lib/elementary/elm_code.h
@@ -99,7 +99,7 @@ EAPI void elm_code_free(Elm_Code *code);
  */
 
 
-EAPI void elm_code_callback_fire(Elm_Code *code, const Eo_Event_Description *signal, void *data);
+EAPI void elm_code_callback_fire(Elm_Code *code, const Efl_Event_Description *signal, void *data);
 
 
 /**
diff --git a/src/lib/elementary/elm_code_common.h b/src/lib/elementary/elm_code_common.h
index 163bbae072..7af9131838 100644
--- a/src/lib/elementary/elm_code_common.h
+++ b/src/lib/elementary/elm_code_common.h
@@ -5,9 +5,9 @@ typedef struct _Elm_Code Elm_Code;
 typedef struct _Elm_Code_File Elm_Code_File;
 
 /** Event marking that a single line has loaded or changed */
-EAPI extern const Eo_Event_Description ELM_CODE_EVENT_LINE_LOAD_DONE;
+EAPI extern const Efl_Event_Description ELM_CODE_EVENT_LINE_LOAD_DONE;
 /** Event that marks a file load has been completed */
-EAPI extern const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE;
+EAPI extern const Efl_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE;
 
 typedef enum {
    ELM_CODE_STATUS_TYPE_DEFAULT = 0,
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 0f2c11b0c9..132bf06bec 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -45,7 +45,7 @@ Eina_Unicode status_icons[] = {
 #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
    Eina_Bool finalized; \
    \
-   finalized = eo_finalized_get(obj); \
+   finalized = efl_finalized_get(obj); \
    if (finalized) \
      { \
         ERR("This function is only allowed during construction."); \
@@ -65,9 +65,9 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
 }
 
 EOLIAN static Eo *
-_elm_code_widget_eo_base_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
+_elm_code_widget_efl_object_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, ELM_CODE_WIDGET_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_CODE_WIDGET_CLASS));
 
    pd->cursor_line = 1;
    pd->cursor_col = 1;
@@ -78,9 +78,9 @@ _elm_code_widget_eo_base_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
 }
 
 EOLIAN static Eo *
-_elm_code_widget_eo_base_finalize(Eo *obj, Elm_Code_Widget_Data *pd)
+_elm_code_widget_efl_object_finalize(Eo *obj, Elm_Code_Widget_Data *pd)
 {
-   obj = eo_finalize(eo_super(obj, ELM_CODE_WIDGET_CLASS));
+   obj = efl_finalize(eo_super(obj, ELM_CODE_WIDGET_CLASS));
 
    if (pd->code)
      return obj;
@@ -90,7 +90,7 @@ _elm_code_widget_eo_base_finalize(Eo *obj, Elm_Code_Widget_Data *pd)
 }
 
 EOLIAN static void
-_elm_code_widget_class_constructor(Eo_Class *klass EINA_UNUSED)
+_elm_code_widget_class_constructor(Efl_Class *klass EINA_UNUSED)
 {
 
 }
@@ -595,7 +595,7 @@ _elm_code_widget_cursor_move(Elm_Code_Widget *widget, Elm_Code_Widget_Data *pd,
    if (!was_key)
      _elm_code_widget_update_focus_directions(widget);
 
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CURSOR_CHANGED, widget);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CURSOR_CHANGED, widget);
    _elm_code_widget_cursor_ensure_visible(widget);
 
    if (oldrow != pd->cursor_line)
@@ -666,7 +666,7 @@ _elm_code_widget_clicked_gutter_cb(Elm_Code_Widget *widget, unsigned int row)
    if (!line)
      return;
 
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_GUTTER_CLICKED, line);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_GUTTER_CLICKED, line);
 }
 
 static void
@@ -702,7 +702,7 @@ _elm_code_widget_clicked_readonly_cb(Elm_Code_Widget *widget, unsigned int row)
    if (!line)
      return;
 
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, line);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, line);
 }
 
 static void
@@ -1064,7 +1064,7 @@ _elm_code_widget_text_at_cursor_insert_do(Elm_Code_Widget *widget, const char *t
    // a workaround for when the cursor position would be off the line width
    _elm_code_widget_resize(widget, line);
    elm_obj_code_widget_cursor_position_set(widget, col + col_width, row);
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    if (undo)
      {
@@ -1143,7 +1143,7 @@ _elm_code_widget_newline(Elm_Code_Widget *widget)
 
    indent = elm_obj_code_widget_line_text_column_width_to_position(widget, line, leading);
    elm_obj_code_widget_cursor_position_set(widget, indent, row + 1);
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    change = _elm_code_widget_change_create(width + 1, row, indent - 1, row + 1, "\n", 1, EINA_TRUE);
    _elm_code_widget_undo_change_add(widget, change);
@@ -1176,7 +1176,7 @@ _elm_code_widget_backspaceline(Elm_Code_Widget *widget, Eina_Bool nextline)
         elm_obj_code_widget_cursor_position_set(widget, position, row - 1);
      }
 // TODO construct and pass a change object
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 }
 
 void
@@ -1215,7 +1215,7 @@ _elm_code_widget_backspace(Elm_Code_Widget *widget)
    elm_code_line_text_remove(line, position - char_width, char_width);
    elm_obj_code_widget_cursor_position_set(widget, start_col, row);
 
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    change = _elm_code_widget_change_create(start_col, row, end_col, row, text, char_width, EINA_FALSE);
    _elm_code_widget_undo_change_add(widget, change);
@@ -1256,7 +1256,7 @@ _elm_code_widget_delete(Elm_Code_Widget *widget)
    text = elm_code_widget_text_between_positions_get(widget, start_col, row, end_col, row);
    elm_code_line_text_remove(line, position, char_width);
    elm_obj_code_widget_cursor_position_set(widget, start_col, row);
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    change = _elm_code_widget_change_create(start_col, row, col, row, text, char_width, EINA_FALSE);
    _elm_code_widget_undo_change_add(widget, change);
@@ -1283,7 +1283,7 @@ _elm_code_widget_control_key_down_cb(Elm_Code_Widget *widget, const char *key)
      elm_code_widget_undo(widget);
 
    // TODO construct and pass a change object for cut and paste
-         eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+         efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 }
 
 static void
@@ -1852,10 +1852,10 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
    evas_object_smart_callback_add(obj, "unfocused", _elm_code_widget_unfocused_event_cb, obj);
    evas_object_smart_callback_add(scroller, "scroll", _elm_code_widget_scroll_event_cb, obj);
 
-   eo_event_callback_add(obj, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_widget_line_cb, obj);
-   eo_event_callback_add(obj, &ELM_CODE_EVENT_FILE_LOAD_DONE, _elm_code_widget_file_cb, obj);
-   eo_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
-   eo_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
+   efl_event_callback_add(obj, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_widget_line_cb, obj);
+   efl_event_callback_add(obj, &ELM_CODE_EVENT_FILE_LOAD_DONE, _elm_code_widget_file_cb, obj);
+   efl_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
+   efl_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
 }
 
 #include "elm_code_widget_text.c"
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 82c6c261e5..b23a073ce3 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -244,8 +244,8 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.finalize;
+      Efl.Object.constructor;
+      Efl.Object.finalize;
       Efl.Canvas.Group.group_add;
       Elm.Widget.event;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_code_widget_selection.c b/src/lib/elementary/elm_code_widget_selection.c
index 2bde7391a4..7873b8a001 100644
--- a/src/lib/elementary/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -62,7 +62,7 @@ elm_code_widget_selection_start(Evas_Object *widget,
 
    pd->selection->start_line = line;
    pd->selection->start_col = col;
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
    elm_obj_code_widget_cursor_position_set(widget, col, line);
 }
 
@@ -88,7 +88,7 @@ elm_code_widget_selection_end(Evas_Object *widget,
 
    pd->selection->end_line = line;
    pd->selection->end_col = col;
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
 }
 
 EAPI Elm_Code_Widget_Selection_Data *
@@ -144,7 +144,7 @@ elm_code_widget_selection_clear(Evas_Object *widget)
 
    free(pd->selection);
    pd->selection = NULL;
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
 }
 
 static void
@@ -246,7 +246,7 @@ elm_code_widget_selection_delete(Evas_Object *widget)
 
    free(pd->selection);
    pd->selection = NULL;
-   eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
+   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
 }
 
 EAPI void
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 979d3e171b..5dde9a59ff 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -158,7 +158,7 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
 
    if (!cc->current)
      {
-        eo_event_callback_stop(event->object);
+        efl_event_callback_stop(event->object);
         return;
      }
    //if (cc->winid && remote_iface)
@@ -170,7 +170,7 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
         //eldbus_message_arguments_append(msg, "s", cc->current->name);
         //eldbus_service_signal_send(remote_iface, msg);
         //cc->change_reset = 1;
-        //eo_event_callback_stop(event->object);
+        //efl_event_callback_stop(event->object);
         //return;
      //}
    edje_color_class_del(cc->current->name);
@@ -737,7 +737,7 @@ elm_color_class_editor_add(Evas_Object *obj)
    elm_scroller_policy_set(gl, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
    elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
    elm_object_part_content_set(ly, "elm.swallow.list", gl);
-   eo_event_callback_add
+   efl_event_callback_add
      (gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc);
 
    cc->reset = bt = elm_button_add(ly);
@@ -745,13 +745,13 @@ elm_color_class_editor_add(Evas_Object *obj)
    /* FIXME: translate */
    elm_object_text_set(bt, "Reset");
    elm_object_part_content_set(ly, "elm.swallow.reset", bt);
-   eo_event_callback_add
+   efl_event_callback_add
      (bt, EFL_UI_EVENT_CLICKED, _colorclass_reset, cc);
 
    cc->cs = cs = elm_colorselector_add(ly);
    elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS);
    elm_object_part_content_set(ly, "elm.swallow.colors", cs);
-   eo_event_callback_add
+   efl_event_callback_add
      (cs, ELM_COLORSELECTOR_EVENT_CHANGED_USER, _colorclass_changed, cc);
 
    EINA_LIST_FREE(ccs, ecc)
diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo
index f83af13331..eab8b5416e 100644
--- a/src/lib/elementary/elm_color_item.eo
+++ b/src/lib/elementary/elm_color_item.eo
@@ -36,8 +36,8 @@ class Elm.Color.Item(Elm.Widget.Item)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Elm.Widget.Item.access_register;
       Elm.Widget.Item.signal_emit;
    }
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index df972a70e2..0759ce88f2 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -232,7 +232,7 @@ _items_del(Elm_Colorselector_Data *sd)
 
    EINA_LIST_FREE(sd->items, item)
      {
-        eo_del (item);
+        efl_del (item);
      }
 
    sd->items = NULL;
@@ -575,8 +575,8 @@ _update_hsla_from_colorbar(Evas_Object *obj, Color_Type type, double x)
    _update_colorbars(sd);
    if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_PICKER))
      _color_picker_init(sd);
-   eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
-   eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 }
 
 static void
@@ -633,7 +633,7 @@ _colors_set(Evas_Object *obj,
    if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_PICKER))
      _color_picker_init(sd);
    if (!mode_change)
-     eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
+     efl_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -678,7 +678,7 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
          break;
      }
    evas_object_data_del(event->object, "_changed");
-   eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 }
 
 #ifdef HAVE_ELEMENTARY_X
@@ -766,7 +766,7 @@ _mouse_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 
    _unselect_selected_item(sd);
    _colors_set(o, r, g, b, 0xFF, EINA_FALSE);
-   eo_event_callback_call(o, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_call(o, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 
    return EINA_TRUE;
 }
@@ -908,7 +908,7 @@ _create_colorpicker(Evas_Object *obj)
         sd->button = elm_button_add(sd->picker);
         elm_object_style_set(sd->button, style);
         elm_object_text_set(sd->button, E_("Pick a color"));
-        eo_event_callback_add
+        efl_event_callback_add
               (sd->button, EFL_UI_EVENT_CLICKED, _start_grab_pick_cb, obj);
         elm_box_pack_end(bx, sd->button);
         evas_object_show(sd->button);
@@ -932,7 +932,7 @@ _create_colorpicker(Evas_Object *obj)
         spinner = elm_spinner_add(sd->picker);
         elm_object_style_set(spinner, style);
         evas_object_data_set(spinner, "parent", obj);
-        eo_event_callback_add
+        efl_event_callback_add
               (spinner, ELM_SPINNER_EVENT_CHANGED, _spinner_changed_cb, sd);
         elm_spinner_editable_set(spinner, EINA_TRUE);
         elm_spinner_interval_set(spinner, 0.1);
@@ -1258,14 +1258,14 @@ _color_bars_add(Evas_Object *obj)
         elm_widget_sub_object_add(sd->col_bars_area, sd->cb_data[i]->lbt);
         edje_object_part_swallow
           (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
-        eo_event_callback_add
+        efl_event_callback_add
           (sd->cb_data[i]->lbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
         elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE);
         elm_button_autorepeat_initial_timeout_set
           (sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
         elm_button_autorepeat_gap_timeout_set
           (sd->cb_data[i]->lbt, (1.0 / _elm_config->fps));
-        eo_event_callback_add
+        efl_event_callback_add
           (sd->cb_data[i]->lbt, EFL_UI_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
 
         /* load right button */
@@ -1276,14 +1276,14 @@ _color_bars_add(Evas_Object *obj)
         elm_widget_sub_object_add(sd->col_bars_area, sd->cb_data[i]->rbt);
         edje_object_part_swallow
           (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
-        eo_event_callback_add
+        efl_event_callback_add
           (sd->cb_data[i]->rbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
         elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE);
         elm_button_autorepeat_initial_timeout_set
           (sd->cb_data[i]->rbt, _elm_config->longpress_timeout);
         elm_button_autorepeat_gap_timeout_set
           (sd->cb_data[i]->rbt, (1.0 / _elm_config->fps));
-        eo_event_callback_add
+        efl_event_callback_add
           (sd->cb_data[i]->rbt, EFL_UI_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
      }
 }
@@ -1538,7 +1538,7 @@ _on_color_long_press(void *data)
 
    sd->longpress_timer = NULL;
 
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_LONGPRESSED, EO_OBJ(item));
 
    return ECORE_CALLBACK_CANCEL;
@@ -1613,7 +1613,7 @@ _on_color_released(void *data,
    elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
    elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
                                item->color->b, item->color->a);
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, EO_OBJ(item));
 
    eo_temp_item = eina_list_data_get(sd->selected);
@@ -1701,13 +1701,13 @@ _elm_color_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED,
 }
 
 EOLIAN static Eo *
-_elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
+_elm_color_item_efl_object_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
 {
-   eo_item = eo_constructor(eo_super(eo_item, ELM_COLOR_ITEM_CLASS));
+   eo_item = efl_constructor(eo_super(eo_item, ELM_COLOR_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *obj;
-   obj = eo_parent_get(eo_item);
+   obj = efl_parent_get(eo_item);
 
    VIEW(item) = elm_layout_add(obj);
    if (!elm_layout_theme_set
@@ -1746,10 +1746,10 @@ _elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
 }
 
 EOLIAN static void
-_elm_color_item_eo_base_destructor(Eo *obj, Elm_Color_Item_Data *item)
+_elm_color_item_efl_object_destructor(Eo *obj, Elm_Color_Item_Data *item)
 {
    free(item->color);
-   eo_destructor(eo_super(obj, ELM_COLOR_ITEM_CLASS));
+   efl_destructor(eo_super(obj, ELM_COLOR_ITEM_CLASS));
 }
 
 static void
@@ -2099,7 +2099,7 @@ _key_action_move(Evas_Object *obj, const char *params)
         elm_colorselector_color_set
           (WIDGET(item), item->color->r, item->color->g, item->color->b,
           item->color->a);
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, eo_item);
         elm_obj_color_item_selected_set(eo_item, EINA_TRUE);
      }
@@ -2234,9 +2234,9 @@ elm_colorselector_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
+_elm_colorselector_efl_object_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER);
@@ -2537,7 +2537,7 @@ _elm_colorselector_palette_name_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data
 }
 
 static void
-_elm_colorselector_class_constructor(Eo_Class *klass)
+_elm_colorselector_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index 20332c7b4d..78faf142a8 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -107,7 +107,7 @@ selected.]]
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index b77c8d49cd..2a42f7fced 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -35,7 +35,7 @@ class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 728e85da00..0ca7ca62ed 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1691,7 +1691,7 @@ _config_load(void)
    _efl_config_obj = eo_add(EFL_CONFIG_GLOBAL_CLASS, NULL);
    efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
    efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
-   eo_del_intercept_set(_efl_config_obj, _efl_config_obj_del);
+   efl_del_intercept_set(_efl_config_obj, _efl_config_obj_del);
    _elm_config = _config_user_load();
    if (_elm_config)
      {
@@ -4313,10 +4313,10 @@ _elm_config_profile_set(const char *profile)
 void
 _elm_config_shutdown(void)
 {
-   eo_del_intercept_set(_efl_config_obj, NULL);
+   efl_del_intercept_set(_efl_config_obj, NULL);
    efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, NULL);
    efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, NULL);
-   ELM_SAFE_FREE(_efl_config_obj, eo_del);
+   ELM_SAFE_FREE(_efl_config_obj, efl_del);
    ELM_SAFE_FREE(_elm_config, _config_free);
    ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del);
    ELM_SAFE_FREE(_elm_accel_preference, eina_stringshare_del);
@@ -4808,7 +4808,7 @@ _efl_config_global_profile_iterate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, E
    it->iterator.next = FUNC_ITERATOR_NEXT(_profile_iterator_next);
    it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_profile_iterator_get_container);
    it->iterator.free = FUNC_ITERATOR_FREE(_profile_iterator_free);
-   eo_wref_add(obj, &it->object);
+   efl_wref_add(obj, &it->object);
 
    return &it->iterator;
 }
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 29b8b2594e..ead9d91b72 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -408,7 +408,7 @@ _create_portrait_indicator(Evas_Object *obj)
      }
 
    elm_widget_sub_object_add(obj, port_indicator);
-   eo_event_callback_add
+   efl_event_callback_add
      (port_indicator, ELM_PLUG_EVENT_IMAGE_DELETED, _port_indicator_disconnected, obj);
    evas_object_size_hint_min_set(port_indicator, -1, 0);
    evas_object_size_hint_max_set(port_indicator, -1, 0);
@@ -450,7 +450,7 @@ _create_landscape_indicator(Evas_Object *obj)
      }
 
    elm_widget_sub_object_add(obj, land_indicator);
-   eo_event_callback_add
+   efl_event_callback_add
      (land_indicator, ELM_PLUG_EVENT_IMAGE_DELETED, _land_indicator_disconnected, obj);
    evas_object_size_hint_min_set(land_indicator, -1, 0);
    evas_object_size_hint_max_set(land_indicator, -1, 0);
@@ -760,7 +760,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
         if (!sd->clipboard_state)
           elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
-        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL);
+        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL);
      }
    else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
      {
@@ -768,7 +768,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
         elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_COMPRESS);
         _autoscroll_objects_update(obj);
-        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_ON, NULL);
+        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_ON, NULL);
      }
 }
 
@@ -798,13 +798,13 @@ _clipboard_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         evas_object_size_hint_max_set(sd->clipboard, -1, 0);
         if (!sd->vkb_state)
           elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
-        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL);
+        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL);
      }
    else if (state == ECORE_X_ILLUME_CLIPBOARD_STATE_ON)
      {
         elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_COMPRESS);
         _autoscroll_objects_update(obj);
-        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_ON, NULL);
+        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_ON, NULL);
      }
 }
 
@@ -949,8 +949,8 @@ _elm_conformant_efl_canvas_group_group_del(Eo *obj, Elm_Conformant_Data *sd)
 
    evas_object_data_set(sd->win, "\377 elm,conformant", NULL);
 
-   eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
-   eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
+   efl_event_callback_del(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
+   efl_event_callback_del(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
 
    efl_canvas_group_del(eo_super(obj, MY_CLASS));
 }
@@ -993,9 +993,9 @@ elm_conformant_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
+_elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
@@ -1011,14 +1011,14 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
    sd->rot = elm_win_rotation_get(sd->win);
    evas_object_data_set(sd->win, "\377 elm,conformant", obj);
 
-   eo_event_callback_add(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
-   eo_event_callback_add(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
+   efl_event_callback_add(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
+   efl_event_callback_add(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
 
    return obj;
 }
 
 static void
-_elm_conformant_class_constructor(Eo_Class *klass)
+_elm_conformant_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 8d760ea3d7..73cb09f5fd 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -5,7 +5,7 @@ class Elm.Conformant (Elm.Layout)
    event_prefix: elm_conformant;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.widget_parent.set;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index e993ac0ed8..d38cb26c92 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -202,7 +202,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_add;
       Elm.Widget.widget_parent.set;
diff --git a/src/lib/elementary/elm_ctxpopup_item.eo b/src/lib/elementary/elm_ctxpopup_item.eo
index 657e69aad0..1db2c07b7f 100644
--- a/src/lib/elementary/elm_ctxpopup_item.eo
+++ b/src/lib/elementary/elm_ctxpopup_item.eo
@@ -39,8 +39,8 @@ class Elm.Ctxpopup.Item(Elm.Widget.Item)
       }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.disable;
         Elm.Widget.Item.signal_emit;
         Elm.Widget.Item.part_text.get;
diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c
index b1e6685e9d..f5ef1c99aa 100644
--- a/src/lib/elementary/elm_datetime.c
+++ b/src/lib/elementary/elm_datetime.c
@@ -889,9 +889,9 @@ elm_datetime_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
+_elm_datetime_efl_object_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR);
@@ -1025,7 +1025,7 @@ _elm_datetime_field_limit_set(Eo *obj, Elm_Datetime_Data *sd, Elm_Datetime_Field
    _apply_field_limits(obj);
 
    if (!_field_cmp(fieldtype, &old_time, &sd->curr_time))
-     eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+     efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
 }
 
@@ -1052,7 +1052,7 @@ _elm_datetime_value_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *newtime
    _validate_datetime_limits(&sd->max_limit, &sd->curr_time, EINA_TRUE);
    _apply_field_limits(obj);
 
-   eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1084,7 +1084,7 @@ _elm_datetime_value_min_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *min
    _apply_field_limits(obj);
 
    if (!_date_cmp(&old_time, &sd->curr_time))
-     eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+     efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1116,13 +1116,13 @@ _elm_datetime_value_max_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *max
    _apply_field_limits(obj);
 
    if (!_date_cmp(&old_time, &sd->curr_time))
-     eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+     efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
 
 EOLIAN static void
-_elm_datetime_class_constructor(Eo_Class *klass)
+_elm_datetime_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_datetime.eo b/src/lib/elementary/elm_datetime.eo
index d6783799e6..f81b32c7b3 100644
--- a/src/lib/elementary/elm_datetime.eo
+++ b/src/lib/elementary/elm_datetime.eo
@@ -291,7 +291,7 @@ class Elm.Datetime (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 8cbfb47c2c..af8112a4cf 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -175,7 +175,7 @@ _item_del_cb(void *data,
              elm_layout_signal_emit(obj, buf, "elm");
 
              VIEW(it) = NULL;
-             eo_del(EO_OBJ(it));
+             efl_del(EO_OBJ(it));
 
              elm_layout_sizing_eval(obj);
              break;
@@ -199,7 +199,7 @@ _item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Dayselector_Item_Data *it = data;
 
-   eo_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day);
+   efl_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day);
 }
 
 static Elm_Dayselector_Item_Data *
@@ -259,7 +259,7 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
         int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), buf), content);
         if (!int_ret)
           {
-             eo_del(eo_it);
+             efl_del(eo_it);
              return EINA_FALSE;
           }
 
@@ -270,7 +270,7 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
    snprintf(buf, sizeof(buf), "day%d,visible", _item_location_get(sd, it));
    elm_layout_signal_emit(obj, buf, "elm");
 
-   eo_event_callback_add
+   efl_event_callback_add
      (VIEW(it), EFL_UI_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
    evas_object_event_callback_add
      (VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb, obj);
@@ -291,9 +291,9 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
 }
 
 EOLIAN static Eo *
-_elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item)
+_elm_dayselector_item_efl_object_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item)
 {
-   eo_item = eo_constructor(eo_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS));
+   eo_item = efl_constructor(eo_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -319,7 +319,7 @@ _elm_dayselector_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *it
    if (!content) return NULL;
 
    sd->items = eina_list_remove(sd->items, it);
-   eo_event_callback_del(content, EFL_UI_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
+   efl_event_callback_del(content, EFL_UI_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
    evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_del_cb);
 
    elm_object_signal_callback_del
@@ -335,7 +335,7 @@ _elm_dayselector_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *it
    elm_layout_signal_emit(obj, buf, "elm");
 
    VIEW(it) = NULL;
-   eo_del(EO_OBJ(it));
+   efl_del(EO_OBJ(it));
 
    elm_layout_sizing_eval(obj);
 
@@ -442,7 +442,7 @@ _elm_dayselector_efl_canvas_group_group_del(Eo *obj, Elm_Dayselector_Data *sd)
      {
         sd->items = eina_list_remove(sd->items, it);
         eina_stringshare_del(it->day_style);
-        eo_del(EO_OBJ(it));
+        efl_del(EO_OBJ(it));
      }
 
    /* handles freeing sd */
@@ -458,9 +458,9 @@ elm_dayselector_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
+_elm_dayselector_efl_object_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
@@ -608,7 +608,7 @@ _elm_dayselector_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_
 }
 
 static void
-_elm_dayselector_class_constructor(Eo_Class *klass)
+_elm_dayselector_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index 84eec695ea..f7dee786ab 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -149,7 +149,7 @@ class Elm.Dayselector (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_dayselector_item.eo b/src/lib/elementary/elm_dayselector_item.eo
index 3983078ed8..43e9f0de93 100644
--- a/src/lib/elementary/elm_dayselector_item.eo
+++ b/src/lib/elementary/elm_dayselector_item.eo
@@ -2,6 +2,6 @@ class Elm.Dayselector.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_dayselector_item;
    implements {
-        Eo.Base.constructor;
+        Efl.Object.constructor;
    }
 }
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index c315616b2e..64aba70ce8 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -89,7 +89,7 @@ _item_select(Elm_Diskselector_Item_Data *it)
    _selected_item_indicate(sd->selected_item);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
 }
 
@@ -349,7 +349,7 @@ _sizing_eval(Evas_Object *obj)
 }
 
 EOLIAN static void
-_elm_diskselector_item_eo_base_destructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
+_elm_diskselector_item_efl_object_destructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
 {
    Elm_Diskselector_Item_Data *item2, *dit;
    Eina_List *l;
@@ -473,7 +473,7 @@ _elm_diskselector_item_eo_base_destructor(Eo *eo_it, Elm_Diskselector_Item_Data
 
    _sizing_eval(obj);
 
-   eo_destructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
+   efl_destructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -611,7 +611,7 @@ _item_click_cb(void *data,
      }
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), EFL_UI_EVENT_CLICKED, eo_it);
 }
 
@@ -650,9 +650,9 @@ _access_on_highlight_cb(void *data)
 }
 
 EOLIAN static Eo *
-_elm_diskselector_item_eo_base_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
+_elm_diskselector_item_efl_object_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
 {
-   eo_it = eo_constructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
+   eo_it = efl_constructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
    return eo_it;
@@ -1098,7 +1098,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 
    if (!it) return;
    _item_select(it);
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it));
 }
 
@@ -1106,7 +1106,7 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
 }
 
@@ -1114,7 +1114,7 @@ static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
 }
 
@@ -1122,7 +1122,7 @@ static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
 }
 
@@ -1131,7 +1131,7 @@ _round_item_del(Elm_Diskselector_Data *sd EINA_UNUSED,
                 Elm_Diskselector_Item_Data *it)
 {
    if (!it) return;
-   eo_del(EO_OBJ(it));
+   efl_del(EO_OBJ(it));
 }
 
 static void
@@ -1362,28 +1362,28 @@ _elm_diskselector_efl_canvas_group_group_del(Eo *obj, Elm_Diskselector_Data *sd)
    if (sd->last)
      {
         evas_object_del(sd->VIEW(last));
-        eo_del(EO_OBJ(sd->last));
+        efl_del(EO_OBJ(sd->last));
         sd->last = NULL;
      }
 
    if (sd->s_last)
      {
         evas_object_del(sd->VIEW(s_last));
-        eo_del(EO_OBJ(sd->s_last));
+        efl_del(EO_OBJ(sd->s_last));
         sd->s_last = NULL;
      }
 
    if (sd->second)
      {
         evas_object_del(sd->VIEW(second));
-        eo_del(EO_OBJ(sd->second));
+        efl_del(EO_OBJ(sd->second));
         sd->second = NULL;
      }
 
    if (sd->first)
      {
         evas_object_del(sd->VIEW(first));
-        eo_del(EO_OBJ(sd->first));
+        efl_del(EO_OBJ(sd->first));
         sd->first = NULL;
      }
 
@@ -1392,7 +1392,7 @@ _elm_diskselector_efl_canvas_group_group_del(Eo *obj, Elm_Diskselector_Data *sd)
         if (it)
           {
              evas_object_del(VIEW(it));
-             eo_del(EO_OBJ(it));
+             efl_del(EO_OBJ(it));
           }
      }
    sd->under_items = eina_list_free(sd->under_items);
@@ -1402,14 +1402,14 @@ _elm_diskselector_efl_canvas_group_group_del(Eo *obj, Elm_Diskselector_Data *sd)
         if (it)
           {
              evas_object_del(VIEW(it));
-             eo_del(EO_OBJ(it));
+             efl_del(EO_OBJ(it));
           }
      }
    sd->over_items = eina_list_free(sd->over_items);
 
    EINA_LIST_FOREACH_SAFE(sd->items, l, l2, it)
      {
-        eo_del(EO_OBJ(it));
+        efl_del(EO_OBJ(it));
      }
    sd->items = eina_list_free(sd->items);
    sd->r_items = eina_list_free(sd->r_items);
@@ -1460,9 +1460,9 @@ elm_diskselector_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
+_elm_diskselector_efl_object_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
@@ -1636,7 +1636,7 @@ _elm_diskselector_clear(Eo *obj, Elm_Diskselector_Data *sd)
    sd->selected_item = NULL;
    EINA_LIST_FREE(sd->items, it)
      {
-        eo_del(EO_OBJ(it));
+        efl_del(EO_OBJ(it));
      }
 
    _round_items_del(sd);
@@ -1807,7 +1807,7 @@ _elm_diskselector_display_item_num_get(Eo *obj EINA_UNUSED, Elm_Diskselector_Dat
 }
 
 static void
-_elm_diskselector_class_constructor(Eo_Class *klass)
+_elm_diskselector_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 92146a1961..3c3ec40968 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -196,7 +196,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_diskselector_item.eo b/src/lib/elementary/elm_diskselector_item.eo
index f04dcefac3..4119109550 100644
--- a/src/lib/elementary/elm_diskselector_item.eo
+++ b/src/lib/elementary/elm_diskselector_item.eo
@@ -81,8 +81,8 @@ class Elm.Diskselector.Item(Elm.Widget.Item)
                    }*/
       }
       implements {
-           Eo.Base.constructor;
-           Eo.Base.destructor;
+           Efl.Object.constructor;
+           Efl.Object.destructor;
            Elm.Widget.Item.part_text.get;
            Elm.Widget.Item.part_text.set;
            Elm.Widget.Item.part_content.get;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index fe4bb47529..1c064cba63 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -300,7 +300,7 @@ _validate(Evas_Object *obj)
    if (sd->validators == 0) return;
 
    vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
-   res = eo_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc);
+   res = efl_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc);
    buf = eina_strbuf_new();
    eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
    edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
@@ -964,7 +964,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   eo_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    evas_object_unref(obj);
 
@@ -976,7 +976,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
 {
    ELM_ENTRY_DATA_GET(obj, sd);
 
-   eo_event_callback_call(obj, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
 
    if (!sd->deferred_recalc_job)
      {
@@ -1239,7 +1239,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-        eo_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
         _return_key_enabled_check(obj);
@@ -1254,7 +1254,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
         if (top && top_is_win && sd->input_panel_enable &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-        eo_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 
@@ -1513,7 +1513,7 @@ _paste_cb(void *data,
 
    ELM_ENTRY_DATA_GET(data, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
 
    sd->selection_asked = EINA_TRUE;
@@ -1565,7 +1565,7 @@ _cut_cb(void *data,
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_CUT, NULL);
    /* Store it */
    sd->sel_mode = EINA_FALSE;
@@ -1588,7 +1588,7 @@ _copy_cb(void *data,
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_COPY, NULL);
    sd->sel_mode = EINA_FALSE;
    if (!_elm_config->desktop_entry)
@@ -1640,7 +1640,7 @@ _menu_call(Evas_Object *obj)
 
    if (sd->anchor_hover.hover) return;
 
-   eo_event_callback_call(obj, ELM_ENTRY_EVENT_CONTEXT_OPEN, NULL);
+   efl_event_callback_call(obj, ELM_ENTRY_EVENT_CONTEXT_OPEN, NULL);
 
    if ((sd->api) && (sd->api->obj_longpress))
      {
@@ -1677,7 +1677,7 @@ _menu_call(Evas_Object *obj)
 
         if (top) elm_hoversel_hover_parent_set(sd->hoversel, top);
 
-        eo_event_callback_add
+        efl_event_callback_add
           (sd->hoversel, ELM_HOVERSEL_EVENT_DISMISSED, _hover_dismissed_cb, obj);
         if (sd->have_selection)
           {
@@ -1923,7 +1923,7 @@ _long_press_cb(void *data)
    sd->long_pressed = EINA_TRUE;
 
    sd->longpress_timer = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -2101,7 +2101,7 @@ _mouse_move_cb(void *data,
 
 static void
 _entry_changed_handle(void *data,
-                      const Eo_Event_Description* event)
+                      const Efl_Event_Description* event)
 {
    Evas_Coord minh;
    const char *text;
@@ -2139,7 +2139,7 @@ _entry_changed_handle(void *data,
    /* callback - this could call callbacks that delete the
     * entry... thus... any access to sd after this could be
     * invalid */
-   eo_event_callback_call(data, event, NULL);
+   efl_event_callback_call(data, event, NULL);
 }
 
 static void
@@ -2164,11 +2164,11 @@ _entry_changed_user_signal_cb(void *data,
    if (edje_info)
      {
         memcpy(&info, edje_info, sizeof(info));
-        eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, &info);
+        efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, &info);
      }
    else
      {
-        eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, NULL);
+        efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, NULL);
      }
    if (_elm_config->atspi_mode)
      {
@@ -2225,7 +2225,7 @@ _entry_undo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_ENTRY_EVENT_UNDO_REQUEST, NULL);
+   efl_event_callback_call(data, ELM_ENTRY_EVENT_UNDO_REQUEST, NULL);
 }
 
 static void
@@ -2234,7 +2234,7 @@ _entry_redo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_ENTRY_EVENT_REDO_REQUEST, NULL);
+   efl_event_callback_call(data, ELM_ENTRY_EVENT_REDO_REQUEST, NULL);
 }
 
 static void
@@ -2250,7 +2250,7 @@ _entry_selection_start_signal_cb(void *data,
      {
         if (entry != data) elm_entry_select_none(entry);
      }
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_START, NULL);
 
    elm_object_focus_set(data, EINA_TRUE);
@@ -2283,7 +2283,7 @@ _entry_selection_changed_signal_cb(void *data,
    ELM_ENTRY_DATA_GET(data, sd);
 
    sd->have_selection = EINA_TRUE;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_CHANGED, NULL);
    _selection_store(ELM_SEL_TYPE_PRIMARY, data);
    _update_selection_handler(data);
@@ -2302,7 +2302,7 @@ _entry_selection_cleared_signal_cb(void *data,
    if (!sd->have_selection) return;
 
    sd->have_selection = EINA_FALSE;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
    if (sd->cut_sel)
      {
@@ -2334,7 +2334,7 @@ _entry_paste_request_signal_cb(void *data,
      ELM_SEL_TYPE_PRIMARY : ELM_SEL_TYPE_CLIPBOARD;
 
    if (!sd->editable) return;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
 
    top = elm_widget_top_get(data);
@@ -2394,7 +2394,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
                                        const char *emission EINA_UNUSED,
                                        const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
@@ -2453,7 +2453,7 @@ _entry_anchor_down_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei);
+     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei);
 }
 
 static void
@@ -2476,7 +2476,7 @@ _entry_anchor_up_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_UP, &ei);
+     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_UP, &ei);
 }
 
 static void
@@ -2556,8 +2556,8 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
         ei.hover_right = tmp;
      }
 
-   eo_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
-   eo_event_callback_add
+   efl_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
+   efl_event_callback_add
      (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
 
    /* FIXME: Should just check if there's any callback registered to
@@ -2596,7 +2596,7 @@ _entry_anchor_clicked_signal_cb(void *data,
 
    if (!sd->disabled)
      {
-        eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei);
+        efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei);
         _entry_hover_anchor_clicked_do(data, &ei);
      }
 }
@@ -2626,7 +2626,7 @@ _entry_anchor_in_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_IN, &ei);
+     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_IN, &ei);
 }
 
 static void
@@ -2646,7 +2646,7 @@ _entry_anchor_out_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_OUT, &ei);
+     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_OUT, &ei);
 }
 
 static void
@@ -2655,7 +2655,7 @@ _entry_key_enter_signal_cb(void *data,
                            const char *emission EINA_UNUSED,
                            const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_ENTRY_EVENT_ACTIVATED, NULL);
+   efl_event_callback_call(data, ELM_ENTRY_EVENT_ACTIVATED, NULL);
 }
 
 static void
@@ -2664,7 +2664,7 @@ _entry_key_escape_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_ENTRY_EVENT_ABORTED, NULL);
+   efl_event_callback_call(data, ELM_ENTRY_EVENT_ABORTED, NULL);
 }
 
 static void
@@ -2673,7 +2673,7 @@ _entry_mouse_down_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_ENTRY_EVENT_PRESS, NULL);
+   efl_event_callback_call(data, ELM_ENTRY_EVENT_PRESS, NULL);
 }
 
 static void
@@ -2682,7 +2682,7 @@ _entry_mouse_clicked_signal_cb(void *data,
                                const char *emission EINA_UNUSED,
                                const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
@@ -2692,7 +2692,7 @@ _entry_mouse_double_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
 }
 
@@ -2702,7 +2702,7 @@ _entry_mouse_triple_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
 }
 
@@ -2932,7 +2932,7 @@ _text_append_idler(void *data)
         free(sd->append_text_left);
         sd->append_text_left = NULL;
         sd->append_text_idler = NULL;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
         return ECORE_CALLBACK_CANCEL;
      }
@@ -2995,7 +2995,7 @@ _chars_add_till_limit(Evas_Object *obj,
           {
              if (!i)
                {
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
                   ELM_SAFE_FREE(*text, free);
                   return;
@@ -3014,7 +3014,7 @@ _chars_add_till_limit(Evas_Object *obj,
         i++;
      }
 
-   eo_event_callback_call(obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
+   efl_event_callback_call(obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
 }
 
 EOLIAN static void
@@ -3168,7 +3168,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
                }
              edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
                    EDJE_CURSOR_MAIN, sd->cursor_pos);
-             eo_event_callback_call(obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
+             efl_event_callback_call(obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
           }
      }
 }
@@ -3981,7 +3981,7 @@ elm_entry_add(Evas_Object *parent)
 static void
 _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->info;
+   const Efl_Callback_Array_Item *event = ev->info;
 
    ELM_ENTRY_DATA_GET(ev->object, sd);
    if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
@@ -3991,7 +3991,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 static void
 _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->info;
+   const Efl_Callback_Array_Item *event = ev->info;
 
    ELM_ENTRY_DATA_GET(ev->object, sd);
    if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
@@ -4001,14 +4001,14 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 }
 
 EOLIAN static Eo *
-_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
+_elm_entry_efl_object_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
 
    return obj;
 }
@@ -4258,7 +4258,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
         edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
      }
    if (sd->have_selection)
-     eo_event_callback_call
+     efl_event_callback_call
        (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
 
    sd->have_selection = EINA_FALSE;
@@ -4661,7 +4661,7 @@ elm_entry_filter_limit_size(void *data,
         newlen = evas_string_char_len_get(utfstr);
         if ((len >= lim->max_char_count) && (newlen > 0))
           {
-             eo_event_callback_call
+             efl_event_callback_call
                (entry, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
              ELM_SAFE_FREE(*text, free);
              free(current);
@@ -4678,7 +4678,7 @@ elm_entry_filter_limit_size(void *data,
         newlen = strlen(utfstr);
         if ((len >= lim->max_byte_count) && (newlen > 0))
           {
-             eo_event_callback_call
+             efl_event_callback_call
                (entry, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
              ELM_SAFE_FREE(*text, free);
              free(current);
@@ -4813,7 +4813,7 @@ inserting:
      }
    *insert = 0;
    if (rejected)
-     eo_event_callback_call(entry, ELM_ENTRY_EVENT_REJECTED, NULL);
+     efl_event_callback_call(entry, ELM_ENTRY_EVENT_REJECTED, NULL);
 }
 
 EOLIAN static void
@@ -4946,7 +4946,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(obj, sd);
    /* here we need to emit the signal that the elm_scroller would have done */
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 
    if (sd->have_selection)
@@ -5362,7 +5362,7 @@ _elm_entry_elm_widget_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Act
    if (!elm_widget_disabled_get(obj) &&
        !evas_object_freeze_events_get(obj))
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_CLICKED, NULL);
         if (sd->editable && sd->input_panel_enable)
           edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
@@ -5398,7 +5398,7 @@ _elm_entry_select_allow_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
 }
 
 static void
-_elm_entry_class_constructor(Eo_Class *klass)
+_elm_entry_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index b6c5564330..fa407e1617 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -934,7 +934,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 583cf63846..bad9635f7f 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -33,7 +33,7 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
    implements {
       class.constructor;
       class.destructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index bf81fd3bea..46cd057521 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -2,7 +2,7 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector)
 {
    event_prefix: elm_fileselector_button;
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 6897111b57..2b46f0419e 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -5,7 +5,7 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
    event_prefix: elm_fileselector_entry;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_add;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_flip_internal_part.eo b/src/lib/elementary/elm_flip_internal_part.eo
index 08792295e9..4fe3203459 100644
--- a/src/lib/elementary/elm_flip_internal_part.eo
+++ b/src/lib/elementary/elm_flip_internal_part.eo
@@ -1,8 +1,8 @@
-class Elm.Flip.Internal.Part (Eo.Base, Efl.Container)
+class Elm.Flip.Internal.Part (Efl.Object, Efl.Container)
 {
    data: Elm_Part_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content.set;
       Efl.Container.content.get;
       Efl.Container.content_unset;
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 1084eaef56..d436bc55bb 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -230,7 +230,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
 
    if (item->func)
      item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_SELECTED, eo_item);
 }
 
@@ -251,7 +251,7 @@ _send_msg(Elm_Flipselector_Data *sd,
 }
 
 EOLIAN static void
-_elm_flipselector_item_eo_base_destructor(Eo *eo_item, Elm_Flipselector_Item_Data *item)
+_elm_flipselector_item_efl_object_destructor(Eo *eo_item, Elm_Flipselector_Item_Data *item)
 {
    Elm_Object_Item *eo_item2;
    Eina_List *l;
@@ -290,13 +290,13 @@ _elm_flipselector_item_eo_base_destructor(Eo *eo_item, Elm_Flipselector_Item_Dat
    _sentinel_eval(sd);
    _update_view(sd->obj);
 
-   eo_destructor(eo_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
-_elm_flipselector_item_eo_base_constructor(Eo *obj, Elm_Flipselector_Item_Data *it)
+_elm_flipselector_item_efl_object_constructor(Eo *obj, Elm_Flipselector_Item_Data *it)
 {
-   obj = eo_constructor(eo_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -367,7 +367,7 @@ _flip_up(Elm_Flipselector_Data *sd)
    if (sd->current == sd->items)
      {
         sd->current = eina_list_last(sd->items);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_FLIPSELECTOR_EVENT_UNDERFLOWED, NULL);
      }
    else
@@ -392,7 +392,7 @@ _flip_down(Elm_Flipselector_Data *sd)
    if (!sd->current)
      {
         sd->current = sd->items;
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_FLIPSELECTOR_EVENT_OVERFLOWED, NULL);
      }
 
@@ -666,9 +666,9 @@ elm_flipselector_first_interval_get(const Evas_Object *obj)
 }
 
 EOLIAN static Eo *
-_elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd)
+_elm_flipselector_efl_object_constructor(Eo *obj, Elm_Flipselector_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
@@ -890,7 +890,7 @@ _elm_flipselector_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm
 }
 
 EOLIAN static void
-_elm_flipselector_class_constructor(Eo_Class *klass)
+_elm_flipselector_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index d538200ecc..3e25acf26b 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -125,7 +125,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_flipselector_item.eo b/src/lib/elementary/elm_flipselector_item.eo
index f758115713..54ce0de210 100644
--- a/src/lib/elementary/elm_flipselector_item.eo
+++ b/src/lib/elementary/elm_flipselector_item.eo
@@ -46,8 +46,8 @@ class Elm.Flipselector.Item(Elm.Widget.Item)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.signal_emit;
         Elm.Widget.Item.part_text.get;
         Elm.Widget.Item.part_text.set;
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 035f65f9fb..6e4b45e1a2 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -97,7 +97,7 @@ extern EAPI double _elm_startup_time;
 
 #ifndef ELM_LIB_QUICKLAUNCH
 #define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
-#define EFL_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); ret = efl_loop_begin(ecore_main_loop_get()); elm_shutdown(); return ret; }
+#define EFL_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); ret = efl_loop_begin(ecore_main_loop_get()); elm_shutdown(); return ret; }
 #else
 /** @deprecated macro to be used after the elm_main() function.
  * Do not define ELM_LIB_QUICKLAUNCH
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 84cca831cd..ef62d3f9b9 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -460,7 +460,7 @@ _calc_job(void *data)
           {
              sd->minh = minh;
              sd->minw = minw;
-             eo_event_callback_call
+             efl_event_callback_call
                    (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
           }
 
@@ -474,10 +474,10 @@ _calc_job(void *data)
 }
 
 EOLIAN static void
-_elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
+_elm_gengrid_pan_efl_object_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -512,7 +512,7 @@ _item_unselect(Elm_Gen_Item *it)
      {
         it->selected = EINA_FALSE;
         sd->selected = eina_list_remove(sd->selected, eo_it);
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
@@ -572,7 +572,7 @@ _item_mouse_move_cb(void *data,
    if ((it->dragging) && (it->down))
      {
         ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-        eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
+        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
         return;
      }
 
@@ -621,7 +621,7 @@ _item_mouse_move_cb(void *data,
 
    if ((adx > minw) || (ady > minh))
      {
-        const Eo_Event_Description *left_drag, *right_drag;
+        const Efl_Event_Description *left_drag, *right_drag;
 
         if (!elm_widget_mirrored_get(WIDGET(it)))
           {
@@ -645,25 +645,25 @@ _item_mouse_move_cb(void *data,
         if (dy < 0)
           {
              if (ady > adx)
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), EFL_UI_EVENT_DRAG_START_UP, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_event_callback_call(WIDGET(it), left_drag, eo_it);
+                    efl_event_callback_call(WIDGET(it), left_drag, eo_it);
                }
           }
         else
           {
              if (ady > adx)
-               eo_event_callback_call
+               efl_event_callback_call
                  (WIDGET(it), EFL_UI_EVENT_DRAG_START_DOWN, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_event_callback_call(WIDGET(it), left_drag, eo_it);
+                    efl_event_callback_call(WIDGET(it), left_drag, eo_it);
                   else
-                    eo_event_callback_call(WIDGET(it), right_drag, eo_it);
+                    efl_event_callback_call(WIDGET(it), right_drag, eo_it);
                }
           }
      }
@@ -679,7 +679,7 @@ _long_press_cb(void *data)
    if (elm_wdg_item_disabled_get(EO_OBJ(it)) || (it->dragging))
      return ECORE_CALLBACK_CANCEL;
    sd->longpressed = EINA_TRUE;
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
    if (sd->reorder_mode)
@@ -708,7 +708,7 @@ _item_highlight(Elm_Gen_Item *it)
      return;
 
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), ELM_GENGRID_EVENT_HIGHLIGHTED, EO_OBJ(it));
 
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
@@ -729,7 +729,7 @@ _item_unhighlight(Elm_Gen_Item *it)
      return;
 
    edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
-   eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNHIGHLIGHTED, eo_it);
+   efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNHIGHLIGHTED, eo_it);
 
    evas_object_stack_below(VIEW(it), sd->stack);
 
@@ -776,11 +776,11 @@ _item_mouse_down_cb(void *data,
    it->highlight_cb(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
-        eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
+        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+        efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
      }
 
-   eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_PRESSED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_PRESSED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->realized)
      it->long_timer = ecore_timer_add
@@ -1002,7 +1002,7 @@ _elm_gengrid_item_unrealize(Elm_Gen_Item *it,
 
    evas_event_freeze(evas_object_evas_get(WIDGET(it)));
    if (!calc)
-     eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
 
    _view_clear(VIEW(it), &(it->texts), &(it->contents));
@@ -1040,7 +1040,7 @@ _item_mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          eo_event_callback_call
+          efl_event_callback_call
             (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
@@ -1053,13 +1053,13 @@ _item_mouse_up_cb(void *data,
      sd->on_hold = EINA_TRUE;
    else sd->on_hold = EINA_FALSE;
 
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), ELM_GENGRID_EVENT_RELEASED, eo_it);
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), EFL_UI_EVENT_DRAG_STOP, eo_it);
         dragged = EINA_TRUE;
      }
@@ -1067,7 +1067,7 @@ _item_mouse_up_cb(void *data,
    if ((sd->reorder_mode) &&
        (sd->reorder_it))
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it));
         sd->reorder_it = NULL;
         sd->move_effect_enabled = EINA_FALSE;
@@ -1207,7 +1207,7 @@ _elm_gengrid_item_index_update(Elm_Gen_Item *it)
 {
    if (it->position_update)
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), ELM_GENGRID_EVENT_INDEX_UPDATE, EO_OBJ(it));
         it->position_update = EINA_FALSE;
      }
@@ -1640,7 +1640,7 @@ _item_place(Elm_Gen_Item *it,
         if (!was_realized)
           {
              _elm_gengrid_item_index_update(it);
-             eo_event_callback_call
+             efl_event_callback_call
                (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it));
           }
         if (it->parent)
@@ -1839,7 +1839,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
              if (!was_realized)
                {
                   _elm_gengrid_item_index_update(it);
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it));
                }
              evas_object_move
@@ -1928,7 +1928,7 @@ _elm_gengrid_pan_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Gengr
         sd->move_effect_enabled = EINA_FALSE;
      }
 
-   eo_event_callback_call
+   efl_event_callback_call
      (psd->wobj, ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL);
 
    if (sd->focused_item)
@@ -1984,7 +1984,7 @@ _elm_gengrid_pan_elm_pan_pos_min_get(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Co
 }
 
 EOLIAN static void
-_elm_gengrid_pan_class_constructor(Eo_Class *klass)
+_elm_gengrid_pan_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
@@ -2031,7 +2031,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
         _elm_widget_focus_highlight_start(obj);
      }
 
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2061,7 +2061,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -2857,9 +2857,9 @@ _item_move_cb(void *data, double pos)
           _free_reorder_normal_data(sd->reorder.data);
         elm_gengrid_item_show(EO_OBJ(sd->reorder.it1),
                               ELM_GENGRID_ITEM_SCROLLTO_IN);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1));
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1));
         sd->reorder.running = EINA_FALSE;
      }
@@ -2987,7 +2987,7 @@ _swap_items(Elm_Object_Item *eo_it1, Elm_Object_Item *eo_it2, Elm_Focus_Directio
           evas_object_raise(VIEW(rnd->corner_item));
      }
    evas_object_raise(VIEW(it1));
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_START, EO_OBJ(sd->reorder.it1));
    //TODO: Add elm config for time
    ecore_animator_timeline_add(0.3, _item_move_cb, sd);
@@ -3548,7 +3548,7 @@ _key_action_select(Evas_Object *obj, const char *params)
      }
 
    if (!sd->multi)
-     eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, eo_it);
+     efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, eo_it);
 
    return EINA_TRUE;
 }
@@ -3907,70 +3907,70 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_page_change_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
 static int
@@ -4118,7 +4118,7 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
              if (itn) itn->walking++;  /* prevent early death of subitem */
              _item_mouse_callbacks_del(it, VIEW(it));
              it->del_cb(it);
-             eo_del(EO_OBJ(it));
+             efl_del(EO_OBJ(it));
              if (itn) itn->walking--;
           }
      }
@@ -4135,7 +4135,7 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
    if (sd->pan_obj)
      {
         evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
      }
    elm_interface_scrollable_content_region_show(obj, 0, 0, 0, 0);
@@ -4176,7 +4176,7 @@ _item_select(Elm_Gen_Item *it)
    if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
    if (it->generation == sd->generation)
      {
-        eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
+        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
      }
@@ -4190,7 +4190,7 @@ _item_select(Elm_Gen_Item *it)
         if ((!it->walking) && (it->generation < sd->generation))
           {
              it->del_cb(it);
-             eo_del(eo_it);
+             efl_del(eo_it);
              sd->last_selected_item = NULL;
           }
      }
@@ -4198,9 +4198,9 @@ _item_select(Elm_Gen_Item *it)
 }
 
 EOLIAN static Eo *
-_elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
+_elm_gengrid_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_it = eo_constructor(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
+   eo_it = efl_constructor(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
@@ -4388,9 +4388,9 @@ elm_gengrid_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
+_elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -5664,7 +5664,7 @@ _elm_gengrid_wheel_disabled_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd)
 }
 
 EOLIAN static void
-_elm_gengrid_class_constructor(Eo_Class *klass)
+_elm_gengrid_class_constructor(Efl_Class *klass)
 {
    if (_elm_config->access_mode)
       _elm_gengrid_smart_focus_next_enable = EINA_TRUE;
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index d4eafa574d..584f580a9c 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -539,7 +539,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index ab4c99cd78..64f3669803 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -206,7 +206,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
            }
       }
       implements {
-           Eo.Base.constructor;
+           Efl.Object.constructor;
            Elm.Widget.Item.del_pre;
            Elm.Widget.Item.disable;
            Elm.Widget.Item.signal_emit;
diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo
index 249eb77475..1fc50e0883 100644
--- a/src/lib/elementary/elm_gengrid_pan.eo
+++ b/src/lib/elementary/elm_gengrid_pan.eo
@@ -5,7 +5,7 @@ class Elm.Gengrid.Pan (Elm.Pan)
    event_prefix: elm_gengrid_pan;
    implements {
       class.constructor;
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_resize;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 7e36fb3259..16f190615f 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -643,7 +643,7 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it,
 
    evas_event_freeze(evas_object_evas_get(WIDGET(it)));
    if (!calc)
-     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
 
    _view_clear(VIEW(it), &(it->texts), NULL);
@@ -794,7 +794,7 @@ _calc_job(void *data)
      {
         sd->minw = minw;
         sd->minh = minh;
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
         elm_layout_sizing_eval(sd->obj);
         if (sd->reorder_it)
@@ -1160,8 +1160,8 @@ _item_tree_effect_finish(Elm_Genlist_Data *sd)
    sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
    sd->move_items = eina_list_free(sd->move_items);
 
-   eo_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
-   eo_event_callback_call
+   efl_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_call
          (sd->obj, ELM_GENLIST_EVENT_TREE_EFFECT_FINISHED, NULL);
    evas_object_smart_changed(sd->pan_obj);
 
@@ -1338,7 +1338,7 @@ _elm_genlist_item_index_update(Elm_Gen_Item *it)
 {
    if (it->position_update || GL_IT(it)->block->position_update)
      {
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), ELM_GENLIST_EVENT_INDEX_UPDATE, EO_OBJ(it));
         it->position_update = EINA_FALSE;
      }
@@ -1442,9 +1442,9 @@ _expand_toggle_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (it->item->expanded)
-     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
    else
-     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
 }
 
 static void
@@ -1456,7 +1456,7 @@ _expand_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (!it->item->expanded)
-     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
 }
 
 static void
@@ -1468,7 +1468,7 @@ _contract_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (it->item->expanded)
-     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
 }
 
 //-- item cache handle routine --//
@@ -1986,7 +1986,7 @@ _item_realize(Elm_Gen_Item *it,
 
           }
 
-        eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it));
+        efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it));
      }
 
    //Send a signal so that an item changes its style according to its expand depth
@@ -2435,7 +2435,7 @@ _elm_genlist_tree_effect_setup(Elm_Genlist_Data *sd)
         evas_object_stack_below(sd->event_block_rect, sd->stack[1]);
         evas_object_show(sd->event_block_rect);
         sd->start_time = ecore_time_get();
-        eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
+        efl_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
         sd->tree_effect_animator = 1;
         return EINA_TRUE;
      }
@@ -2448,7 +2448,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
    if (sd->tree_effect_animator)
      {
         sd->tree_effect_animator = 0;
-        eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
+        efl_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
      }
 }
 
@@ -2547,19 +2547,19 @@ _elm_genlist_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Pan_Data
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   eo_event_callback_call
+   efl_event_callback_call
          (psd->wobj, ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
-_elm_genlist_pan_eo_base_destructor(Eo *obj, Elm_Genlist_Pan_Data *psd)
+_elm_genlist_pan_efl_object_destructor(Eo *obj, Elm_Genlist_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
-_elm_genlist_pan_class_constructor(Eo_Class *klass)
+_elm_genlist_pan_class_constructor(Efl_Class *klass)
 {
       evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
@@ -2737,7 +2737,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
 
    if (it->realized)
      _elm_genlist_item_focus_update(it);
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2765,7 +2765,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -3126,7 +3126,7 @@ _key_action_select(Evas_Object *obj, const char *params)
         if (_item_select(it)) goto deleted;
      }
 
-   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it));
 
    return EINA_TRUE;
 
@@ -3471,7 +3471,7 @@ _item_highlight(Elm_Gen_Item *it)
    edje_object_signal_emit(VIEW(it), SIGNAL_SELECTED, "elm");
    if (it->deco_all_view)
      edje_object_signal_emit(it->deco_all_view, SIGNAL_SELECTED, "elm");
-   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
 
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
    if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -3492,7 +3492,7 @@ _item_unhighlight(Elm_Gen_Item *it)
    if (!it->highlighted) return;
 
    edje_object_signal_emit(VIEW(it), SIGNAL_UNSELECTED, "elm");
-   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
    if (it->deco_all_view)
      edje_object_signal_emit
        (it->deco_all_view, SIGNAL_UNSELECTED, "elm");
@@ -3793,7 +3793,7 @@ _item_unselect(Elm_Gen_Item *it)
 
    it->selected = EINA_FALSE;
    sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
@@ -3864,7 +3864,7 @@ _item_mouse_move_cb(void *data,
                sd->movements++;
           }
         ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
         return;
      }
@@ -3941,30 +3941,30 @@ _item_mouse_move_cb(void *data,
         if (dy < 0)
           {
              if (ady > adx)
-               eo_event_callback_call
+               efl_event_callback_call
                  (WIDGET(it), EFL_UI_EVENT_DRAG_START_UP, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_event_callback_call
+                    efl_event_callback_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_LEFT, eo_it);
                   else
-                    eo_event_callback_call
+                    efl_event_callback_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_RIGHT, eo_it);
                }
           }
         else
           {
              if (ady > adx)
-               eo_event_callback_call
+               efl_event_callback_call
                  (WIDGET(it), EFL_UI_EVENT_DRAG_START_DOWN, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_event_callback_call
+                    efl_event_callback_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_LEFT, eo_it);
                   else
-                    eo_event_callback_call
+                    efl_event_callback_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_RIGHT, eo_it);
                }
           }
@@ -3984,7 +3984,7 @@ _long_press_cb(void *data)
      goto end;
 
    sd->longpressed = EINA_TRUE;
-   eo_event_callback_call
+   efl_event_callback_call
          (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
    if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP))
      {
@@ -4041,7 +4041,7 @@ _swipe_do(Elm_Gen_Item *it)
 
    sum /= sd->movements;
    if (abs(sum - sd->history[0].x) <= 10) return;
-   eo_event_callback_call
+   efl_event_callback_call
          (WIDGET(it), ELM_GENLIST_EVENT_SWIPE, EO_OBJ(it));
 }
 
@@ -4097,33 +4097,33 @@ _multi_touch_gesture_eval(Elm_Gen_Item *it)
         if ((off_x + off_mx) > (off_y + off_my))
           {
              if ((sd->cur_x > sd->prev_x) && (sd->cur_mx > sd->prev_mx))
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_RIGHT, eo_it);
              else if ((sd->cur_x < sd->prev_x) && (sd->cur_mx < sd->prev_mx))
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_LEFT, eo_it);
              else if (abs(sd->cur_x - sd->cur_mx) >
                       abs(sd->prev_x - sd->prev_mx))
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it);
              else
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it);
           }
         else
           {
              if ((sd->cur_y > sd->prev_y) && (sd->cur_my > sd->prev_my))
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_DOWN, eo_it);
              else if ((sd->cur_y < sd->prev_y) && (sd->cur_my < sd->prev_my))
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_UP, eo_it);
              else if (abs(sd->cur_y - sd->cur_my) >
                       abs(sd->prev_y - sd->prev_my))
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it);
              else
-               eo_event_callback_call
+               efl_event_callback_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it);
           }
      }
@@ -4157,7 +4157,7 @@ _item_multi_down_cb(void *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), EFL_UI_EVENT_DRAG_STOP, EO_OBJ(it));
      }
    ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
@@ -4268,12 +4268,12 @@ _item_mouse_down_cb(void *data,
    _item_highlight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, eo_it);
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, eo_it);
      }
-   eo_event_callback_call
+   efl_event_callback_call
          (WIDGET(it), EFL_UI_EVENT_PRESSED, eo_it);
 }
 
@@ -4752,7 +4752,7 @@ _item_move_after(Elm_Gen_Item *it,
    if (after->item->group_item) it->item->group_item = after->item->group_item;
    _item_queue(sd, it, NULL);
 
-   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it));
 }
 
 static void
@@ -4830,7 +4830,7 @@ _item_move_before(Elm_Gen_Item *it,
      it->item->group_item = before->item->group_item;
    _item_queue(sd, it, NULL);
 
-   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it));
 }
 
 static void
@@ -4852,7 +4852,7 @@ _item_mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          eo_event_callback_call
+          efl_event_callback_call
                 (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
@@ -4862,7 +4862,7 @@ _item_mouse_up_cb(void *data,
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    sd->mouse_down = EINA_FALSE;
-   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it));
    if (sd->multi_touched)
      {
         if ((!sd->multi) && (!it->selected) && (it->highlighted))
@@ -4878,7 +4878,7 @@ _item_mouse_up_cb(void *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), EFL_UI_EVENT_DRAG_STOP, EO_OBJ(it));
         dragged = 1;
      }
@@ -4909,7 +4909,7 @@ _item_mouse_up_cb(void *data,
                _item_move_before(sd->reorder_it, sd->reorder_rel);
              else
                _item_move_after(sd->reorder_it, sd->reorder_rel);
-             eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED, EO_OBJ(it));
+             efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED, EO_OBJ(it));
           }
         else
           {
@@ -5290,105 +5290,105 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _vbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_DRAG, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_PRESS, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_DRAG, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_PRESS, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL);
+   efl_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL);
 }
 
 static void
@@ -5706,9 +5706,9 @@ elm_genlist_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd)
+_elm_genlist_efl_object_constructor(Eo *obj, Elm_Genlist_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -5768,7 +5768,7 @@ _internal_elm_genlist_clear(Evas_Object *obj)
    if (sd->pan_obj)
      {
         evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
-        eo_event_callback_call
+        efl_event_callback_call
               (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
      }
    elm_layout_sizing_eval(sd->obj);
@@ -5834,7 +5834,7 @@ _item_select(Elm_Gen_Item *it)
    if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
    // delete item if it's requested deletion in the above callbacks.
    if ((it->base)->on_deletion) goto item_deleted;
-   eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
+   efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
    // delete item if it's requested deletion in the above callbacks.
@@ -5862,7 +5862,7 @@ _item_select(Elm_Gen_Item *it)
 item_deleted:
    it->walking = -1; //This item was removed from it's item list.
    _item_del(it);
-   eo_del(eo_it);
+   efl_del(eo_it);
    evas_object_unref(obj);
    return EINA_TRUE;
 }
@@ -6054,9 +6054,9 @@ _elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it)
 }
 
 EOLIAN static Eo *
-_elm_genlist_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
+_elm_genlist_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_it = eo_constructor(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
+   eo_it = efl_constructor(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
@@ -6890,7 +6890,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
         sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_EXPAND;
         if (it->realized)
           edje_object_signal_emit(VIEW(it), SIGNAL_EXPANDED, "elm");
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it));
         sd->auto_scroll_enabled = EINA_TRUE;
         if (_elm_config->atspi_mode)
@@ -6901,7 +6901,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
         sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_CONTRACT;
         if (it->realized)
           edje_object_signal_emit(VIEW(it), SIGNAL_CONTRACTED, "elm");
-        eo_event_callback_call
+        efl_event_callback_call
               (WIDGET(it), ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it));
         sd->auto_scroll_enabled = EINA_FALSE;
         if (_elm_config->atspi_mode)
@@ -7627,7 +7627,7 @@ _item_filter_enterer(void *data)
    if (ok == ECORE_CALLBACK_CANCEL)
      {
         sd->queue_filter_enterer = NULL;
-        eo_event_callback_call(sd->obj, ELM_GENLIST_EVENT_FILTER_DONE, NULL);
+        efl_event_callback_call(sd->obj, ELM_GENLIST_EVENT_FILTER_DONE, NULL);
      }
 
    return ok;
@@ -8373,7 +8373,7 @@ _elm_genlist_elm_widget_item_loop_enabled_get(Eo *obj EINA_UNUSED, Elm_Genlist_D
 }
 
 EOLIAN static void
-_elm_genlist_class_constructor(Eo_Class *klass)
+_elm_genlist_class_constructor(Efl_Class *klass)
 {
    if (_elm_config->access_mode)
       _elm_genlist_smart_focus_next_enable = EINA_TRUE;
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 1448f6e83b..55b2dc1da4 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -525,7 +525,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo
index 324ebd532d..cdbdb2ba61 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -419,7 +419,7 @@ class Elm.Genlist.Item(Elm.Widget.Item)
            }
       }
       implements {
-           Eo.Base.constructor;
+           Efl.Object.constructor;
            Elm.Widget.Item.del_pre;
            Elm.Widget.Item.disable;
            Elm.Widget.Item.signal_emit;
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index f90a5919fc..4c0b495eee 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -5,7 +5,7 @@ class Elm.Genlist.Pan (Elm.Pan)
    event_prefix: elm_genlist_pan;
    implements {
       class.constructor;
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index 5711a4b68c..c49c7218d7 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -3822,9 +3822,9 @@ elm_gesture_layer_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
+_elm_gesture_layer_efl_object_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
@@ -4154,7 +4154,7 @@ _elm_gesture_layer_tap_finger_size_get(Eo *obj EINA_UNUSED, Elm_Gesture_Layer_Da
 }
 
 static void
-_elm_gesture_layer_class_constructor(Eo_Class *klass)
+_elm_gesture_layer_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index 8d63081391..f02db39547 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -154,7 +154,7 @@ class Elm.Gesture_Layer (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.disable;
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index c376fa8d78..b921ed38c6 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -128,7 +128,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    if (!sd->initialized)
      {
         //TODO:will be optimized
-        eo_event_callback_call(obj, ELM_GLVIEW_EVENT_CREATED, NULL);
+        efl_event_callback_call(obj, ELM_GLVIEW_EVENT_CREATED, NULL);
         if (sd->init_func) sd->init_func(obj);
         sd->initialized = EINA_TRUE;
      }
@@ -136,7 +136,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    if (sd->resized)
      {
         //TODO:will be optimized
-        eo_event_callback_call(obj, ELM_GLVIEW_EVENT_RESIZED, NULL);
+        efl_event_callback_call(obj, ELM_GLVIEW_EVENT_RESIZED, NULL);
         if (sd->resize_func) sd->resize_func(obj);
         sd->resized = EINA_FALSE;
      }
@@ -146,7 +146,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    // Call the render function
    if (sd->render_func) sd->render_func(obj);
    //TODO:will be optimized
-   eo_event_callback_call(obj, ELM_GLVIEW_EVENT_RENDER, NULL);
+   efl_event_callback_call(obj, ELM_GLVIEW_EVENT_RENDER, NULL);
 
    // Depending on the policy return true or false
    if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ON_DEMAND)
@@ -167,7 +167,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    return;
 
  on_error:
-   eo_event_callback_del(ecore_main_loop_get(),
+   efl_event_callback_del(ecore_main_loop_get(),
                          EFL_LOOP_EVENT_IDLE_ENTER,
                          _render_cb,
                          obj);
@@ -186,7 +186,7 @@ _set_render_policy_callback(Evas_Object *obj)
          if (sd->render_idle_enterer)
            evas_object_image_pixels_dirty_set(wd->resize_obj, EINA_TRUE);
          // Delete idle_enterer if it for some reason is around
-         eo_event_callback_del(ecore_main_loop_get(),
+         efl_event_callback_del(ecore_main_loop_get(),
                                EFL_LOOP_EVENT_IDLE_ENTER,
                                _render_cb,
                                obj);
@@ -201,7 +201,7 @@ _set_render_policy_callback(Evas_Object *obj)
 
       case ELM_GLVIEW_RENDER_POLICY_ALWAYS:
         if (evas_object_image_pixels_dirty_get(wd->resize_obj))
-          sd->render_idle_enterer = eo_event_callback_priority_add(ecore_main_loop_get(),
+          sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(),
                                                                    EFL_LOOP_EVENT_IDLE_ENTER,
                                                                    EO_CALLBACK_PRIORITY_BEFORE,
                                                                    _render_cb,
@@ -297,9 +297,9 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
         sd->del_func(obj);
      }
    //TODO:will be optimised
-   eo_event_callback_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL);
+   efl_event_callback_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL);
 
-   eo_event_callback_del(ecore_main_loop_get(),
+   efl_event_callback_del(ecore_main_loop_get(),
                          EFL_LOOP_EVENT_IDLE_ENTER,
                          _render_cb,
                          obj);
@@ -320,7 +320,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
 static void
 _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
 {
-   const Eo_Callback_Array_Item *event = ev->info;
+   const Efl_Callback_Array_Item *event = ev->info;
 
    ELM_GLVIEW_DATA_GET(ev->object, sd);
 
@@ -361,11 +361,11 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
-   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
+   efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
 }
 
 EOLIAN static Eo *
-_elm_glview_eo_base_finalize(Eo *obj, Elm_Glview_Data *sd)
+_elm_glview_efl_object_finalize(Eo *obj, Elm_Glview_Data *sd)
 {
    if (!sd->evasgl)
      {
@@ -373,7 +373,7 @@ _elm_glview_eo_base_finalize(Eo *obj, Elm_Glview_Data *sd)
         return NULL;
      }
 
-   return eo_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Evas_GL_API*
@@ -532,7 +532,7 @@ _elm_glview_draw_request(Eo *obj, Elm_Glview_Data *sd)
      (wd->resize_obj, EINA_TRUE);
    if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS &&
        !sd->render_idle_enterer)
-     sd->render_idle_enterer = eo_event_callback_priority_add(ecore_main_loop_get(),
+     sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(),
                                                               EFL_LOOP_EVENT_IDLE_ENTER,
                                                               EO_CALLBACK_PRIORITY_BEFORE,
                                                               _render_cb, obj);
@@ -551,7 +551,7 @@ _elm_glview_rotation_get(Eo *obj EINA_UNUSED, Elm_Glview_Data *sd)
 }
 
 static void
-_elm_glview_class_constructor(Eo_Class *klass)
+_elm_glview_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index c911cfb2ae..7e0c224bc2 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -183,7 +183,7 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View)
    }
    implements {
       class.constructor;
-      Eo.Base.finalize;
+      Efl.Object.finalize;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_resize;
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 0fcf42e7ed..51e63dcad2 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -166,9 +166,9 @@ elm_grid_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
+_elm_grid_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
@@ -266,7 +266,7 @@ _elm_grid_children_get(Eo *obj, void *_pd EINA_UNUSED)
 }
 
 static void
-_elm_grid_class_constructor(Eo_Class *klass)
+_elm_grid_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index a0c1d628c1..00800fec7a 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -53,7 +53,7 @@ class Elm.Grid (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c
index 966277daed..ebeea80121 100644
--- a/src/lib/elementary/elm_helper.c
+++ b/src/lib/elementary/elm_helper.c
@@ -47,5 +47,5 @@ elm_validator_regexp_helper(void *data, const Eo_Event *event)
    validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR;
    vc->signal = validator->signal;
    if (validator->status)
-      eo_event_callback_stop(event->object);
+      efl_event_callback_stop(event->object);
 }
diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h
index 71c264b61f..96b4f513f2 100644
--- a/src/lib/elementary/elm_helper.h
+++ b/src/lib/elementary/elm_helper.h
@@ -91,10 +91,10 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL
  * //add validator
  * entry = elm_entry_add(parent);
  * re = elm_validator_regexp_add("^[0-9]*$");
- * eo_event_callback_add(entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re);
+ * efl_event_callback_add(entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re);
  *
  * //delete validator
- * eo_event_callback_del(entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re);
+ * efl_event_callback_del(entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re);
  * @endcode
  *
  * @see elm_validator_regexp_add()
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 4b5a08ada7..479d90ab25 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -246,7 +246,7 @@ _elm_hover_smt_sub_re_eval(Evas_Object *obj)
    sd->smt_sub->obj = sub;
 
    if (sd->smt_sub != prev)
-     eo_event_callback_call
+     efl_event_callback_call
        (obj, ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd->smt_sub->swallow);
 
    if (elm_widget_mirrored_get(obj))
@@ -534,7 +534,7 @@ _hov_hide_cb(void *data,
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
         evas_object_hide(data);
-        eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
+        efl_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 }
 
@@ -551,15 +551,15 @@ _hov_dismiss_cb(void *data,
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
         _hide_signals_emit(data);
-        eo_event_callback_call
+        efl_event_callback_call
           (data, EFL_UI_EVENT_CLICKED, NULL);
      }
    else
      {
         evas_object_hide(data);
-        eo_event_callback_call
+        efl_event_callback_call
           (data, EFL_UI_EVENT_CLICKED, NULL);
-        eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
+        efl_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
 
@@ -602,9 +602,9 @@ _elm_hover_efl_canvas_group_group_del(Eo *obj, Elm_Hover_Data *sd)
 
    if (evas_object_visible_get(obj))
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_CLICKED, NULL);
-        eo_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
+        efl_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 
    elm_hover_target_set(obj, NULL);
@@ -668,9 +668,9 @@ elm_hover_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
+_elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
@@ -817,7 +817,7 @@ _elm_hover_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Hover_
 
 
 EOLIAN static void
-_elm_hover_class_constructor(Eo_Class *klass)
+_elm_hover_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 04dcfe6186..18ad00285d 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -59,7 +59,7 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index c11b44588a..12463c19b3 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -90,8 +90,8 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_hoversel_item.eo b/src/lib/elementary/elm_hoversel_item.eo
index dc0411ca8d..5758318fa2 100644
--- a/src/lib/elementary/elm_hoversel_item.eo
+++ b/src/lib/elementary/elm_hoversel_item.eo
@@ -21,8 +21,8 @@ class Elm.Hoversel.Item(Elm.Widget.Item)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.disable;
         Elm.Widget.Item.signal_emit;
         Elm.Widget.Item.part_text.set;
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index a776980363..f0d07460ef 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -112,10 +112,10 @@ _icon_thumb_display(Elm_Icon_Data *sd)
          (sd->obj, sd->thumb.thumb.path, sd->thumb.thumb.key);
 
    if (ret)
-     eo_event_callback_call
+     efl_event_callback_call
        (sd->obj, ELM_ICON_EVENT_THUMB_DONE, NULL);
    else
-     eo_event_callback_call
+     efl_event_callback_call
        (sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
 
    return ret;
@@ -218,7 +218,7 @@ _icon_thumb_error(Ethumb_Client *client,
    ERR("could not generate thumbnail for %s (key: %s)",
        sd->thumb.file.path, sd->thumb.file.key);
 
-   eo_event_callback_call(sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
+   efl_event_callback_call(sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
 
    _icon_thumb_cleanup(client);
 }
@@ -612,9 +612,9 @@ elm_icon_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
+_elm_icon_efl_object_constructor(Eo *obj, Elm_Icon_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -625,7 +625,7 @@ _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
 }
 
 static void
-_elm_icon_class_constructor(Eo_Class *klass)
+_elm_icon_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index e44fd68f7c..da79c23e01 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -15,7 +15,7 @@ class Elm.Icon (Efl.Ui.Image)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index edc4abd2f2..6643294a13 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -534,20 +534,20 @@ _elm_index_elm_layout_sizing_eval(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_index_item_eo_base_destructor(Eo *eo_item EINA_UNUSED, Elm_Index_Item_Data *it)
+_elm_index_item_efl_object_destructor(Eo *eo_item EINA_UNUSED, Elm_Index_Item_Data *it)
 {
    ELM_INDEX_DATA_GET(WIDGET(it), sd);
 
    _item_free(it);
    _index_box_clear(WIDGET(it), sd->level);
 
-   eo_destructor(eo_super(eo_item, ELM_INDEX_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_INDEX_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
-_elm_index_item_eo_base_constructor(Eo *obj, Elm_Index_Item_Data *it)
+_elm_index_item_efl_object_constructor(Eo *obj, Elm_Index_Item_Data *it)
 {
-   obj = eo_constructor(eo_super(obj, ELM_INDEX_ITEM_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_INDEX_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
@@ -607,7 +607,7 @@ _delay_change_cb(void *data)
 
    if (item)
      {
-        eo_event_callback_call
+        efl_event_callback_call
               (data, ELM_INDEX_EVENT_DELAY_CHANGED, item);
         ELM_INDEX_ITEM_DATA_GET(item, it);
         _index_priority_change(data, it);
@@ -769,10 +769,10 @@ _sel_eval(Evas_Object *obj,
                     }
 
                   if (om_closest) 
-                    eo_event_callback_call
+                    efl_event_callback_call
                       (obj, ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest));
                   else
-                    eo_event_callback_call
+                    efl_event_callback_call
                       (obj, ELM_INDEX_EVENT_CHANGED, EO_OBJ(it));
                   ecore_timer_del(sd->delay);
                   sd->delay = ecore_timer_add(sd->delay_change_time,
@@ -867,9 +867,9 @@ _on_mouse_up(void *data,
    eo_item = elm_index_selected_item_get(data, sd->level);
    if (eo_item)
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (data, EFL_UI_EVENT_CLICKED, eo_item);
-        eo_event_callback_call
+        efl_event_callback_call
           (data, EFL_UI_EVENT_SELECTED, eo_item);
         eo_id_item = eo_item;
         ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
@@ -918,7 +918,7 @@ _on_mouse_move(void *data,
                   sd->level = 1;
                   snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
                   elm_layout_signal_emit(data, buf, "elm");
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (data, ELM_INDEX_EVENT_LEVEL_UP, NULL);
                }
           }
@@ -929,7 +929,7 @@ _on_mouse_move(void *data,
                   sd->level = 0;
                   snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
                   elm_layout_signal_emit(data, buf, "elm");
-                  eo_event_callback_call
+                  efl_event_callback_call
                     (data, ELM_INDEX_EVENT_LEVEL_DOWN, NULL);
                }
           }
@@ -1268,9 +1268,9 @@ EAPI Eina_Bool elm_index_horizontal_get(const Evas_Object *obj)
 }
 
 EOLIAN static Eo *
-_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
+_elm_index_efl_object_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR);
@@ -1358,9 +1358,9 @@ _elm_index_item_selected_set(Eo *eo_it,
         edje_object_signal_emit(VIEW(it_active), "elm,state,active", "elm");
         edje_object_message_signal_process(VIEW(it_active));
 
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_INDEX_EVENT_CHANGED, eo_it);
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, EFL_UI_EVENT_SELECTED, eo_it);
         ecore_timer_del(sd->delay);
         sd->delay = ecore_timer_add(sd->delay_change_time,
@@ -1721,7 +1721,7 @@ _elm_index_standard_priority_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd)
 }
 
 static void
-_elm_index_class_constructor(Eo_Class *klass)
+_elm_index_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 7f76d03aea..539f691088 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -219,7 +219,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo
index 4e1d2a79c1..eb804cc6ae 100644
--- a/src/lib/elementary/elm_index_item.eo
+++ b/src/lib/elementary/elm_index_item.eo
@@ -40,8 +40,8 @@ class Elm.Index.Item(Elm.Widget.Item, Elm.Interface.Atspi_Widget_Action)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.access_register;
         Elm.Interface.Atspi_Accessible.name.get;
         Elm.Interface.Atspi_Widget_Action.elm_actions.get;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index ca8fe1ffc6..a5f2d2f234 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -117,7 +117,7 @@ const char* Atspi_Name[] = {
 
 struct _Elm_Atspi_Event_Handler
 {
-   Eo_Event_Cb cb;
+   Efl_Event_Cb cb;
    void *data;
 };
 
@@ -172,7 +172,7 @@ _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_At
    Eo *parent = obj;
 
    do {
-      parent = eo_parent_get(obj);
+      parent = efl_parent_get(obj);
       if (eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
         {
            type = elm_interface_atspi_accessible_type_get(parent);
@@ -281,8 +281,8 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
    Eina_Iterator *iter = NULL;
    Eo *chld;
 
-   // By default use Eo_Base object hierarchy
-   iter = eo_children_iterator_new(obj);
+   // By default use Efl_Object object hierarchy
+   iter = efl_children_iterator_new(obj);
    if (!iter) return NULL;
 
    EINA_ITERATOR_FOREACH(iter, chld)
@@ -319,7 +319,7 @@ EAPI void elm_atspi_attributes_list_free(Eina_List *list)
 }
 
 EOLIAN void
-_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Eo_Event_Description *event, void *event_info)
+_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
 {
    Eina_List *l;
    Elm_Atspi_Event_Handler *hdl;
@@ -355,7 +355,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
 }
 
 EOLIAN Elm_Atspi_Event_Handler *
-_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo_Event_Cb cb, void *data)
+_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
 {
    Elm_Atspi_Event_Handler *ret = calloc(1, sizeof(Elm_Atspi_Event_Handler));
 
@@ -453,7 +453,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
              if (!eina_list_data_find(rel->objects, rel_obj))
                {
                   rel->objects = eina_list_append(rel->objects, rel_obj);
-                  eo_event_callback_add((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set);
+                  efl_event_callback_add((Eo *) rel_obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
                }
              return EINA_TRUE;
           }
@@ -466,7 +466,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
    rel->objects = eina_list_append(rel->objects, rel_obj);
    *set = eina_list_append(*set, rel);
 
-   eo_event_callback_add((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set);
+   efl_event_callback_add((Eo *) rel_obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
    return EINA_TRUE;
 }
 
@@ -482,7 +482,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
           {
              if (eina_list_data_find(rel->objects, rel_obj))
                {
-                  eo_event_callback_del((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set);
+                  efl_event_callback_del((Eo *) rel_obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
                   rel->objects = eina_list_remove(rel->objects, rel_obj);
                }
              if (!rel->objects)
@@ -507,7 +507,7 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
         if (rel->type == type)
           {
              EINA_LIST_FOREACH(rel->objects, l, obj)
-                eo_event_callback_del(obj, EO_EVENT_DEL, _on_rel_obj_del, set);
+                efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
              *set = eina_list_remove(*set, rel);
              elm_atspi_relation_free(rel);
              return;
@@ -525,7 +525,7 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
    EINA_LIST_FREE(set, rel)
      {
         EINA_LIST_FOREACH(rel->objects, l, obj)
-           eo_event_callback_del(obj, EO_EVENT_DEL, _on_rel_obj_del, set);
+           efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
         elm_atspi_relation_free(rel);
      }
 }
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo
index eddcce67e1..289a99acde 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.eo
+++ b/src/lib/elementary/elm_interface_atspi_accessible.eo
@@ -1,5 +1,5 @@
 /* FIXME: This definitely shouldn't be here. */
-type Eo_Event_Cb: __undefined_type;
+type Efl_Event_Cb: __undefined_type;
 
 enum Elm.Atspi.Type
 {
@@ -213,7 +213,7 @@ struct Elm.Atspi.Event.Geometry_Changed.Data
 struct Elm.Atspi.Event.Children_Changed.Data
 {
    is_added: bool;
-   child: Eo.Base;
+   child: Efl.Object;
 }
 
 struct Elm.Atspi.Attribute
@@ -225,7 +225,7 @@ struct Elm.Atspi.Attribute
 struct Elm.Atspi.Relation
 {
    type: Elm.Atspi.Relation_Type;
-   objects: list<Eo.Base>;
+   objects: list<Efl.Object>;
 }
 
 type Elm.Atspi.Relation_Set: list<Elm.Atspi.Relation *>;
@@ -335,7 +335,7 @@ mixin Elm.Interface.Atspi_Accessible ()
       event_handler_add @class @protected {
          [[Register accessibility event listener]]
          params {
-              @in cb: Eo_Event_Cb; [[callback]]
+              @in cb: Efl_Event_Cb; [[callback]]
               @in data: void_ptr; [[data]]
          }
          return: Elm.Atspi.Event.Handler*; [[Event handler]]
@@ -349,7 +349,7 @@ mixin Elm.Interface.Atspi_Accessible ()
       event_emit @class @protected {
          params {
             @in accessible: Elm.Interface.Atspi_Accessible; [[Accessibility object.]]
-            @in event: const(Eo.Event.Description)*; [[Accessibility event type.]]
+            @in event: const(Efl.Event.Description)*; [[Accessibility event type.]]
             @in event_info: void_ptr; [[Accessibility event details.]]
          }
       }
@@ -425,7 +425,7 @@ mixin Elm.Interface.Atspi_Accessible ()
          get {
             [[Get root object of accessible object hierarchy]]
             values {
-               ret: Eo.Base;
+               ret: Efl.Object;
             }
          }
       }
diff --git a/src/lib/elementary/elm_interface_atspi_component.eo b/src/lib/elementary/elm_interface_atspi_component.eo
index 79f34d5f49..16a8422c95 100644
--- a/src/lib/elementary/elm_interface_atspi_component.eo
+++ b/src/lib/elementary/elm_interface_atspi_component.eo
@@ -98,7 +98,7 @@ mixin Elm.Interface.Atspi_Component ()
             @in x: int;
             @in y: int;
          }
-         return: Eo.Base;
+         return: Efl.Object;
       }
    }
 }
diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c
index 7224737fbd..2e2be438b9 100644
--- a/src/lib/elementary/elm_interface_atspi_image.c
+++ b/src/lib/elementary/elm_interface_atspi_image.c
@@ -19,7 +19,7 @@ _elm_interface_atspi_image_description_get(Eo *obj, void *sd EINA_UNUSED)
 {
    const char *descr = NULL;
 
-   descr = eo_key_data_get(obj, "atspi_image_description");
+   descr = efl_key_data_get(obj, "atspi_image_description");
    return descr;
 }
 
@@ -28,17 +28,17 @@ _elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const
 {
    const char *key = "atspi_image_description";
    const char *descr = eina_stringshare_add(description);
-   char *old_descr = eo_key_data_get(obj, key);
+   char *old_descr = efl_key_data_get(obj, key);
    if (old_descr)
      {
         eina_stringshare_del(old_descr);
-        eo_event_callback_del(obj, EO_EVENT_DEL, _free_desc_cb, old_descr);
+        efl_event_callback_del(obj, EFL_EVENT_DEL, _free_desc_cb, old_descr);
      }
 
    if (descr)
      {
-        eo_key_data_set(obj, key, descr);
-        eo_event_callback_add(obj, EO_EVENT_DEL, _free_desc_cb, descr);
+        efl_key_data_set(obj, key, descr);
+        efl_event_callback_add(obj, EFL_EVENT_DEL, _free_desc_cb, descr);
      }
 }
 
diff --git a/src/lib/elementary/elm_interface_atspi_selection.eo b/src/lib/elementary/elm_interface_atspi_selection.eo
index 42a98cf7b2..d4f0d416c8 100644
--- a/src/lib/elementary/elm_interface_atspi_selection.eo
+++ b/src/lib/elementary/elm_interface_atspi_selection.eo
@@ -11,7 +11,7 @@ interface Elm.Interface.Atspi.Selection ()
       @property selected_child @protected {
          [[Gets child for given child index]]
          get {
-            return: Eo.Base;
+            return: Efl.Object;
          }
          keys {
             selected_child_index: int; [[index of selected child]]
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 7c14d31e25..453198b137 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -31,12 +31,12 @@
     }
 
 #define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data)                 \
-  eo_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
-  eo_event_callback_add(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
+  efl_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
+  efl_event_callback_add(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
   Bool = 1;
 
 #define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data)              \
-  eo_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
+  efl_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
   Bool = 0;
 
 static const char SIG_CHANGED[] = "changed";
@@ -135,7 +135,7 @@ _elm_pan_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *
    psd->h = h;
 
    _elm_pan_update(psd);
-   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -164,7 +164,7 @@ _elm_pan_pos_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Eva
    psd->py = y;
 
    _elm_pan_update(psd);
-   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -231,9 +231,9 @@ _elm_pan_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
+_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_PAN_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_PAN_CLASS));
    efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
@@ -252,7 +252,7 @@ _elm_pan_content_del_cb(void *data,
    psd->content = NULL;
    psd->content_w = psd->content_h = psd->px = psd->py =
            psd->prev_cw = psd->prev_ch = psd->delta_posx = psd->delta_posy = 0;
-   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -272,7 +272,7 @@ _elm_pan_content_resize_cb(void *data,
         psd->content_h = h;
         _elm_pan_update(psd);
      }
-   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -314,11 +314,11 @@ _elm_pan_content_set(Evas_Object *obj,
    _elm_pan_update(psd);
 
 end:
-   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
-_elm_pan_class_constructor(Eo_Class *klass)
+_elm_pan_class_constructor(Efl_Class *klass)
 {
       evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
@@ -3872,7 +3872,7 @@ _elm_interface_scrollable_content_set(Eo *obj, Elm_Scrollable_Smart_Interface_Da
      {
         o = _elm_pan_add(evas_object_evas_get(obj));
         sid->pan_obj = o;
-        eo_event_callback_add
+        efl_event_callback_add
           (o, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
         evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE,
                                        _elm_scroll_pan_resized_cb, sid);
@@ -3900,7 +3900,7 @@ _elm_interface_scrollable_extern_pan_set(Eo *obj, Elm_Scrollable_Smart_Interface
 
    if (sid->pan_obj)
      {
-        eo_event_callback_del(sid->pan_obj, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
+        efl_event_callback_del(sid->pan_obj, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
         evas_object_event_callback_del(sid->pan_obj, EVAS_CALLBACK_RESIZE,
                                        _elm_scroll_pan_resized_cb);
      }
@@ -3927,7 +3927,7 @@ _elm_interface_scrollable_extern_pan_set(Eo *obj, Elm_Scrollable_Smart_Interface
    sid->pan_obj = pan;
 
    sid->extern_pan = EINA_TRUE;
-   eo_event_callback_add
+   efl_event_callback_add
      (sid->pan_obj, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
    evas_object_event_callback_add(sid->pan_obj, EVAS_CALLBACK_RESIZE,
                                   _elm_scroll_pan_resized_cb, sid);
@@ -4535,7 +4535,7 @@ _elm_interface_scrollable_efl_canvas_group_group_del(Eo *obj, Elm_Scrollable_Sma
 }
 
 EOLIAN static void
-_elm_interface_scrollable_class_constructor(Eo_Class *klass)
+_elm_interface_scrollable_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_SCROLLABLE_INTERFACE_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 28df916036..0cb4d34391 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -103,11 +103,11 @@ elm_win_inwin_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
+_elm_inwin_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
    Evas_Object *parent = NULL;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
 
    if (parent && !eo_isa(parent, EFL_UI_WIN_CLASS))
      {
@@ -115,7 +115,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
         return NULL;
      }
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
 
@@ -158,7 +158,7 @@ elm_win_inwin_content_unset(Evas_Object *obj)
 }
 
 static void
-_elm_inwin_class_constructor(Eo_Class *klass)
+_elm_inwin_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 2e089b268a..cc39ba4271 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -20,7 +20,7 @@ class Elm.Inwin (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.widget_parent.set;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 6bd4a97b20..90e97e650b 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -362,7 +362,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
    if (sd->slide_ellipsis)
      elm_obj_label_ellipsis_set(data, EINA_TRUE);
 
-   eo_event_callback_call(data, ELM_LABEL_EVENT_SLIDE_END, NULL);
+   efl_event_callback_call(data, ELM_LABEL_EVENT_SLIDE_END, NULL);
 }
 
 EOLIAN static void
@@ -412,9 +412,9 @@ elm_label_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
+_elm_label_efl_object_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);
@@ -618,7 +618,7 @@ _elm_label_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Label_
 }
 
 EOLIAN static void
-_elm_label_class_constructor(Eo_Class *klass)
+_elm_label_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index d04fcb5420..11e75e0202 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -122,7 +122,7 @@ class Elm.Label (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 7622976e03..f05cc9fd6f 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -376,7 +376,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
      }
 
    if (ret)
-     eo_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
+     efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    if (!_visuals_refresh(obj, sd))
      ret = ELM_THEME_APPLY_FAILED;
@@ -421,7 +421,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
      {
         elm_layout_signal_emit(obj, "elm,action,focus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
-        eo_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
      }
@@ -429,7 +429,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
      {
         elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
-        eo_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
      }
@@ -671,9 +671,9 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj EINA_UNUSED,
 static void
 _eo_unparent_helper(Eo *child, Eo *parent)
 {
-   if (eo_parent_get(child) == parent)
+   if (efl_parent_get(child) == parent)
      {
-        eo_parent_set(child, evas_object_evas_get(parent));
+        efl_parent_set(child, evas_object_evas_get(parent));
      }
 }
 
@@ -1049,7 +1049,7 @@ _elm_layout_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Ev
         sub_d->obj = content;
         sd->subs = eina_list_append(sd->subs, sub_d);
 
-        eo_parent_set(content, obj);
+        efl_parent_set(content, obj);
         _icon_signal_emit(sd, sub_d, EINA_TRUE);
      }
 
@@ -1342,7 +1342,7 @@ _layout_box_subobj_init(Elm_Layout_Smart_Data *sd, Elm_Layout_Sub_Object_Data *s
    sub_d->part = eina_stringshare_add(part);
    sub_d->obj = child;
    sd->subs = eina_list_append(sd->subs, sub_d);
-   eo_parent_set(child, sd->obj);
+   efl_parent_set(child, sd->obj);
 }
 
 Eina_Bool
@@ -1590,7 +1590,7 @@ _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
    sub_d->p.table.colspan = colspan;
    sub_d->p.table.rowspan = rowspan;
    sd->subs = eina_list_append(sd->subs, sub_d);
-   eo_parent_set(child, obj);
+   efl_parent_set(child, obj);
 
    elm_obj_layout_sizing_eval(obj);
 
@@ -1870,14 +1870,14 @@ _elm_layout_edje_object_can_access_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Dat
 }
 
 EOLIAN static void
-_elm_layout_eo_base_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Eo_Dbg_Info *root)
+_elm_layout_efl_object_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
    ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
 
    if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_OBJECT_CLASS))
      {
-        Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+        Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
         const char *file, *edje_group;
         Evas_Object *edje_obj = wd->resize_obj;
 
@@ -1904,10 +1904,10 @@ elm_layout_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
+_elm_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
    sd->obj = obj;
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
@@ -1915,7 +1915,7 @@ _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
    return obj;
 }
 
-EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass)
+EOLIAN static void _elm_layout_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -2002,7 +2002,7 @@ elm_layout_table_clear(Elm_Layout *obj, const char *part, Eina_Bool clear)
 
 /* Efl.Part implementation */
 
-static EOLIAN Eo_Base *
+static EOLIAN Efl_Object *
 _elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd,
                           const char *part)
 {
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index 92b4fb9f8a..3901ec393d 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -327,8 +327,8 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.dbg_info_get;
+      Efl.Object.constructor;
+      Efl.Object.dbg_info_get;
       Efl.File.file.set;
       Efl.File.file.get;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_layout_internal_part.eo b/src/lib/elementary/elm_layout_internal_part.eo
index 79800be1c8..b047609a1b 100644
--- a/src/lib/elementary/elm_layout_internal_part.eo
+++ b/src/lib/elementary/elm_layout_internal_part.eo
@@ -1,8 +1,8 @@
-class Elm.Layout.Internal.Part (Eo.Base, Efl.Container)
+class Elm.Layout.Internal.Part (Efl.Object, Efl.Container)
 {
    data: Elm_Part_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content.set;
       Efl.Container.content.get;
       Efl.Container.content_unset;
diff --git a/src/lib/elementary/elm_layout_pack.c b/src/lib/elementary/elm_layout_pack.c
index 66108c90b5..2c9676f06c 100644
--- a/src/lib/elementary/elm_layout_pack.c
+++ b/src/lib/elementary/elm_layout_pack.c
@@ -65,12 +65,12 @@ _elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *par
 }
 
 EOLIAN static void
-_efl_ui_layout_internal_box_eo_base_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
+_efl_ui_layout_internal_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
 {
    ELM_PART_HOOK;
    eo_data_xunref(pd->obj, pd->sd, obj);
    eina_stringshare_del(pd->part);
-   eo_destructor(eo_super(obj, BOX_CLASS));
+   efl_destructor(eo_super(obj, BOX_CLASS));
 }
 
 EOLIAN static void
@@ -106,7 +106,7 @@ static void
 _part_item_iterator_free(Part_Item_Iterator *it)
 {
    eina_iterator_free(it->real_iterator);
-   eo_wref_del(it->object, &it->object);
+   efl_wref_del(it->object, &it->object);
    eina_list_free(it->list);
    free(it);
 }
@@ -127,7 +127,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator, Eina_List *lis
    it->iterator.next = FUNC_ITERATOR_NEXT(_part_item_iterator_next);
    it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_part_item_iterator_get_container);
    it->iterator.free = FUNC_ITERATOR_FREE(_part_item_iterator_free);
-   eo_wref_add(obj, &it->object);
+   efl_wref_add(obj, &it->object);
 
    return &it->iterator;
 }
@@ -276,12 +276,12 @@ _efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *p
 }
 
 EOLIAN static void
-_efl_ui_layout_internal_table_eo_base_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
+_efl_ui_layout_internal_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
 {
    ELM_PART_HOOK;
    eo_data_xunref(pd->obj, pd->sd, obj);
    eina_stringshare_del(pd->part);
-   eo_destructor(eo_super(obj, TABLE_CLASS));
+   efl_destructor(eo_super(obj, TABLE_CLASS));
 }
 
 EOLIAN static Eina_Iterator *
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 0c04df90ea..6b3a8af100 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -613,7 +613,7 @@ static Eina_Bool _key_action_select(Evas_Object *obj, const char *params EINA_UN
    if (eo_it)
      {
         ELM_LIST_ITEM_DATA_GET(eo_it, it);
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, eo_it);
      }
 
@@ -672,7 +672,7 @@ _elm_list_deletions_process(Elm_List_Data *sd)
 
         /* issuing free because of "locking" item del pre hook */
         _elm_list_item_free(it);
-        eo_del(EO_OBJ(it));
+        efl_del(EO_OBJ(it));
      }
 
    sd->walking--;
@@ -1155,7 +1155,7 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
    focus_raise = edje_object_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), ELM_LIST_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -1183,7 +1183,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   eo_event_callback_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it);
+   efl_event_callback_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -1361,7 +1361,7 @@ _item_highlight(Elm_List_Item_Data *it)
    _elm_list_walk(sd);
 
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-   eo_event_callback_call(obj, ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
+   efl_event_callback_call(obj, ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
    select_raise = edje_object_data_get(VIEW(it), "selectraise");
    if ((select_raise) && (!strcmp(select_raise, "on")))
      evas_object_raise(VIEW(it));
@@ -1413,7 +1413,7 @@ call:
    _elm_list_walk(sd);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   eo_event_callback_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
      if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
    sd->last_selected_item = eo_it;
@@ -1440,7 +1440,7 @@ _item_unhighlight(Elm_List_Item_Data *it)
    _elm_list_walk(sd);
 
    edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
    stacking = edje_object_data_get(VIEW(it), "stacking");
    select_raise = edje_object_data_get(VIEW(it), "selectraise");
@@ -1482,7 +1482,7 @@ _item_unselect(Elm_List_Item_Data *it)
         sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
         if (!(it->base->disabled ||
               (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
-          eo_event_callback_call
+          efl_event_callback_call
             (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
@@ -1510,28 +1510,28 @@ static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static Eina_Bool
@@ -1548,7 +1548,7 @@ _long_press_cb(void *data)
    if (it->base->disabled) goto end;
 
    sd->longpressed = EINA_TRUE;
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
 end:
@@ -1573,7 +1573,7 @@ _swipe_do(Elm_List_Item_Data *it)
    sum /= sd->movements;
    if (abs(sum - sd->history[0].x) <= 10) return;
 
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(it), ELM_LIST_EVENT_SWIPE, EO_OBJ(it));
 }
 
@@ -1699,9 +1699,9 @@ _mouse_down_cb(void *data,
    /* Always call the callbacks last - the user may delete our context! */
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
-        eo_event_callback_call
+        efl_event_callback_call
           (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it));
      }
    sd->swipe = EINA_FALSE;
@@ -1735,7 +1735,7 @@ _mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          eo_event_callback_call
+          efl_event_callback_call
             (obj, EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
@@ -2271,9 +2271,9 @@ _access_widget_item_register(Elm_List_Item_Data *it, Eina_Bool is_access)
 }
 
 EOLIAN static Eo *
-_elm_list_item_eo_base_constructor(Eo *eo_it, Elm_List_Item_Data *it)
+_elm_list_item_efl_object_constructor(Eo *eo_it, Elm_List_Item_Data *it)
 {
-   eo_it = eo_constructor(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
+   eo_it = efl_constructor(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
@@ -2489,7 +2489,7 @@ _elm_list_efl_canvas_group_group_del(Eo *obj, Elm_List_Data *sd)
         /* issuing free because of "locking" item del pre hook */
         _elm_list_item_free(it);
         WIDGET(it) = NULL;
-        eo_del(eo_it);
+        efl_del(eo_it);
      }
 
    _elm_list_unwalk(obj, sd);
@@ -2550,9 +2550,9 @@ elm_list_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
+_elm_list_efl_object_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
@@ -2750,7 +2750,7 @@ _elm_list_clear(Eo *obj, Elm_List_Data *sd)
         ELM_LIST_ITEM_DATA_GET(eo_it, it);
         /* issuing free because of "locking" item del pre hook */
         _elm_list_item_free(it);
-        eo_del(eo_it);
+        efl_del(eo_it);
      }
 
    _elm_list_unwalk(obj, sd);
@@ -3154,7 +3154,7 @@ _elm_list_elm_widget_item_loop_enabled_get(Eo *obj EINA_UNUSED, Elm_List_Data *s
 }
 
 static void
-_elm_list_class_constructor(Eo_Class *klass)
+_elm_list_class_constructor(Efl_Class *klass)
 {
       if (_elm_config->access_mode)
         _elm_list_smart_focus_next_enable = EINA_TRUE;
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 11de7b6c37..4dc59a74cd 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -428,7 +428,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo
index 755b7ec864..69487ccf39 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/elm_list_item.eo
@@ -106,7 +106,7 @@ class Elm.List.Item(Elm.Widget.Item)
            }
       }
       implements {
-           Eo.Base.constructor;
+           Efl.Object.constructor;
            Elm.Widget.Item.disable;
            Elm.Widget.Item.del_pre;
            Elm.Widget.Item.signal_emit;
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 461bf83949..39d7dfffae 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1134,7 +1134,7 @@ elm_quicklaunch_fork(int    argc,
 
    if (qre_main)
      {
-        eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL);
+        efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL);
         ret = efl_loop_begin(ecore_main_loop_get());
         elm_shutdown();
         exit(ret);
@@ -1192,7 +1192,7 @@ efl_quicklaunch_fallback(int    argc,
    elm_quicklaunch_sub_init(argc, argv);
    if (efl_quicklaunch_prepare(argc, argv, getcwd(cwd, sizeof(cwd))))
      {
-        eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL);
+        efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL);
         return efl_loop_begin(ecore_main_loop_get());
      }
 
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 7c6fc88296..cd581e6019 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -599,7 +599,7 @@ _loaded_timeout_cb(void *data)
 
    sd->loaded_timer = NULL;
    if (!(sd->download_num) && !(sd->download_idler))
-      eo_event_callback_call
+      efl_event_callback_call
         (sd->obj, ELM_MAP_EVENT_LOADED, NULL);
    return ECORE_CALLBACK_CANCEL;
 }
@@ -751,7 +751,7 @@ _downloaded_cb(void *data,
 
         _grid_item_update(gi);
         gi->wsd->finish_num++;
-        eo_event_callback_call
+        efl_event_callback_call
           ((gi->wsd)->obj, ELM_MAP_EVENT_TILE_LOADED, NULL);
      }
    else
@@ -760,7 +760,7 @@ _downloaded_cb(void *data,
 
         ecore_file_remove(gi->file);
         gi->file_have = EINA_FALSE;
-        eo_event_callback_call
+        efl_event_callback_call
           ((gi->wsd)->obj, ELM_MAP_EVENT_TILE_LOADED_FAIL, NULL);
      }
 
@@ -809,7 +809,7 @@ _download_job(void *data)
            sd->download_list = eina_list_remove(sd->download_list, gi);
            sd->try_num++;
            sd->download_num++;
-           eo_event_callback_call
+           efl_event_callback_call
              (obj, ELM_MAP_EVENT_TILE_LOAD, NULL);
            if (sd->download_num == 1)
              edje_object_signal_emit(wd->resize_obj,
@@ -1070,7 +1070,7 @@ _zoom_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->zoom_timer = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1132,15 +1132,15 @@ _zoom_do(Elm_Map_Data *sd,
         sd->zoom_timer = NULL;
      }
    else
-      eo_event_callback_call
+      efl_event_callback_call
         (sd->obj, EFL_UI_EVENT_ZOOM_START, NULL);
 
    if (sd->obj)
      sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, ELM_MAP_EVENT_ZOOM_CHANGE, NULL);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
    evas_object_smart_changed(sd->pan_obj);
 }
@@ -1207,9 +1207,9 @@ _zoom_animator_set(Elm_Map_Data *sd,
    Eina_Bool r = EINA_FALSE;
 
    sd->zoom_animator = !!callback;
-   r = eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
-   r |= eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
-   if (callback) eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, callback, sd->obj);
+   r = efl_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
+   r |= efl_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
+   if (callback) efl_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, callback, sd->obj);
 
    return r;
 }
@@ -1280,7 +1280,7 @@ _scr_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->scr_timer = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1294,11 +1294,11 @@ _scroll_cb(Evas_Object *obj,
 
    if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
    else
-      eo_event_callback_call
+      efl_event_callback_call
         (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
@@ -1308,7 +1308,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
@@ -1318,7 +1318,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
@@ -1328,7 +1328,7 @@ _long_press_cb(void *data)
    ELM_MAP_DATA_GET(data, sd);
 
    sd->long_timer = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_LONGPRESSED, &sd->ev);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1348,10 +1348,10 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_event_callback_call
+     efl_event_callback_call
        (sd->obj, EFL_UI_EVENT_CLICKED_DOUBLE, ev);
    else
-     eo_event_callback_call
+     efl_event_callback_call
        (sd->obj, ELM_MAP_EVENT_PRESS, ev);
 
    ecore_timer_del(sd->long_timer);
@@ -1379,7 +1379,7 @@ _mouse_up_cb(void *data,
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
    if (!sd->on_hold)
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, EFL_UI_EVENT_CLICKED, ev);
    sd->on_hold = EINA_FALSE;
 }
@@ -1491,7 +1491,7 @@ _overlay_clicked_cb(void *data,
 
    EINA_SAFETY_ON_NULL_RETURN(data);
 
-   eo_event_callback_call
+   efl_event_callback_call
      ((overlay->wsd)->obj, ELM_MAP_EVENT_OVERLAY_CLICKED, overlay);
    if (overlay->cb)
      overlay->cb(overlay->cb_data, (overlay->wsd)->obj, overlay);
@@ -3078,14 +3078,14 @@ _route_cb(void *data,
         INF("Route request success from (%lf, %lf) to (%lf, %lf)",
             route->flon, route->flat, route->tlon, route->tlat);
         if (route->cb) route->cb(route->data, sd->obj, route);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_MAP_EVENT_ROUTE_LOADED, NULL);
      }
    else
      {
         ERR("Route request failed: %d", status);
         if (route->cb) route->cb(route->data, sd->obj, NULL);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_MAP_EVENT_ROUTE_LOADED_FAIL, NULL);
      }
 
@@ -3115,14 +3115,14 @@ _name_cb(void *data,
         INF("Name request success address:%s, lon:%lf, lat:%lf",
             name->address, name->lon, name->lat);
         if (name->cb) name->cb(name->data, sd->obj, name);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_MAP_EVENT_NAME_LOADED, NULL);
      }
    else
      {
         ERR("Name request failed: %d", status);
         if (name->cb) name->cb(name->data, sd->obj, NULL);
-        eo_event_callback_call
+        efl_event_callback_call
           (sd->obj, ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL);
      }
    edje_object_signal_emit(wd->resize_obj,
@@ -3152,7 +3152,7 @@ _name_list_cb(void *data,
         if (name_list->cb)
           name_list->cb(name_list->data, wd->obj,
                         name_list->names);
-        eo_event_callback_call
+        efl_event_callback_call
           (wd->obj, ELM_MAP_EVENT_NAME_LOADED, NULL);
      }
    else
@@ -3160,7 +3160,7 @@ _name_list_cb(void *data,
         ERR("Name List request failed: %d", status);
         if (name_list->cb)
           name_list->cb(name_list->data, wd->obj, NULL);
-        eo_event_callback_call
+        efl_event_callback_call
           (wd->obj, ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL);
      }
 
@@ -3238,7 +3238,7 @@ _name_request(const Evas_Object *obj,
    free(fname);
 
    sd->names = eina_list_append(sd->names, name);
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, ELM_MAP_EVENT_NAME_LOAD, name);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
@@ -3292,7 +3292,7 @@ _name_list_request(const Evas_Object *obj,
    free(url);
    free(fname);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (wd->obj, ELM_MAP_EVENT_NAME_LOAD, name_list->names);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
@@ -3917,14 +3917,14 @@ _elm_map_elm_widget_on_focus(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_Object_
 }
 
 EOLIAN static void
-_elm_map_pan_eo_base_destructor(Eo *obj, Elm_Map_Pan_Data *psd)
+_elm_map_pan_efl_object_destructor(Eo *obj, Elm_Map_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 static void
-_elm_map_pan_class_constructor(Eo_Class *klass)
+_elm_map_pan_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
@@ -4237,9 +4237,9 @@ elm_map_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
+_elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -4579,7 +4579,7 @@ _elm_map_route_add(Eo *obj, Elm_Map_Data *sd, Elm_Map_Route_Type type, Elm_Map_R
    free(url);
 
    sd->routes = eina_list_append(sd->routes, route);
-   eo_event_callback_call
+   efl_event_callback_call
      (sd->obj, ELM_MAP_EVENT_ROUTE_LOAD, route);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
@@ -4748,7 +4748,7 @@ elm_map_overlay_del(Elm_Map_Overlay *overlay)
    EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
    ELM_MAP_CHECK((overlay->wsd)->obj);
 
-   eo_event_callback_call
+   efl_event_callback_call
      ((overlay->wsd)->obj, ELM_MAP_EVENT_OVERLAY_DEL, overlay);
    if (overlay->del_cb)
      overlay->del_cb
@@ -5538,7 +5538,7 @@ _elm_map_track_remove(Eo *obj EINA_UNUSED, Elm_Map_Data *sd, Evas_Object *route)
 }
 
 static void
-_elm_map_class_constructor(Eo_Class *klass)
+_elm_map_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index cc9311b1ff..b43a4a6df2 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -625,7 +625,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo
index e31a30eafc..68efa2cc3d 100644
--- a/src/lib/elementary/elm_map_pan.eo
+++ b/src/lib/elementary/elm_map_pan.eo
@@ -5,7 +5,7 @@ class Elm.Map.Pan (Elm.Pan)
    event_prefix: elm_map_pan;
    implements {
       class.constructor;
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_resize;
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index d3ed67ed51..d56bac36c7 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -313,9 +313,9 @@ elm_mapbuf_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
+_elm_mapbuf_efl_object_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
 
@@ -434,7 +434,7 @@ _elm_mapbuf_point_color_set(Eo *obj EINA_UNUSED, Elm_Mapbuf_Data *sd, int idx, i
 }
 
 static void
-_elm_mapbuf_class_constructor(Eo_Class *klass)
+_elm_mapbuf_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index 6b7c2baac7..18935acc88 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -128,7 +128,7 @@ class Elm.Mapbuf (Elm.Widget, Efl.Container, Efl.Part)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_move;
diff --git a/src/lib/elementary/elm_mapbuf_internal_part.eo b/src/lib/elementary/elm_mapbuf_internal_part.eo
index f7c15d5600..fb495e7231 100644
--- a/src/lib/elementary/elm_mapbuf_internal_part.eo
+++ b/src/lib/elementary/elm_mapbuf_internal_part.eo
@@ -1,8 +1,8 @@
-class Elm.Mapbuf.Internal.Part (Eo.Base, Efl.Container)
+class Elm.Mapbuf.Internal.Part (Efl.Object, Efl.Container)
 {
    data: Elm_Part_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content.set;
       Efl.Container.content.get;
       Efl.Container.content_unset;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 726c5cffb4..b5c92dafa9 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -54,7 +54,7 @@ _item_del(Elm_Object_Item *eo_item)
      _item_del(child);
    eina_list_free(item->submenu.items);
 
-   eo_del(eo_item);
+   efl_del(eo_item);
 }
 
 static void
@@ -427,9 +427,9 @@ static void
 _hover_dismissed_cb(void *data, const Eo_Event *event)
 {
    _menu_hide(data, event->object, event->info);
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
-   eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
+   efl_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
 }
 
 static void
@@ -617,7 +617,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
      {
         snprintf(style, sizeof(style), "main_menu_submenu/%s", elm_widget_style_get(WIDGET(item)));
         elm_object_style_set(hv, style);
-        eo_event_callback_add
+        efl_event_callback_add
           (hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, WIDGET(item));
      }
    else
@@ -681,7 +681,7 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
    elm_widget_mirrored_set(priv->hv, EINA_FALSE);
 
    elm_object_style_set(priv->hv, "menu/default");
-   eo_event_callback_add
+   efl_event_callback_add
      (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj);
 
    priv->bx = elm_box_add(obj);
@@ -756,14 +756,14 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
 
         if (menu_bar)
           {
-             eo_event_callback_add
+             efl_event_callback_add
                (item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
              snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
              elm_object_style_set(item->submenu.hv, style);
           }
         else
           {
-             eo_event_callback_del(item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
+             efl_event_callback_del(item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
              snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
              elm_object_style_set(item->submenu.hv, style);
           }
@@ -781,14 +781,14 @@ elm_menu_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
+_elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd)
 {
    Eo *parent = NULL;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU);
 
    elm_menu_parent_set(obj, parent);
@@ -798,23 +798,23 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
        (sd->hv, ELM_HOVER_AXIS_VERTICAL), sd->bx);
 
    _sizing_eval(obj);
-   eo_event_callback_add
+   efl_event_callback_add
      (obj, ELM_MENU_EVENT_ELM_ACTION_BLOCK_MENU, _block_menu, sd);
-   eo_event_callback_add
+   efl_event_callback_add
      (obj, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, _unblock_menu, sd);
 
    return obj;
 }
 
 EOLIAN static void
-_elm_menu_eo_base_destructor(Eo *obj, Elm_Menu_Data *sd)
+_elm_menu_efl_object_destructor(Eo *obj, Elm_Menu_Data *sd)
 {
    Eina_List *itr, *itr2;
    Elm_Object_Item *eo_item;
    EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item)
      elm_wdg_item_del(eo_item);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EAPI void
@@ -971,7 +971,7 @@ _elm_menu_item_add_helper(Evas_Object *obj,
 }
 
 EOLIAN static void
-_elm_menu_item_eo_base_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
+_elm_menu_item_efl_object_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
 {
    ELM_MENU_DATA_GET(WIDGET(item), sd);
 
@@ -991,13 +991,13 @@ _elm_menu_item_eo_base_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
    if (sd->dbus_menu)
      _elm_dbus_menu_item_delete(sd->dbus_menu, item->dbus_idx);
 
-   eo_destructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
-_elm_menu_item_eo_base_constructor(Eo *eo_item, Elm_Menu_Item_Data *item)
+_elm_menu_item_efl_object_constructor(Eo *eo_item, Elm_Menu_Item_Data *item)
 {
-   eo_item = eo_constructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
+   eo_item = efl_constructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -1267,7 +1267,7 @@ _elm_menu_selected_item_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
 }
 
 static void
-_elm_menu_class_constructor(Eo_Class *klass)
+_elm_menu_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 550f2af204..d111c11779 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -70,8 +70,8 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Elm.Interface.Atspi.Selection)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo
index 3aae16a355..2a49a21f7e 100644
--- a/src/lib/elementary/elm_menu_item.eo
+++ b/src/lib/elementary/elm_menu_item.eo
@@ -74,8 +74,8 @@ class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.disable;
         Elm.Widget.Item.signal_emit;
         Elm.Widget.Item.part_text.get;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 46ae3d8d20..d99662b313 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -175,7 +175,7 @@ class Elm.Multibuttonentry (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo
index f0d4305baf..70b29618d1 100644
--- a/src/lib/elementary/elm_multibuttonentry_item.eo
+++ b/src/lib/elementary/elm_multibuttonentry_item.eo
@@ -24,8 +24,8 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item,
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.signal_emit;
         Elm.Widget.Item.part_text.get;
         Elm.Widget.Item.part_text.set;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 83c1f2d009..ae0dda4c88 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -141,7 +141,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo
index bd5a1ef980..9b4cf94fb7 100644
--- a/src/lib/elementary/elm_naviframe_item.eo
+++ b/src/lib/elementary/elm_naviframe_item.eo
@@ -75,8 +75,8 @@ class Elm.Naviframe.Item(Elm.Widget.Item)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.signal_emit;
         Elm.Widget.Item.part_text.set;
         Elm.Widget.Item.part_text.get;
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 57d53a80fb..eba87af592 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -222,7 +222,7 @@ _block_area_clicked_cb(void *data,
                        const char *emission EINA_UNUSED,
                        const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL);
+   efl_event_callback_call(data, ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL);
 }
 
 EOLIAN static void
@@ -264,7 +264,7 @@ _timer_cb(void *data)
    if (!evas_object_visible_get(obj)) goto end;
 
    evas_object_hide(obj);
-   eo_event_callback_call(obj, ELM_NOTIFY_EVENT_TIMEOUT, NULL);
+   efl_event_callback_call(obj, ELM_NOTIFY_EVENT_TIMEOUT, NULL);
 
 end:
    return ECORE_CALLBACK_CANCEL;
@@ -448,7 +448,7 @@ _hide_finished_cb(void *data,
    evas_object_hide(sd->notify);
    if (!sd->allow_events) evas_object_hide(sd->block_events);
    efl_canvas_group_hide(eo_super(data, MY_CLASS));
-   eo_event_callback_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
+   efl_event_callback_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
 }
 
 EOLIAN static void
@@ -491,9 +491,9 @@ elm_notify_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
+_elm_notify_efl_object_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
 
@@ -709,7 +709,7 @@ _elm_notify_align_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd, double *horizont
 }
 
 static void
-_elm_notify_class_constructor(Eo_Class *klass)
+_elm_notify_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index 89851a75f5..253f449b8e 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -78,7 +78,7 @@ class Elm.Notify (Elm.Widget, Efl.Container, Efl.Part)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
       Efl.Canvas.Group.group_move;
diff --git a/src/lib/elementary/elm_notify_internal_part.eo b/src/lib/elementary/elm_notify_internal_part.eo
index 686902c740..a73a52d7ac 100644
--- a/src/lib/elementary/elm_notify_internal_part.eo
+++ b/src/lib/elementary/elm_notify_internal_part.eo
@@ -1,8 +1,8 @@
-class Elm.Notify.Internal.Part (Eo.Base, Efl.Container)
+class Elm.Notify.Internal.Part (Efl.Object, Efl.Container)
 {
    data: Elm_Part_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content.set;
       Efl.Container.content.get;
       Efl.Container.content_unset;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index e70c9a99c4..164846c257 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -51,7 +51,7 @@ class Elm.Pan (Efl.Canvas.Group.Clipped)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       class.constructor;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_show;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 6a780c95b5..9ef0aa0e91 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1097,7 +1097,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
    if (sd->hidden) _drawer_close(obj, w, h, EINA_FALSE);
    else _drawer_open(obj, w, h, EINA_FALSE);
 
-   eo_event_callback_stop(event->object);
+   efl_event_callback_stop(event->object);
 }
 
 EOLIAN static void
@@ -1127,7 +1127,7 @@ _elm_panel_efl_canvas_group_group_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord
          break;
      }
 
-   eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
+   efl_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
 }
 
 EOLIAN static void
@@ -1171,9 +1171,9 @@ elm_panel_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
+_elm_panel_efl_object_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
@@ -1315,7 +1315,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
           }
         break;
      }
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL, (void *) &event);
 }
 
@@ -1380,7 +1380,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj, Elm_Panel_Data *sd, double ratio
          break;
      }
 
-   eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
+   efl_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1511,7 +1511,7 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
 }
 
 static void
-_elm_panel_class_constructor(Eo_Class *klass)
+_elm_panel_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index 75528a585c..0a0d1c6c5d 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -67,7 +67,7 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_panel_internal_part.eo b/src/lib/elementary/elm_panel_internal_part.eo
index 1736399c61..8d2f02fadb 100644
--- a/src/lib/elementary/elm_panel_internal_part.eo
+++ b/src/lib/elementary/elm_panel_internal_part.eo
@@ -1,8 +1,8 @@
-class Elm.Panel.Internal.Part (Eo.Base, Efl.Container)
+class Elm.Panel.Internal.Part (Efl.Object, Efl.Container)
 {
    data: Elm_Part_Data;
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Container.content.set;
       Efl.Container.content.get;
       Efl.Container.content_unset;
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 6fcaab03db..48bf4da524 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -141,7 +141,7 @@ _on_clicked(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -161,7 +161,7 @@ _on_pressed(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, ELM_PANES_EVENT_PRESS, NULL);
+   efl_event_callback_call(data, ELM_PANES_EVENT_PRESS, NULL);
 }
 
 static void
@@ -171,11 +171,11 @@ _on_unpressed(void *data,
               const char *source EINA_UNUSED)
 {
    ELM_PANES_DATA_GET(data, sd);
-   eo_event_callback_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
+   efl_event_callback_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
 
    if (sd->double_clicked)
      {
-        eo_event_callback_call(data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
+        efl_event_callback_call(data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
         sd->double_clicked = EINA_FALSE;
      }
 }
@@ -328,9 +328,9 @@ elm_panes_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
+_elm_panes_efl_object_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE);
@@ -565,7 +565,7 @@ _elm_panes_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_
 }
 
 static void
-_elm_panes_class_constructor(Eo_Class *klass)
+_elm_panes_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index 54db5851bc..2410e8d64f 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -116,7 +116,7 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index a358bdc56b..eaf45c4a45 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -7,7 +7,7 @@
 #define ELM_PART_HOOK
 
 #define ELM_PART_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0)
-#define ELM_PART_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) eo_del(obj); } } while(0)
+#define ELM_PART_UNREF(obj, pd) do { if (pd->temp) { if (!(--pd->temp)) efl_del(obj); } } while(0)
 #define ELM_PART_RETURN_VAL(a) do { ELM_PART_HOOK; typeof(a) _ret = a; ELM_PART_UNREF(obj, pd); return _ret; } while(0)
 #define ELM_PART_RETURN_VOID do { ELM_PART_HOOK; ELM_PART_UNREF(obj, pd); return; } while(0)
 #define ELM_PART_CALL(a) ({ ELM_PART_REF(obj, pd); a; })
@@ -26,18 +26,18 @@ struct _Elm_Part_Data
 
 #define ELM_PART_IMPLEMENT_DESTRUCTOR(type, TYPE, typedata, partdata) \
 static EOLIAN void \
-_ ## type ## _internal_part_eo_base_destructor(Eo *obj, partdata *pd) \
+_ ## type ## _internal_part_efl_object_destructor(Eo *obj, partdata *pd) \
 { \
    ELM_PART_HOOK; \
    free(pd->part); \
    eo_data_xunref(pd->obj, pd->sd, obj); \
-   eo_destructor(eo_super(obj, TYPE ## _INTERNAL_PART_CLASS)); \
+   efl_destructor(eo_super(obj, TYPE ## _INTERNAL_PART_CLASS)); \
 } \
 
 // Main part proxy implementation
 #define ELM_PART_IMPLEMENT(type, TYPE, typedata, partdata) \
 ELM_PART_IMPLEMENT_DESTRUCTOR(type, TYPE, typedata, partdata) \
-static EOLIAN Eo_Base * \
+static EOLIAN Efl_Object * \
 _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const char *part) \
 { \
    partdata *pd; \
@@ -79,7 +79,7 @@ _ ## type ## _internal_part_efl_container_content_unset(Eo *obj, partdata *pd) \
 
 // For widgets that inherit from something with parts (eg. from Elm.Layout)
 #define ELM_PART_OVERRIDE(type, TYPE, SUPER, typedata, partdata) \
-static EOLIAN Eo_Base * \
+static EOLIAN Efl_Object * \
 _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const char *part) \
 { \
    partdata *pd; \
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 09f3cd73f8..b640a0b3cb 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -109,7 +109,7 @@ _drag_done_cb(void *unused EINA_UNUSED,
    ELM_PHOTO_DATA_GET(obj, sd);
 
    elm_object_scroll_freeze_pop(obj);
-   eo_event_callback_call(obj, EFL_UI_EVENT_DRAG_END, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_DRAG_END, NULL);
    sd->drag_started = EINA_FALSE;
 }
 
@@ -173,7 +173,7 @@ _long_press_cb(void *obj)
                   _drag_done_cb, NULL))
           {
              elm_object_scroll_freeze_push(obj);
-             eo_event_callback_call
+             efl_event_callback_call
                (obj, EFL_UI_EVENT_DRAG_START, NULL);
              sd->drag_started = EINA_TRUE;
           }
@@ -216,7 +216,7 @@ _mouse_up(void *data,
    ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
 
    if (!sd->drag_started)
-     eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+     efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -265,7 +265,7 @@ _elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv)
    evas_object_event_callback_add
      (priv->icon, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj);
 
-   eo_event_callback_add
+   efl_event_callback_add
      (priv->icon, ELM_ICON_EVENT_THUMB_DONE, _on_thumb_done, obj);
 
    _elm_photo_internal_image_follow(obj);
@@ -301,9 +301,9 @@ elm_photo_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
+_elm_photo_efl_object_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
@@ -329,7 +329,7 @@ _elm_photo_efl_file_file_set(Eo *obj, Elm_Photo_Data *sd, const char *file, cons
 }
 
 static void
-_elm_photo_class_constructor(Eo_Class *klass)
+_elm_photo_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index 209b93468f..f48994eb46 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -4,7 +4,7 @@ class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable)
    eo_prefix: elm_obj_photo;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.File.file.set;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 034d95b025..3c9166b68b 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -137,7 +137,7 @@ _calc_job_cb(void *data)
         sd->minw = minw;
         sd->minh = minh;
 
-        eo_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
+        efl_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
         _sizing_eval(obj);
      }
    sd->calc_job = NULL;
@@ -258,7 +258,7 @@ _grid_load(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,start", "elm");
-                       eo_event_callback_call
+                       efl_event_callback_call
                         (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
                     }
                }
@@ -270,7 +270,7 @@ _grid_load(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-                       eo_event_callback_call
+                       efl_event_callback_call
                         (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
                     }
                   g->grid[tn].want = 0;
@@ -414,14 +414,14 @@ _elm_photocam_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Photocam_Pan
 }
 
 EOLIAN static void
-_elm_photocam_pan_eo_base_destructor(Eo *obj, Elm_Photocam_Pan_Data *psd)
+_elm_photocam_pan_efl_object_destructor(Eo *obj, Elm_Photocam_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
-_elm_photocam_pan_class_constructor(Eo_Class *klass)
+_elm_photocam_pan_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
@@ -468,7 +468,7 @@ _grid_clear(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-                       eo_event_callback_call
+                       efl_event_callback_call
                          (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
                     }
                }
@@ -501,7 +501,7 @@ _tile_preloaded_cb(void *data,
              edje_object_signal_emit
                (wd->resize_obj, "elm,state,busy,stop",
                "elm");
-             eo_event_callback_call
+             efl_event_callback_call
                (wd->obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
           }
      }
@@ -698,13 +698,13 @@ _main_img_preloaded_cb(void *data,
      }
    ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, data);
-   eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_LOADED, NULL);
+   efl_event_callback_call(data, ELM_PHOTOCAM_EVENT_LOADED, NULL);
    sd->preload_num--;
    if (!sd->preload_num)
      {
         edje_object_signal_emit
           (wd->resize_obj, "elm,state,busy,stop", "elm");
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
      }
 }
@@ -786,8 +786,8 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
      {
         sd->no_smooth--;
         if (!sd->no_smooth) _smooth_update(data);
-        eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
-        eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
+        efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+        efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
      }
 }
 
@@ -798,7 +798,7 @@ _long_press_cb(void *data)
 
    sd->long_timer = NULL;
    sd->longpressed = EINA_TRUE;
-   eo_event_callback_call
+   efl_event_callback_call
      (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -818,10 +818,10 @@ _mouse_down_cb(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = EINA_TRUE;
    else sd->on_hold = EINA_FALSE;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_event_callback_call
+     efl_event_callback_call
        (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
    else
-     eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
+     efl_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
    sd->longpressed = EINA_FALSE;
    ecore_timer_del(sd->long_timer);
    sd->long_timer = ecore_timer_add
@@ -843,7 +843,7 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    if (!sd->on_hold)
-     eo_event_callback_call
+     efl_event_callback_call
        (data, EFL_UI_EVENT_CLICKED, NULL);
    sd->on_hold = EINA_FALSE;
 }
@@ -889,7 +889,7 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
@@ -897,7 +897,7 @@ static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
@@ -905,7 +905,7 @@ static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
@@ -913,7 +913,7 @@ static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
@@ -932,7 +932,7 @@ _scroll_cb(Evas_Object *obj,
    ecore_timer_del(sd->scr_timer);
    sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
@@ -1077,7 +1077,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
 
-   eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+   efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
 }
 
 static void
@@ -1085,7 +1085,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
 {
    Eina_Bool r;
 
-   r = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+   r = efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
    if (r) _zoom_do(obj, 1.0);
 }
 
@@ -1094,13 +1094,13 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
 {
    Eina_Bool r;
 
-   r = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+   r = efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
    if (r)
      {
         sd->no_smooth--;
         if (!sd->no_smooth) _smooth_update(obj);
         _zoom_do(obj, 1.0);
-        eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
+        efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
      }
 }
 
@@ -1299,7 +1299,7 @@ _g_layer_zoom_end_cb(void *data,
         sd->g_layer_zoom.bounce.t_end = t +
           _elm_config->page_scroll_friction;
 
-        eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+        efl_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
      }
    else
      {
@@ -1467,8 +1467,8 @@ _elm_photocam_efl_canvas_group_group_del(Eo *obj, Elm_Photocam_Data *sd)
    ecore_job_del(sd->calc_job);
    ecore_timer_del(sd->scr_timer);
    ecore_timer_del(sd->long_timer);
-   eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
-   eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+   efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+   efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
 
    efl_canvas_group_del(eo_super(obj, MY_CLASS));
 }
@@ -1508,9 +1508,9 @@ elm_photocam_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
+_elm_photocam_efl_object_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
@@ -1565,13 +1565,13 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
    sd->main_load_pending = EINA_TRUE;
 
    sd->calc_job = ecore_job_add(_calc_job_cb, obj);
-   eo_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD, NULL);
+   efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD, NULL);
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
         edje_object_signal_emit
           (wd->resize_obj, "elm,state,busy,start", "elm");
-        eo_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
+        efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
      }
 
    tz = sd->zoom;
@@ -1607,12 +1607,12 @@ _elm_photocam_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *d
 
         free(sd->remote_data);
         sd->remote_data = NULL;
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
      }
    else
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_DONE, NULL);
      }
 
@@ -1626,7 +1626,7 @@ _elm_photocam_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
    Elm_Photocam_Data *sd = eo_data_scope_get(obj, MY_CLASS);
    Elm_Photocam_Error err = { error, EINA_FALSE };
 
-   eo_event_callback_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
+   efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
 
    sd->remote = NULL;
 }
@@ -1639,7 +1639,7 @@ _elm_photocam_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now
 
    progress.now = now;
    progress.total = total;
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_PROGRESS, &progress);
 }
 
@@ -1680,7 +1680,7 @@ _elm_photocam_file_set_internal(Eo *obj, Elm_Photocam_Data *sd, const char *file
                                         obj);
           if (sd->remote)
             {
-               eo_event_callback_call
+               efl_event_callback_call
                  (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_START, NULL);
                return ret;
             }
@@ -1936,8 +1936,8 @@ done:
      }
    else
      {
-        an = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
-        eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+        an = efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+        efl_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
         if (!an)
           {
              sd->no_smooth++;
@@ -1965,12 +1965,12 @@ done:
    if (!sd->paused)
      {
         if (started)
-          eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_START, NULL);
+          efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_START, NULL);
         if (!an)
-          eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
+          efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
      }
    if (zoom_changed)
-     eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
+     efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
 }
 
 EOLIAN static double
@@ -2191,7 +2191,7 @@ _elm_photocam_gesture_enabled_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
 }
 
 static void
-_elm_photocam_class_constructor(Eo_Class *klass)
+_elm_photocam_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index 6d442c5abc..88ae560e70 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -188,7 +188,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo
index 36f0b5fdf2..ee224c9176 100644
--- a/src/lib/elementary/elm_photocam_pan.eo
+++ b/src/lib/elementary/elm_photocam_pan.eo
@@ -5,7 +5,7 @@ class Elm.Photocam.Pan (Elm.Pan)
    event_prefix: elm_photocam_pan;
    implements {
       class.constructor;
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_resize;
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index f3d42d68a2..a930636aed 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -5,7 +5,7 @@ class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
    event_prefix: elm_player;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 1f5cd8faba..62adb0156f 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -42,7 +42,7 @@ _elm_plug_disconnected(Ecore_Evas *ee)
 {
    Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
    EINA_SAFETY_ON_NULL_RETURN(plug);
-   eo_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_DELETED, NULL);
+   efl_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_DELETED, NULL);
    /* TODO: was a typo. Deprecated, remove in future releases: */
    evas_object_smart_callback_call(plug, "image.deleted", NULL);
 }
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
    EINA_SAFETY_ON_NULL_RETURN(plug);
 
    ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
-   eo_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_RESIZED, &size);
+   efl_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_RESIZED, &size);
 }
 
 EOLIAN static Eina_Bool
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 EOLIAN static void
@@ -141,9 +141,9 @@ elm_plug_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
+_elm_plug_efl_object_constructor(Eo *obj, void *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
@@ -184,7 +184,7 @@ _elm_plug_connect(Eo *obj, void *sd EINA_UNUSED, const char *svcname, int svcnum
 }
 
 EOLIAN static void
-_elm_plug_class_constructor(Eo_Class *klass)
+_elm_plug_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 8f077da72f..1cdd4e8470 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -31,7 +31,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 90745ca7b3..a44e69f230 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -166,7 +166,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_add;
       Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/elm_popup_item.eo b/src/lib/elementary/elm_popup_item.eo
index b1545dc19f..c2ef7a21b0 100644
--- a/src/lib/elementary/elm_popup_item.eo
+++ b/src/lib/elementary/elm_popup_item.eo
@@ -3,8 +3,8 @@ class Elm.Popup.Item(Elm.Widget.Item)
    legacy_prefix: elm_popup_item;
       eo_prefix: elm_obj_popup_item;
       implements {
-           Eo.Base.constructor;
-           Eo.Base.destructor;
+           Efl.Object.constructor;
+           Efl.Object.destructor;
            Elm.Widget.Item.disable;
            Elm.Widget.Item.signal_emit;
            Elm.Widget.Item.part_text.get;
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index 120141feae..ca2f1e2511 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -136,7 +136,7 @@ _elm_prefs_save(void *data)
      {
         elm_prefs_data_save(sd->prefs_data, NULL, NULL);
 
-        eo_event_callback_call
+        efl_event_callback_call
           (wd->obj, ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name);
      }
 
@@ -300,7 +300,7 @@ _elm_prefs_item_changed_report(Eo *obj,
 
    snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (wd->obj, ELM_PREFS_EVENT_ITEM_CHANGED, buf);
 }
 
@@ -400,7 +400,7 @@ _prefs_data_autosaved_cb(void *cb_data,
    ELM_PREFS_DATA_GET(cb_data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (wd->obj, ELM_PREFS_EVENT_PAGE_SAVED, event_info);
 
    sd->dirty = EINA_FALSE;
@@ -513,9 +513,9 @@ elm_prefs_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
+_elm_prefs_efl_object_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT);
@@ -555,7 +555,7 @@ _item_changed_cb(Evas_Object *it_obj)
    /* we use the changed cb on ACTION/RESET/SAVE items specially */
    if (it->type == ELM_PREFS_TYPE_ACTION)
      {
-        eo_event_callback_call
+        efl_event_callback_call
           (wd->obj, ELM_PREFS_EVENT_ACTION, buf);
 
         return;
@@ -1174,7 +1174,7 @@ _elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd, const char *file, cons
 
    _elm_prefs_values_get_default(sd->root, EINA_FALSE);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name);
 
    return EINA_TRUE;
@@ -1219,7 +1219,7 @@ _elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd, Elm_Prefs_Data *prefs_data)
    sd->values_fetching = EINA_FALSE;
 
 end:
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name);
 
    return EINA_TRUE;
@@ -1871,7 +1871,7 @@ _elm_prefs_shutdown(void)
 }
 
 static void
-_elm_prefs_class_constructor(Eo_Class *klass)
+_elm_prefs_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index b93070173e..dea1603c50 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -213,7 +213,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c
index bb33f3d652..153d59ae6a 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/elm_progressbar.c
@@ -356,9 +356,9 @@ elm_progressbar_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
+_elm_progressbar_efl_object_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR);
@@ -509,7 +509,7 @@ _elm_progressbar_part_value_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, c
 
    _val_set(obj);
    _units_set(obj);
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_PROGRESSBAR_EVENT_CHANGED, NULL);
 }
 
@@ -647,7 +647,7 @@ _elm_progressbar_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_
 }
 
 EOLIAN static void
-_elm_progressbar_class_constructor(Eo_Class *klass)
+_elm_progressbar_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo
index 082a979154..b7d935e2a8 100644
--- a/src/lib/elementary/elm_progressbar.eo
+++ b/src/lib/elementary/elm_progressbar.eo
@@ -56,7 +56,7 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index 9e4987b354..3306272438 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -118,7 +118,7 @@ _activate(Evas_Object *obj)
 
         if (_elm_config->access_mode)
           _elm_access_say(E_("State: On"));
-        eo_event_callback_call
+        efl_event_callback_call
           (obj, ELM_RADIO_EVENT_CHANGED, NULL);
 
      }
@@ -273,9 +273,9 @@ elm_radio_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
+_elm_radio_efl_object_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON);
@@ -380,7 +380,7 @@ _elm_radio_elm_widget_activate(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, Elm_Act
 }
 
 EOLIAN static void
-_elm_radio_class_constructor(Eo_Class *klass)
+_elm_radio_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 043c36a763..893af6dbbe 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -77,7 +77,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 7ce7ad6a44..b7659529df 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -183,9 +183,9 @@ elm_route_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
+_elm_route_efl_object_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
@@ -256,7 +256,7 @@ _elm_route_latitude_min_max_get(Eo *obj EINA_UNUSED, Elm_Route_Data *sd, double
 }
 
 EOLIAN static void
-_elm_route_class_constructor(Eo_Class *klass)
+_elm_route_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
index 391b800dd7..a29ef9b99c 100644
--- a/src/lib/elementary/elm_route.eo
+++ b/src/lib/elementary/elm_route.eo
@@ -40,7 +40,7 @@ class Elm.Route (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 139fbe71f8..076df9ba19 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -572,35 +572,35 @@ static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
@@ -608,35 +608,35 @@ static void
 _scroll_left_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL);
 }
 
 static void
 _scroll_right_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL);
 }
 
 static void
 _scroll_up_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_UP, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_UP, NULL);
 }
 
 static void
 _scroll_down_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
@@ -644,7 +644,7 @@ static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
@@ -652,7 +652,7 @@ static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
@@ -660,7 +660,7 @@ static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
@@ -668,49 +668,49 @@ static void
 _vbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_DRAG, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_PRESS, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_DRAG, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_PRESS, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_UNPRESS, NULL);
+   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_UNPRESS, NULL);
 }
 
 static void
 _page_change_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED, NULL);
 }
 
@@ -952,9 +952,9 @@ elm_scroller_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
+_elm_scroller_efl_object_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE);
@@ -1392,7 +1392,7 @@ _elm_scroller_propagate_events_get(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
 }
 
 static void
-_elm_scroller_class_constructor(Eo_Class *klass)
+_elm_scroller_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index d4eb65fcf6..df68cbab53 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -59,7 +59,7 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_member_add;
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index f80678acd2..51b56e4727 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -317,7 +317,7 @@ _segment_on(Elm_Segment_Control_Item_Data *it)
    edje_object_signal_emit(VIEW(it), "elm,state,segment,selected", "elm");
 
    sd->selected_item = it;
-   eo_event_callback_call(sd->obj, ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it));
+   efl_event_callback_call(sd->obj, ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it));
 }
 
 static void
@@ -492,14 +492,14 @@ _elm_segment_control_item_elm_widget_item_part_content_get(Eo *eo_item EINA_UNUS
 }
 
 EOLIAN static void
-_elm_segment_control_item_eo_base_destructor(Eo *eo_item, Elm_Segment_Control_Item_Data *item)
+_elm_segment_control_item_efl_object_destructor(Eo *eo_item, Elm_Segment_Control_Item_Data *item)
 {
    ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(item), sd);
 
    _item_free(item);
    _update_list(sd);
 
-   eo_destructor(eo_super(eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS));
 }
 
 static char *
@@ -586,13 +586,13 @@ _item_new(Evas_Object *obj,
 }
 
 EOLIAN static Eo *
-_elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it)
+_elm_segment_control_item_efl_object_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it)
 {
-   obj = eo_constructor(eo_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *parent;
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
 
    VIEW(it) = edje_object_add(evas_object_evas_get(parent));
    edje_object_scale_set(VIEW(it),elm_widget_scale_get(WIDGET(it)) *
@@ -633,7 +633,7 @@ _elm_segment_control_efl_canvas_group_group_del(Eo *obj, Elm_Segment_Control_Dat
 
    EINA_LIST_FREE(sd->items, eo_it)
      {
-        eo_del(eo_it);
+        efl_del(eo_it);
      }
 
    efl_canvas_group_del(eo_super(obj, MY_CLASS));
@@ -702,9 +702,9 @@ elm_segment_control_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd EINA_UNUSED)
+_elm_segment_control_efl_object_constructor(Eo *obj, Elm_Segment_Control_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
@@ -832,7 +832,7 @@ _elm_segment_control_item_index_get(const Eo *eo_it EINA_UNUSED, Elm_Segment_Con
 }
 
 EOLIAN static void
-_elm_segment_control_class_constructor(Eo_Class *klass)
+_elm_segment_control_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index b0de254139..590eefeaa1 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -134,7 +134,7 @@ class Elm.Segment_Control (Elm.Layout)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo
index e8f175a1ac..7efd707b69 100644
--- a/src/lib/elementary/elm_segment_control_item.eo
+++ b/src/lib/elementary/elm_segment_control_item.eo
@@ -35,8 +35,8 @@ class Elm.Segment_Control.Item(Elm.Widget.Item)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
         Elm.Widget.Item.access_register;
         Elm.Widget.Item.part_text.get;
         Elm.Widget.Item.part_text.set;
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index 518a2ed08e..75e175ce39 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -95,9 +95,9 @@ elm_separator_horizontal_get(const Evas_Object *obj)
 }
 
 EOLIAN static Eo *
-_elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
+_elm_separator_efl_object_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR);
 
@@ -137,7 +137,7 @@ _elm_separator_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Se
 }
 
 EOLIAN static void
-_elm_separator_class_constructor(Eo_Class *klass)
+_elm_separator_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 507ee61c63..75f17184d8 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -4,7 +4,7 @@ class Elm.Separator (Elm.Layout, Efl.Orientation)
    eo_prefix: elm_obj_separator;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 6d3a7ee4ee..78f74a4d96 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -64,7 +64,7 @@ _delay_change(void *data)
    ELM_SLIDER_DATA_GET(data, sd);
 
    sd->delay = NULL;
-   eo_event_callback_call(data, ELM_SLIDER_EVENT_DELAY_CHANGED, NULL);
+   efl_event_callback_call(data, ELM_SLIDER_EVENT_DELAY_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_value_changed_signal_emit(data);
@@ -149,7 +149,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
         sd->range_from = val;
         if (user_event)
           {
-             eo_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
+             efl_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
              ecore_timer_del(sd->delay);
              sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
           }
@@ -159,7 +159,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
         sd->range_to = val2;
         if (user_event)
           {
-             eo_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
+             efl_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
              ecore_timer_del(sd->delay);
              sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
           }
@@ -356,7 +356,7 @@ _drag_start(void *data,
    if (!elm_widget_focus_get(data))
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
-   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
+   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    elm_widget_scroll_freeze_push(data);
 }
 
@@ -367,7 +367,7 @@ _drag_stop(void *data,
            const char *source EINA_UNUSED)
 {
    _slider_update(data, EINA_TRUE);
-   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
    elm_widget_scroll_freeze_pop(data);
 }
 
@@ -948,7 +948,7 @@ _spacer_down_cb(void *data,
    if (!elm_widget_focus_get(data))
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
-   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
+   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
 }
 
@@ -986,7 +986,7 @@ _spacer_move_cb(void *data,
           {
              if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
              _slider_update(data, EINA_TRUE);
-             eo_event_callback_call
+             efl_event_callback_call
                (data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
              if (sd->frozen)
                {
@@ -1027,7 +1027,7 @@ _spacer_up_cb(void *data,
    if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
 
    _slider_update(data, EINA_TRUE);
-   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
 
    if (sd->frozen)
      {
@@ -1283,9 +1283,9 @@ elm_slider_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
+_elm_slider_efl_object_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
@@ -1622,7 +1622,7 @@ _elm_slider_elm_widget_on_focus(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Elm_Ob
 }
 
 EOLIAN static void
-_elm_slider_class_constructor(Eo_Class *klass)
+_elm_slider_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -1644,12 +1644,12 @@ _elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Dat
    if (sd->val_min > value) return EINA_FALSE;
    if (sd->val_max < value) return EINA_FALSE;
 
-   eo_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
+   efl_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    sd->val = value;
    _visuals_refresh(obj);
    sd->val = oldval;
    _slider_update(obj, EINA_TRUE);
-   eo_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+   efl_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 329d988dd1..7832f1c4d2 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -170,7 +170,7 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index 0efebad999..d6a2a65683 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -272,7 +272,7 @@ _on_slideshow_end(void *data,
    elm_layout_signal_emit(data, "anim,end", "slideshow");
 
    if (emission != NULL)
-     eo_event_callback_call
+     efl_event_callback_call
        (data, ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current));
 }
 
@@ -289,7 +289,7 @@ _timer_cb(void *data)
 }
 
 EOLIAN static void
-_elm_slideshow_item_eo_base_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *item)
+_elm_slideshow_item_efl_object_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *item)
 {
    ELM_SLIDESHOW_DATA_GET_OR_RETURN(WIDGET(item), sd);
 
@@ -315,7 +315,7 @@ _elm_slideshow_item_eo_base_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *ite
    if ((VIEW(item)) && (item->itc->func.del))
      item->itc->func.del(elm_object_item_data_get(eo_item), VIEW(item));
 
-   eo_destructor(eo_super(eo_item, ELM_SLIDESHOW_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_SLIDESHOW_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -386,9 +386,9 @@ elm_slideshow_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
+_elm_slideshow_efl_object_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION);
@@ -397,9 +397,9 @@ _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static Eo *
-_elm_slideshow_item_eo_base_constructor(Eo *obj, Elm_Slideshow_Item_Data *it)
+_elm_slideshow_item_efl_object_constructor(Eo *obj, Elm_Slideshow_Item_Data *it)
 {
-   obj = eo_constructor(eo_super(obj, ELM_SLIDESHOW_ITEM_CLASS));
+   obj = efl_constructor(eo_super(obj, ELM_SLIDESHOW_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -481,7 +481,7 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED, Elm_Slideshow_Item_Data *item)
 
    sd->previous = sd->current;
    sd->current = next;
-   eo_event_callback_call
+   efl_event_callback_call
      (WIDGET(item), ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
@@ -519,7 +519,7 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = next;
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
@@ -557,7 +557,7 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = prev;
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
@@ -643,7 +643,7 @@ _elm_slideshow_clear(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd)
    sd->current = NULL;
 
    EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item)
-      eo_del(eo_item);
+      efl_del(eo_item);
 }
 
 EOLIAN static const Eina_List*
@@ -716,7 +716,7 @@ _elm_slideshow_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Sl
 }
 
 EOLIAN static void
-_elm_slideshow_class_constructor(Eo_Class *klass)
+_elm_slideshow_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index 2753f7ead6..ea0ce2b970 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -302,7 +302,7 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo
index 7510a88cc2..fd574ec10c 100644
--- a/src/lib/elementary/elm_slideshow_item.eo
+++ b/src/lib/elementary/elm_slideshow_item.eo
@@ -29,7 +29,7 @@ class Elm.Slideshow.Item(Elm.Widget.Item)
         }
    }
    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
+        Efl.Object.constructor;
+        Efl.Object.destructor;
    }
 }
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index d2701f5d96..d75ba8c466 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -233,7 +233,7 @@ _delay_change_timer_cb(void *data)
    ELM_SPINNER_DATA_GET(data, sd);
 
    sd->delay_change_timer = NULL;
-   eo_event_callback_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL);
+   efl_event_callback_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -266,7 +266,7 @@ _value_set(Evas_Object *obj,
    if (new_val == sd->val) return EINA_FALSE;
    sd->val = new_val;
 
-   eo_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
    elm_interface_atspi_accessible_value_changed_signal_emit(obj);
    ecore_timer_del(sd->delay_change_timer);
    sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME,
@@ -349,7 +349,7 @@ _drag_start_cb(void *data,
    sd->drag_prev_pos = 0;
    sd->drag_val_step = 1;
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_SPINNER_EVENT_SPINNER_DRAG_START, NULL);
 }
 
@@ -367,7 +367,7 @@ _drag_stop_cb(void *data,
    edje_object_part_drag_value_set
      (wd->resize_obj, "elm.dragable.slider", 0.0, 0.0);
 
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_SPINNER_EVENT_SPINNER_DRAG_STOP, NULL);
 }
 
@@ -406,7 +406,7 @@ _entry_value_apply(Evas_Object *obj)
    if (((*end != '\0') && (!isspace(*end))) || (fabs(val - sd->val) < DBL_EPSILON)) return;
    elm_spinner_value_set(obj, val);
 
-   eo_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
    ecore_timer_del(sd->delay_change_timer);
    sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME,
                                             _delay_change_timer_cb, obj);
@@ -607,7 +607,7 @@ _toggle_entry(Evas_Object *obj)
                     (sd->ent, EVAS_CALLBACK_SHOW, _entry_show_cb, obj);
                }
              elm_entry_single_line_set(sd->ent, EINA_TRUE);
-             eo_event_callback_add
+             efl_event_callback_add
                (sd->ent, ELM_ENTRY_EVENT_ACTIVATED, _entry_activated_cb, obj);
              elm_layout_content_set(obj, "elm.swallow.entry", sd->ent);
              _entry_accept_filter_add(obj);
@@ -1186,7 +1186,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->inc_button = elm_button_add(obj);
         elm_object_style_set(priv->inc_button, "spinner/increase/default");
 
-        eo_event_callback_array_add(priv->inc_button, _inc_dec_button_cb(), obj);
+        efl_event_callback_array_add(priv->inc_button, _inc_dec_button_cb(), obj);
 
         elm_layout_content_set(obj, "elm.swallow.inc_button", priv->inc_button);
         elm_widget_sub_object_add(obj, priv->inc_button);
@@ -1194,7 +1194,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->text_button = elm_button_add(obj);
         elm_object_style_set(priv->text_button, "spinner/default");
 
-        eo_event_callback_add
+        efl_event_callback_add
           (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj);
 
         elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button);
@@ -1203,7 +1203,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->dec_button = elm_button_add(obj);
         elm_object_style_set(priv->dec_button, "spinner/decrease/default");
 
-        eo_event_callback_array_add(priv->dec_button, _inc_dec_button_cb(), obj);
+        efl_event_callback_array_add(priv->dec_button, _inc_dec_button_cb(), obj);
 
         elm_layout_content_set(obj, "elm.swallow.dec_button", priv->dec_button);
         elm_widget_sub_object_add(obj, priv->dec_button);
@@ -1464,9 +1464,9 @@ elm_spinner_value_get(const Evas_Object *obj)
 }
 
 EOLIAN static Eo *
-_elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
+_elm_spinner_efl_object_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON);
@@ -1696,7 +1696,7 @@ _elm_spinner_round_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
 }
 
 EOLIAN static void
-_elm_spinner_class_constructor(Eo_Class *klass)
+_elm_spinner_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index f31493b427..265002ad7c 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -144,7 +144,7 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c
index 4735f911ac..84aefebc1b 100644
--- a/src/lib/elementary/elm_store.c
+++ b/src/lib/elementary/elm_store.c
@@ -554,8 +554,8 @@ elm_store_free(Elm_Store *st)
    if (st->genlist)
      {
         evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
-        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
-        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
+        efl_event_callback_del(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
+        efl_event_callback_del(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
         elm_genlist_clear(st->genlist);
         st->genlist = NULL;
      }
@@ -571,14 +571,14 @@ elm_store_target_genlist_set(Elm_Store *st, Evas_Object *obj)
    if (st->genlist)
      {
         evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
-        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
-        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
+        efl_event_callback_del(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
+        efl_event_callback_del(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
         elm_genlist_clear(st->genlist);
      }
    st->genlist = obj;
    if (!st->genlist) return;
-   eo_event_callback_add(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
-   eo_event_callback_add(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
+   efl_event_callback_add(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
+   efl_event_callback_add(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
    evas_object_event_callback_add(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
    elm_genlist_clear(st->genlist);
 }
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index c58659a1a3..61d634b6fd 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -17,7 +17,7 @@
 EAPI int ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = 0;
 EAPI int ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED      = 0;
 
-typedef const Eo_Class *(*Class_Get_Func)(void);
+typedef const Efl_Class *(*Class_Get_Func)(void);
 
 static Elm_Sys_Notify *_singleton = NULL;
 
@@ -58,8 +58,8 @@ typedef struct
  *                  Constructor/Destructor - Singleton setup                  *
  *============================================================================*/
 
-EOLIAN static Eo_Base *
-_elm_sys_notify_eo_base_constructor(Eo                  *obj,
+EOLIAN static Efl_Object *
+_elm_sys_notify_efl_object_constructor(Eo                  *obj,
                                     Elm_Sys_Notify_Data *sd  EINA_UNUSED)
 {
    if (_singleton != NULL)
@@ -68,17 +68,17 @@ _elm_sys_notify_eo_base_constructor(Eo                  *obj,
         return NULL;
      }
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    _singleton = obj;
 
    return obj;
 }
 
 EOLIAN static void
-_elm_sys_notify_eo_base_destructor(Eo                  *obj,
+_elm_sys_notify_efl_object_destructor(Eo                  *obj,
                                    Elm_Sys_Notify_Data *sd  EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
    _singleton = NULL;
 }
 
@@ -155,7 +155,7 @@ _elm_sys_notify_servers_set(Eo                     *obj  EINA_UNUSED,
           {
              /* Delete if server type is not provided */
              if (!(servers & (1 << i)))
-               eo_del(sd->servers[i]);
+               efl_del(sd->servers[i]);
           }
         else
           {
@@ -206,7 +206,7 @@ _elm_sys_notify_singleton_get(Eo   *obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_elm_sys_notify_class_constructor(Eo_Class *klass EINA_UNUSED)
+_elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED)
 {
    ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new();
    ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new();
@@ -223,7 +223,7 @@ _elm_unneed_sys_notify(void)
    if (manager)
      {
         elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
-        eo_del(manager);
+        efl_del(manager);
      }
 }
 
diff --git a/src/lib/elementary/elm_sys_notify.eo b/src/lib/elementary/elm_sys_notify.eo
index 2afec57a7a..db04299e26 100644
--- a/src/lib/elementary/elm_sys_notify.eo
+++ b/src/lib/elementary/elm_sys_notify.eo
@@ -40,7 +40,7 @@ struct Elm.Sys_Notify.Action_Invoked
                                 keys sent over in the list of actions]]
 }
 
-class Elm.Sys_Notify (Eo.Base, Elm.Sys_Notify_Interface)
+class Elm.Sys_Notify (Efl.Object, Elm.Sys_Notify_Interface)
 {
    legacy_prefix: elm_sys_notify;
    eo_prefix: elm_obj_sys_notify;
@@ -85,8 +85,8 @@ class Elm.Sys_Notify (Eo.Base, Elm.Sys_Notify_Interface)
 
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Elm.Sys_Notify_Interface.send;
       Elm.Sys_Notify_Interface.simple_send;
       Elm.Sys_Notify_Interface.close;
diff --git a/src/lib/elementary/elm_sys_notify_dbus.c b/src/lib/elementary/elm_sys_notify_dbus.c
index 0878ba24e0..98a48e83e8 100644
--- a/src/lib/elementary/elm_sys_notify_dbus.c
+++ b/src/lib/elementary/elm_sys_notify_dbus.c
@@ -356,8 +356,8 @@ _name_owner_changed_cb(void *data EINA_UNUSED,
      _update();
 }
 
-EOLIAN static Eo_Base *
-_elm_sys_notify_dbus_eo_base_constructor(Eo   *obj,
+EOLIAN static Efl_Object *
+_elm_sys_notify_dbus_efl_object_constructor(Eo   *obj,
                                          void *sd  EINA_UNUSED)
 {
    /* Don't create the same object twice (singleton) */
@@ -374,7 +374,7 @@ _elm_sys_notify_dbus_eo_base_constructor(Eo   *obj,
 
         eldbus_name_owner_get(_elm_sysnotif_conn, BUS, _name_owner_get_cb, NULL);
 
-        obj = eo_constructor(eo_super(obj, MY_CLASS));
+        obj = efl_constructor(eo_super(obj, MY_CLASS));
         return obj;
      }
 
@@ -383,14 +383,14 @@ _elm_sys_notify_dbus_eo_base_constructor(Eo   *obj,
 }
 
 EOLIAN static void
-_elm_sys_notify_dbus_eo_base_destructor(Eo   *obj,
+_elm_sys_notify_dbus_efl_object_destructor(Eo   *obj,
                                         void *sd  EINA_UNUSED)
 {
    _release();
 
    eldbus_connection_unref(_elm_sysnotif_conn);
    _elm_sysnotif_conn = NULL;
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/elementary/elm_sys_notify_dbus.eo b/src/lib/elementary/elm_sys_notify_dbus.eo
index ca7d303367..d95c1f05a8 100644
--- a/src/lib/elementary/elm_sys_notify_dbus.eo
+++ b/src/lib/elementary/elm_sys_notify_dbus.eo
@@ -1,12 +1,12 @@
-class Elm.Sys_Notify.Dbus (Eo.Base, Elm.Sys_Notify_Interface)
+class Elm.Sys_Notify.Dbus (Efl.Object, Elm.Sys_Notify_Interface)
 {
    legacy_prefix: elm_sys_notify_dbus;
    eo_prefix: elm_obj_sys_notify_dbus;
    data: null;
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Elm.Sys_Notify_Interface.send;
       Elm.Sys_Notify_Interface.simple_send;
       Elm.Sys_Notify_Interface.close;
diff --git a/src/lib/elementary/elm_systray.eo b/src/lib/elementary/elm_systray.eo
index 6bcefc0b2b..08149f693c 100644
--- a/src/lib/elementary/elm_systray.eo
+++ b/src/lib/elementary/elm_systray.eo
@@ -22,7 +22,7 @@ enum Elm.Systray.Status
    attention [[Needs Attention]]
 }
 
-class Elm.Systray (Eo.Base)
+class Elm.Systray (Efl.Object)
 {
    legacy_prefix: elm_systray;
    eo_prefix: elm_obj_systray;
@@ -69,7 +69,7 @@ class Elm.Systray (Eo.Base)
             [[Get the object path of the D-Bus Menu currently in use.]]
          }
          values {
-            menu: const(Eo.Base) @nullable;
+            menu: const(Efl.Object) @nullable;
          }
       }
       @property att_icon_name {
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index e318b19d07..6455804d99 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -210,9 +210,9 @@ elm_table_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
+_elm_table_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
@@ -392,7 +392,7 @@ _elm_table_child_get(const Eo *obj, void *_pd EINA_UNUSED, int col, int row)
 }
 
 EOLIAN static void
-_elm_table_class_constructor(Eo_Class *klass)
+_elm_table_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index 5f300f9bca..72a1ab8866 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -118,7 +118,7 @@ class Elm.Table (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index c0a5767471..09f5526cae 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -62,9 +62,9 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
+     efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
    else
-     eo_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
+     efl_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
 }
 
 static void
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (!sd->on_hold)
-     eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+     efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
 
    sd->on_hold = EINA_FALSE;
 }
@@ -113,7 +113,7 @@ _thumb_ready_inform(Elm_Thumb_Data *sd,
    eina_stringshare_replace(&(sd->thumb.key), thumb_key);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-   eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
+   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
 }
 
 static void
@@ -288,14 +288,14 @@ _thumb_finish(Elm_Thumb_Data *sd,
 
           wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
           edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
-          eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
+          efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
        }
 
    return;
 
 err:
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
-   eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
+   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
 }
 
 static void
@@ -341,7 +341,7 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
-   eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
+   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
 }
 
 static void
@@ -380,7 +380,7 @@ _thumb_start(Elm_Thumb_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm");
-   eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
+   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
 
    pending_request++;
    ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key);
@@ -473,7 +473,7 @@ _elm_thumb_efl_canvas_group_group_hide(Eo *obj, Elm_Thumb_Data *sd)
         sd->thumb.request = NULL;
 
         edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-        eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
+        efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
      }
 
    if (sd->thumb.retry)
@@ -580,9 +580,9 @@ elm_thumb_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd)
+_elm_thumb_efl_object_constructor(Eo *obj, Elm_Thumb_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, "Elm_Thumb");
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
@@ -683,7 +683,7 @@ _elm_thumb_efl_ui_draggable_drag_target_get(Eo *obj EINA_UNUSED, Elm_Thumb_Data
 }
 
 EOLIAN static void
-_elm_thumb_class_constructor(Eo_Class *klass)
+_elm_thumb_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index 160442103c..720bb844ab 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -7,7 +7,7 @@ class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
    event_prefix: elm_thumb;
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
       Efl.Canvas.Group.group_hide;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 8ef0d4e213..b361cbc607 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -159,7 +159,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
    elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
    if (item->icon)
      elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
-   eo_event_callback_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
+   efl_event_callback_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
    if (_elm_config->atspi_mode)
     elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
 }
@@ -633,7 +633,7 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
    focus_raise = elm_layout_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -660,7 +660,7 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
    elm_layout_signal_emit
       (VIEW(it), "elm,highlight,off", "elm");
    sd->focused_item = NULL;
-   eo_event_callback_call
+   efl_event_callback_call
      (obj, ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -1174,7 +1174,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
      {
         if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
      }
-   eo_event_callback_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
+   efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
     elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
 }
@@ -1813,7 +1813,7 @@ _mouse_clicked_cb(Elm_Toolbar_Item_Data *it,
    if (button == 1)
      {
         /* regular left click event */
-        eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED, EO_OBJ(it));
+        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED, EO_OBJ(it));
         return;
      }
    snprintf(buf, sizeof(buf), "elm,action,click,%d", button);
@@ -2205,7 +2205,7 @@ _long_press_cb(void *data)
    if (sd->reorder_mode)
      _item_reorder_start(it);
 
-   eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
+   efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -2238,7 +2238,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
 
    if (ev->button != 1) return;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+     efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
    sd->mouse_down = EINA_TRUE;
    sd->long_press = EINA_FALSE;
    if (sd->long_timer)
@@ -2305,21 +2305,21 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
@@ -2329,14 +2329,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
    ELM_TOOLBAR_DATA_GET(obj, sd);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
+   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
@@ -2385,7 +2385,7 @@ _access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_toolbar_item_eo_base_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item)
+_elm_toolbar_item_efl_object_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item)
 {
    Elm_Toolbar_Item_Data *next = NULL;
    Evas_Object *obj;
@@ -2413,7 +2413,7 @@ _elm_toolbar_item_eo_base_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item)
    if (item != sd->more_item)
       elm_obj_widget_theme_apply(obj);
 
-   eo_destructor(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
 }
 
 static void
@@ -2452,9 +2452,9 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it)
 }
 
 EOLIAN static Eo *
-_elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
+_elm_toolbar_item_efl_object_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
 {
-   eo_it = eo_constructor(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
+   eo_it = efl_constructor(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_MENU_ITEM);
 
@@ -3091,9 +3091,9 @@ elm_toolbar_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
+_elm_toolbar_efl_object_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR);
@@ -3982,7 +3982,7 @@ _elm_toolbar_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *
 }
 
 EOLIAN static void
-_elm_toolbar_class_constructor(Eo_Class *klass)
+_elm_toolbar_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index f3f4282c90..1dc6fc638b 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -344,7 +344,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_move;
       Efl.Canvas.Group.group_add;
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index 6f9f641a15..a2c94d4cbc 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -307,8 +307,8 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
            }
       }
       implements {
-           Eo.Base.constructor;
-           Eo.Base.destructor;
+           Efl.Object.constructor;
+           Efl.Object.destructor;
            Elm.Widget.Item.disable;
            Elm.Widget.Item.focus.set;
            Elm.Widget.Item.focus.get;
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 871f5e385b..39e573e03f 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -255,13 +255,13 @@ _elm_view_widget_add(Elm_View_Form_Data *priv, const char *propname, Evas_Object
 /**
  * @brief constructor
  */
-static Eo_Base*
-_elm_view_form_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_View_Form_Data *_pd)
+static Efl_Object*
+_elm_view_form_efl_object_constructor(Eo *obj EINA_UNUSED, Elm_View_Form_Data *_pd)
 {
    Elm_View_Form_Data *priv = (Elm_View_Form_Data *)_pd;
    priv->model_obj = NULL;
 
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
 
    return obj;
 }
@@ -270,7 +270,7 @@ _elm_view_form_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_View_Form_Data *_pd)
  * @brief destructor
  */
 static void
-_elm_view_form_eo_base_destructor(Eo *obj, Elm_View_Form_Data *priv)
+_elm_view_form_efl_object_destructor(Eo *obj, Elm_View_Form_Data *priv)
 {
    Elm_View_Form_Widget *w = NULL;
    EINA_LIST_FREE(priv->widgets, w)
@@ -281,7 +281,7 @@ _elm_view_form_eo_base_destructor(Eo *obj, Elm_View_Form_Data *priv)
      }
    priv->widgets = NULL;
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 
@@ -290,7 +290,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
 {
    if (priv->model_obj != NULL)
      {
-        eo_event_callback_del(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
+        efl_event_callback_del(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
         eo_unref(priv->model_obj);
      }
 
@@ -299,7 +299,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
    if (priv->model_obj != NULL)
      {
         eo_ref(priv->model_obj);
-        eo_event_callback_add(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
+        efl_event_callback_add(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
         _update_model_properties(priv);
      }
 }
diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo
index fee6e6a815..0197601245 100644
--- a/src/lib/elementary/elm_view_form.eo
+++ b/src/lib/elementary/elm_view_form.eo
@@ -1,4 +1,4 @@
-class Elm.View.Form (Eo.Base)
+class Elm.View.Form (Efl.Object)
 {
     methods {
         model_set {
@@ -22,8 +22,8 @@ class Elm.View.Form (Eo.Base)
         }
     }
     implements {
-        Eo.Base.destructor;
-        Eo.Base.constructor;
+        Efl.Object.destructor;
+        Efl.Object.constructor;
     }
     constructors {
         .model_set;
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index 4b6e77fb14..7ac268122c 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -70,7 +70,7 @@ _item_sel_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
 
    EINA_SAFETY_ON_NULL_RETURN(idata);
 
-   eo_event_callback_call(idata->priv->view, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, idata->model);
+   efl_event_callback_call(idata->priv->view, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, idata->model);
 }
 
 static void
@@ -80,8 +80,8 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
    if (!idata)
       return;
 
-   eo_event_callback_array_del(idata->model, model_callbacks(), idata);
-   eo_event_callback_del(idata->model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
+   efl_event_callback_array_del(idata->model, model_callbacks(), idata);
+   efl_event_callback_del(idata->model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
 
    eo_unref(idata->model);
    idata->model = NULL;
@@ -250,7 +250,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
 
    EINA_SAFETY_ON_NULL_RETURN(idata);
 
-   eo_event_callback_array_add(idata->model, model_callbacks(), idata);
+   efl_event_callback_array_add(idata->model, model_callbacks(), idata);
 
    _efl_model_load_children(idata);
 }
@@ -261,7 +261,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
    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);
+   efl_event_callback_array_del(idata->model, model_callbacks(), idata);
    elm_genlist_item_expanded_set(item, EINA_FALSE);
 }
 
@@ -279,7 +279,7 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
 
    if (priv && priv->genlist && priv->genlist == obj)
      {
-        eo_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
+        efl_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
         eo_unref(priv->genlist);
         priv->genlist = NULL;
      }
@@ -320,7 +320,7 @@ _efl_model_load_children_then(void * data, void* value)
         idata->parent = pdata;
         idata->model = child;
         eo_ref(child);
-        eo_event_callback_add(child, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
+        efl_event_callback_add(child, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
         idata->item = elm_genlist_item_append(priv->genlist, priv->itc, idata, pdata->item,
                                                        priv->itype, _item_sel_cb, idata);
      }
@@ -356,7 +356,7 @@ _priv_model_set(Elm_View_List_Data *priv, Eo *model)
 {
    if (priv->model != NULL)
      {
-         eo_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
+         efl_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
          elm_obj_genlist_clear(priv->genlist);
          eo_unref(priv->model);
          priv->model = NULL;
@@ -369,7 +369,7 @@ _priv_model_set(Elm_View_List_Data *priv, Eo *model)
    priv->rootdata->model = priv->model;
    eo_ref(priv->model);
 
-   eo_event_callback_array_add(priv->model, model_callbacks(), priv->rootdata);
+   efl_event_callback_array_add(priv->model, model_callbacks(), priv->rootdata);
    _efl_model_load_children(priv->rootdata);
 }
 
@@ -398,18 +398,18 @@ _elm_view_list_genlist_set(Eo *obj, Elm_View_List_Data *priv, Evas_Object *genli
    priv->itc->func.del = _item_del;
    priv->prop_con = eina_hash_string_superfast_new(free);
 
-   eo_event_callback_array_add(priv->genlist, genlist_callbacks(), priv);
+   efl_event_callback_array_add(priv->genlist, genlist_callbacks(), priv);
    evas_object_event_callback_add(priv->genlist, EVAS_CALLBACK_DEL, _genlist_deleted, priv);
 }
 
 
 static void
-_elm_view_list_eo_base_destructor(Eo *obj, Elm_View_List_Data *priv)
+_elm_view_list_efl_object_destructor(Eo *obj, Elm_View_List_Data *priv)
 {
    EINA_SAFETY_ON_NULL_RETURN(priv);
    EINA_SAFETY_ON_NULL_RETURN(obj);
 
-   eo_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
+   efl_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
 
    elm_obj_genlist_clear(priv->genlist);
    free((void *)priv->itc->item_style);
@@ -421,13 +421,13 @@ _elm_view_list_eo_base_destructor(Eo *obj, Elm_View_List_Data *priv)
    if (priv->genlist)
      {
          evas_object_event_callback_del(priv->genlist, EVAS_CALLBACK_DEL, _genlist_deleted);
-         eo_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
+         efl_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
          eo_unref(priv->genlist);
      }
 
    eo_unref(priv->model);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo
index 3e0292ca97..79349a060e 100644
--- a/src/lib/elementary/elm_view_list.eo
+++ b/src/lib/elementary/elm_view_list.eo
@@ -1,6 +1,6 @@
 import elm_genlist_item;
 
-class Elm.View.List (Eo.Base)
+class Elm.View.List (Efl.Object)
 {
     methods {
         genlist_set {
@@ -64,7 +64,7 @@ class Elm.View.List (Eo.Base)
     }
 
     implements {
-        Eo.Base.destructor;
+        Efl.Object.destructor;
     }
     constructors {
         .genlist_set;
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index 685e6a4b80..08848ed3bd 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -498,7 +498,7 @@ class Elm.Web (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
    events {
       uri,changed;
diff --git a/src/lib/elementary/elm_web.h b/src/lib/elementary/elm_web.h
index 43099ffdad..226677ef2e 100644
--- a/src/lib/elementary/elm_web.h
+++ b/src/lib/elementary/elm_web.h
@@ -99,7 +99,7 @@
 #undef ELM_WEB_CLASS
 #define ELM_WEB_CLASS elm_web_real_class_get()
 
-EAPI const Eo_Class *elm_web_real_class_get(void);
+EAPI const Efl_Class *elm_web_real_class_get(void);
 
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c
index f561fb562b..c422d5bbe1 100644
--- a/src/lib/elementary/elm_web2.c
+++ b/src/lib/elementary/elm_web2.c
@@ -30,7 +30,7 @@ struct _Elm_Web_Module
                                       Evas_Coord *w,
                                       Evas_Coord *h);
 
-   const Eo_Class *(*class_get)(void);
+   const Efl_Class *(*class_get)(void);
 
    Eina_Module *m;
 };
@@ -83,7 +83,7 @@ elm_web_add(Evas_Object *parent)
    return eo_add(ewm.class_get(), parent);
 }
 
-EAPI const Eo_Class *
+EAPI const Efl_Class *
 elm_web_real_class_get(void)
 {
    if (!ewm.class_get) return NULL;
@@ -92,9 +92,9 @@ elm_web_real_class_get(void)
 }
 
 EOLIAN static Eo *
-_elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd)
+_elm_web_efl_object_constructor(Eo *obj, Elm_Web_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks);
@@ -157,7 +157,7 @@ elm_web_window_features_region_get(const Elm_Web_Window_Features *wf,
 }
 
 static void
-_elm_web_class_constructor(Eo_Class *klass)
+_elm_web_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 4145d3a4be..3953e390ec 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -123,11 +123,11 @@ _callbacks_add(Eo *widget, void *data)
 {
    if (_elm_widget_is(widget))
      {
-        eo_event_callback_array_add(widget, elm_widget_subitems_callbacks(), data);
+        efl_event_callback_array_add(widget, elm_widget_subitems_callbacks(), data);
      }
    else
      {
-        eo_event_callback_array_add(widget, efl_subitems_callbacks(), data);
+        efl_event_callback_array_add(widget, efl_subitems_callbacks(), data);
      }
 }
 
@@ -136,11 +136,11 @@ _callbacks_del(Eo *widget, void *data)
 {
    if (_elm_widget_is(widget))
      {
-        eo_event_callback_array_del(widget, elm_widget_subitems_callbacks(), data);
+        efl_event_callback_array_del(widget, elm_widget_subitems_callbacks(), data);
      }
    else
      {
-        eo_event_callback_array_del(widget, efl_subitems_callbacks(), data);
+        efl_event_callback_array_del(widget, efl_subitems_callbacks(), data);
      }
 }
 
@@ -940,7 +940,7 @@ elm_widget_access(Evas_Object *obj,
      }
 
    elm_obj_widget_access(obj, is_access);
-   eo_event_callback_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
 
    return ret;
 }
@@ -1123,7 +1123,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
 {
    Eo *parent = NULL;
 
-   parent = eo_parent_get(sobj);
+   parent = efl_parent_get(sobj);
    if (!eo_isa(parent, ELM_WIDGET_CLASS))
      {
         ERR("You passed a wrong parent parameter (%p %s). "
@@ -1451,7 +1451,7 @@ _elm_widget_can_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focu
              sd->child_can_focus = EINA_TRUE;
           }
 
-        eo_event_callback_array_add(obj, focus_callbacks(), NULL);
+        efl_event_callback_array_add(obj, focus_callbacks(), NULL);
      }
    else
      {
@@ -1478,7 +1478,7 @@ _elm_widget_can_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focu
              if (sdp->child_can_focus) break;
              parent = sdp->parent_obj;
           }
-        eo_event_callback_array_del(obj, focus_callbacks(), NULL);
+        efl_event_callback_array_del(obj, focus_callbacks(), NULL);
      }
 }
 
@@ -3664,7 +3664,7 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSE
         sd->on_translate = EINA_FALSE;
      }
 #endif
-   eo_event_callback_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
+   efl_event_callback_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
    return EINA_TRUE;
 }
 
@@ -3876,10 +3876,10 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
 }
 
 EOLIAN static void
-_elm_widget_eo_base_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eo_Dbg_Info *root)
+_elm_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    EO_DBG_INFO_APPEND(group, "Wid-Type", EINA_VALUE_TYPE_STRING, elm_widget_type_get(eo_obj));
    EO_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, elm_widget_style_get(eo_obj));
@@ -4467,7 +4467,7 @@ _track_obj_del(void *data, Evas *e EINA_UNUSED,
 
    if (!item->view) return;
 
-   eo_event_callback_array_del(item->view, tracker_callbacks(), item);
+   efl_event_callback_array_del(item->view, tracker_callbacks(), item);
 }
 
 static void
@@ -4506,7 +4506,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
 #define ERR_NOT_SUPPORTED(item, method)  ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method);
 
 static void
-_eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event)
+_efl_del_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Elm_Widget_Item_Data *item = eo_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS);
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
@@ -4534,10 +4534,10 @@ _eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event)
  * @ingroup Widget
  */
 EOLIAN static Eo *
-_elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
+_elm_widget_item_efl_object_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
 {
    Evas_Object *widget;
-   widget = eo_parent_get(eo_item);
+   widget = efl_parent_get(eo_item);
 
    if (!_elm_widget_is(widget))
      {
@@ -4545,19 +4545,19 @@ _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
         return NULL;
      }
 
-   eo_item = eo_constructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
+   eo_item = efl_constructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
 
    EINA_MAGIC_SET(item, ELM_WIDGET_ITEM_MAGIC);
 
    item->widget = widget;
    item->eo_obj = eo_item;
-   eo_event_callback_add(eo_item, EO_EVENT_DEL, _eo_del_cb, NULL);
+   efl_event_callback_add(eo_item, EFL_EVENT_DEL, _efl_del_cb, NULL);
 
    return eo_item;
 }
 
 EOLIAN static void
-_elm_widget_item_eo_base_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
+_elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
 {
    Elm_Translate_String_Data *ts;
 
@@ -4592,7 +4592,7 @@ _elm_widget_item_eo_base_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
 
    EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
 
-   eo_destructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
+   efl_destructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
 }
 
 /**
@@ -4629,7 +4629,7 @@ _elm_widget_item_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
    Eina_Bool del_ok;
    del_ok = elm_wdg_item_del_pre(item->eo_obj);
    if (del_ok)
-      eo_del(item->eo_obj);
+      efl_del(item->eo_obj);
    return;
 }
 
@@ -4973,7 +4973,7 @@ _elm_widget_item_track(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
    evas_object_event_callback_add(track, EVAS_CALLBACK_DEL, _track_obj_del,
                                   item);
 
-   eo_event_callback_array_add(item->view, tracker_callbacks(), item);
+   efl_event_callback_array_add(item->view, tracker_callbacks(), item);
 
    evas_object_ref(track);
 
@@ -5821,15 +5821,15 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
 }
 
 EOLIAN static Eo *
-_elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
+_elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
 {
    Eo *parent = NULL;
 
    sd->on_create = EINA_TRUE;
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    elm_obj_widget_parent_set(obj, parent);
    sd->on_create = EINA_FALSE;
 
@@ -5838,14 +5838,14 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_widget_eo_base_destructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
+_elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
 {
    sd->on_destroy = EINA_TRUE;
    elm_interface_atspi_accessible_description_set(obj, NULL);
    elm_interface_atspi_accessible_name_set(obj, NULL);
    elm_interface_atspi_accessible_translation_domain_set(obj, NULL);
    elm_interface_atspi_accessible_relationships_clear(obj);
-   eo_destructor(eo_super(obj, ELM_WIDGET_CLASS));
+   efl_destructor(eo_super(obj, ELM_WIDGET_CLASS));
    sd->on_destroy = EINA_FALSE;
 
    elm_interface_atspi_accessible_removed(obj);
@@ -5855,7 +5855,7 @@ EOLIAN static Eina_Bool
 _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED)
 {
    Eina_Bool focused;
-   const Eo_Event_Description *desc;
+   const Efl_Event_Description *desc;
 
    if (!elm_widget_can_focus_get(obj))
      return EINA_FALSE;
@@ -5865,7 +5865,7 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item E
 
    if (!sd->resize_obj)
      evas_object_focus_set(obj, focused);
-   eo_event_callback_call(obj, desc, NULL);
+   efl_event_callback_call(obj, desc, NULL);
 
    if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
      elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, focused);
@@ -5910,7 +5910,7 @@ _elm_widget_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED
 }
 
 EOLIAN static void
-_elm_widget_class_constructor(Eo_Class *klass)
+_elm_widget_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -6083,10 +6083,10 @@ _elm_widget_item_elm_interface_atspi_component_alpha_get(Eo *obj EINA_UNUSED, El
    return (double)alpha / 255.0;
 }
 
-EOLIAN static Eo_Base *
-_elm_widget_eo_base_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const Eo_Base *klass)
+EOLIAN static Efl_Object *
+_elm_widget_efl_object_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
 {
-   Eo_Base *lookup = NULL;
+   Efl_Object *lookup = NULL;
 
    if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS))
      return _efl_config_obj;
@@ -6094,8 +6094,8 @@ _elm_widget_eo_base_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const Eo_B
    if (pd->provider_lookup) return NULL;
    pd->provider_lookup = EINA_TRUE;
 
-   lookup = eo_provider_find(pd->parent_obj, klass);
-   if (!lookup) lookup = eo_provider_find(eo_super(obj, MY_CLASS), klass);
+   lookup = efl_provider_find(pd->parent_obj, klass);
+   if (!lookup) lookup = efl_provider_find(eo_super(obj, MY_CLASS), klass);
 
    pd->provider_lookup = EINA_FALSE;
 
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index e495a4b405..5ef905e9e0 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -650,7 +650,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
          return: bool;
          params {
             @in base: const(Efl.Canvas.Object);
-            @in items: const(list<Eo.Base>);
+            @in items: const(list<Efl.Object>);
             @in list_data_get: list_data_get_func_type;
             @in degree: double;
             @out direction: Efl.Canvas.Object;
@@ -744,7 +744,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
       focus_list_next_get @const {
          return: bool;
          params {
-            @in items: const(list<Eo.Base>);
+            @in items: const(list<Efl.Object>);
             @in list_data_get: list_data_get_func_type;
             @in dir: Elm.Focus_Direction;
             @out next: Efl.Canvas.Object;
@@ -840,10 +840,10 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
-      Eo.Base.provider_find;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
+      Efl.Object.provider_find;
       Efl.Canvas.Group.group_hide;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_clip_unset;
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 030e0997cd..e8982ffc06 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -454,7 +454,7 @@ typedef struct _Elm_Widget_Smart_Data
    Eina_Bool                     on_translate : 1; /**< This is true when any types of elm translate function is being called. */
    Eina_Bool                     on_create : 1; /**< This is true when the widget is on creation(general widget constructor). */
    Eina_Bool                     on_destroy: 1; /**< This is true when the widget is on destruction(general widget destructor). */
-   Eina_Bool                     provider_lookup : 1; /**< This is true when eo_provider_find is currently walking the tree */
+   Eina_Bool                     provider_lookup : 1; /**< This is true when efl_provider_find is currently walking the tree */
 } Elm_Widget_Smart_Data;
 
 /**
@@ -571,10 +571,10 @@ struct _Elm_Widget_Item_Signal_Data
 };
 
 #define WIDGET_ITEM_DATA_GET(eo_obj) \
-    eo_key_data_get((Eo *) eo_obj, "__elm_widget_item_data")
+    efl_key_data_get((Eo *) eo_obj, "__elm_widget_item_data")
 
 #define WIDGET_ITEM_DATA_SET(eo_obj, data) \
-    eo_key_data_set((Eo *) eo_obj, "__elm_widget_item_data", data)
+    efl_key_data_set((Eo *) eo_obj, "__elm_widget_item_data", data)
 
 struct _Elm_Widget_Item_Data
 {
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index ba81cc96a4..216a9ece16 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
+class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible,
                       Elm.Interface.Atspi_Component)
 {
       eo_prefix: elm_wdg_item;
@@ -529,8 +529,8 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
            }
       }
       implements {
-           Eo.Base.constructor;
-           Eo.Base.destructor;
+           Efl.Object.constructor;
+           Efl.Object.destructor;
            Elm.Interface.Atspi_Accessible.state_set.get;
            Elm.Interface.Atspi_Component.extents.get;
            Elm.Interface.Atspi_Component.extents.set;
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index 5b9f2894e4..a5b8edaada 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -53,7 +53,7 @@ class Emotion.Object (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Ima
         }
    }
    implements {
-        Eo.Base.constructor;
+        Efl.Object.constructor;
         Efl.Canvas.Group.group_add;
         Efl.Canvas.Group.group_del;
         Efl.Canvas.Group.group_move;
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index b1ce922aa0..c01e9d1286 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -243,9 +243,9 @@ emotion_object_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
+_emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, E_OBJ_NAME);
 
    return obj;
@@ -1310,7 +1310,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double)
    Emotion_Object_Data *sd = data;
 
    emotion_object_position_set(evas_object_smart_parent_get(sd->obj), xattr_double);
-   eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
+   efl_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
    _eio_load_xattr_cleanup(sd, handler);
 }
 
@@ -1319,7 +1319,7 @@ _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
 {
    Emotion_Object_Data *sd = data;
 
-   eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
+   efl_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
    _eio_load_xattr_cleanup(sd, handler);
 }
 #endif
@@ -1354,10 +1354,10 @@ emotion_object_last_position_load(Evas_Object *obj)
    if (eina_xattr_double_get(tmp, "user.e.time_seek", &xattr))
      {
         emotion_object_position_set(obj, xattr);
-        eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
+        efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
      }
    else
-     eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
+     efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
 #endif
 }
 
@@ -1380,7 +1380,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler)
 {
    Emotion_Object_Data *sd = data;
 
-   eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
+   efl_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
    _eio_save_xattr_cleanup(sd, handler);
 }
 
@@ -1389,7 +1389,7 @@ _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
 {
    Emotion_Object_Data *sd = data;
 
-   eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
+   efl_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
    _eio_save_xattr_cleanup(sd, handler);
 }
 #endif
@@ -1419,9 +1419,9 @@ emotion_object_last_position_save(Evas_Object *obj)
                                               sd);
 #else
    if (eina_xattr_double_set(tmp, "user.e.time_seek", emotion_object_position_get(obj), 0))
-     eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
+     efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
    else
-     eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
+     efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
 
 #endif
 }
@@ -1483,7 +1483,7 @@ _emotion_frame_anim(void *data)
    _emotion_video_pos_update(obj,
                              emotion_engine_instance_pos_get(sd->engine_instance),
                              emotion_engine_instance_len_get(sd->engine_instance));
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
    return EINA_FALSE;
 }
 
@@ -1507,8 +1507,8 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len)
    if (len != sd->len) nlen = 1;
    sd->pos = pos;
    sd->len = len;
-   if (npos) eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL);
-   if (nlen) eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL);
+   if (npos) efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL);
+   if (nlen) efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL);
 }
 
 EAPI void
@@ -1537,7 +1537,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio)
    if (changed)
      {
         evas_object_size_hint_request_set(obj, w, h);
-        eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL);
+        efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL);
         evas_object_geometry_get(obj, NULL, NULL, &w, &h);
         _emotion_object_aspect_border_apply(obj, sd, w, h);
      }
@@ -1561,7 +1561,7 @@ _emotion_decode_stop(Evas_Object *obj)
    if (sd->play)
      {
         sd->play = 0;
-        eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL);
+        efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL);
      }
 }
 
@@ -1577,26 +1577,26 @@ _emotion_open_done(Evas_Object *obj)
      emotion_object_position_set(obj, sd->remember_jump);
    if (sd->remember_play != sd->play)
      emotion_object_play_set(obj, sd->remember_play);
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL);
 
 }
 
 EAPI void
 _emotion_playback_started(Evas_Object *obj)
 {
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL);
 }
 
 EAPI void
 _emotion_playback_finished(Evas_Object *obj)
 {
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL);
 }
 
 EAPI void
 _emotion_audio_level_change(Evas_Object *obj)
 {
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL);
 }
 
 EAPI void
@@ -1605,7 +1605,7 @@ _emotion_channels_change(Evas_Object *obj)
    Emotion_Object_Data *sd;
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL);
 }
 
 EAPI void
@@ -1615,7 +1615,7 @@ _emotion_title_set(Evas_Object *obj, char *title)
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    eina_stringshare_replace(&sd->title, title);
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL);
 
 }
 
@@ -1627,7 +1627,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double st)
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    eina_stringshare_replace(&sd->progress.info, info);
    sd->progress.stat = st;
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL);
 }
 
 EAPI void
@@ -1638,7 +1638,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num)
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    eina_stringshare_replace(&sd->ref.file, file);
    sd->ref.num = num;
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL);
 }
 
 EAPI void
@@ -1648,7 +1648,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num)
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    sd->spu.button_num = num;
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL);
 }
 
 EAPI void
@@ -1658,7 +1658,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    sd->spu.button = button;
-   eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL);
+   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL);
 }
 
 EAPI void
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 33406df0c0..112cd3103f 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -801,7 +801,7 @@ eo_class_get(const Eo *eo_id)
    if (_eo_is_a_class(eo_id))
      {
         EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, NULL);
-        return EO_CLASS_CLASS;
+        return EFL_CLASS_CLASS;
      }
 
    EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL);
@@ -1765,8 +1765,8 @@ eo_init(void)
                    EINA_LOG_STATE_STOP,
                    EINA_LOG_STATE_INIT);
 
-   /* bootstrap EO_CLASS_CLASS */
-   (void) EO_CLASS_CLASS;
+   /* bootstrap EFL_CLASS_CLASS */
+   (void) EFL_CLASS_CLASS;
 
    return EINA_TRUE;
 }
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 4b2d4d1163..4fad6b5860 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -58,7 +58,7 @@ extern int _eo_log_dom;
 #define DBG(...) EINA_LOG_DOM_DBG(_eo_log_dom, __VA_ARGS__)
 
 typedef uintptr_t Eo_Id;
-typedef struct _Efl_Class _Eo_Class;
+typedef struct _Efl_Class _Efl_Class;
 typedef struct _Eo_Header Eo_Header;
 
 /* Retrieves the pointer to the object from the id */
@@ -200,7 +200,7 @@ Eo *_eo_header_id_get(const Eo_Header *header)
 }
 
 static inline
-Efl_Class *_eo_class_id_get(const _Eo_Class *klass)
+Efl_Class *_eo_class_id_get(const _Efl_Class *klass)
 {
    return _eo_header_id_get((Eo_Header *) klass);
 }
@@ -260,7 +260,7 @@ _obj_is_override(_Eo_Object *obj)
 static inline void
 _eo_free(_Eo_Object *obj)
 {
-   _Efl_Class *klass = (_Eo_Class*) obj->klass;
+   _Efl_Class *klass = (_Efl_Class*) obj->klass;
 
 #ifdef EO_DEBUG
    if (obj->datarefcount)
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 59eb0f6032..06822d4db6 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -1279,7 +1279,7 @@ EAPI Eina_Bool eolian_class_ctor_enable_get(const Eolian_Class *klass);
 EAPI Eina_Bool eolian_class_dtor_enable_get(const Eolian_Class *klass);
 
 /*
- * @brief Returns the name of the C function used to get the Eo_Class pointer.
+ * @brief Returns the name of the C function used to get the Efl_Class pointer.
  *
  * @param[in] klass the class.
  * @return a stringshare containing the func name or NULL on error.
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index a3a4d4d7f6..5a55b01ab4 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -80,7 +80,7 @@ static const char * const ctypes[] =
 
    "void *",
 
-   "Eo_Event_Cb",
+   "Efl_Event_Cb",
 };
 
 #undef KW
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 8efee9cf92..b55d7b2955 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -90,7 +90,7 @@ EAPI extern Evas_Version * evas_version;
  */
 // Support not having eo available
 #ifdef EFL_BETA_API_SUPPORT
-typedef Eo_Callback_Priority Evas_Callback_Priority;
+typedef Efl_Callback_Priority Evas_Callback_Priority;
 #else
 typedef short Evas_Callback_Priority;
 #endif
@@ -2834,7 +2834,7 @@ EAPI int                               evas_smart_usage_get(const Evas_Smart *s)
  *
  * @ingroup Evas_Smart_Object_Group
  */
-EAPI void evas_smart_legacy_type_register(const char *type, const Eo_Class *klass) EINA_ARG_NONNULL(1, 2);
+EAPI void evas_smart_legacy_type_register(const char *type, const Efl_Class *klass) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @}
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
index 200973b487..d9ef560e58 100644
--- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
@@ -1,4 +1,4 @@
-mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base)
+mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object)
 {
    [[Evas internal implementation of filters.]]
 
@@ -60,8 +60,8 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Gfx.Filter.filter_program.set;
       Efl.Gfx.Filter.filter_program.get;
       Efl.Gfx.Filter.filter_state.get;
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 1dfcf59728..da076a392e 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -72,7 +72,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
            canvas objects.
 
            This returns the list of "smart" children. This might be different
-           from both the $Eo.Base children list as well as the $Efl.Container
+           from both the $Efl.Object children list as well as the $Efl.Container
            content list.
          ]]
          return: free(own(iterator<Efl.Gfx>), eina_iterator_free);
@@ -183,7 +183,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
    implements {
       class.constructor;
       class.destructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Object.paragraph_direction.set;
       Efl.Canvas.Object.paragraph_direction.get;
    }
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index d492cf1a95..adfbb9938f 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -623,7 +623,7 @@ _image_pixels_set(Evas_Object_Protected_Data *obj,
      }
    if (o->file_obj)
      {
-        eo_del(o->file_obj);
+        efl_del(o->file_obj);
         o->file_obj = NULL;
      }
 
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 4d2676bc24..18ed92ede7 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -6,10 +6,10 @@ abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Interna
 {
    data: Evas_Image_Data;
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
-      Eo.Base.finalize;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
+      Efl.Object.finalize;
       Efl.File.save;
       Efl.Orientation.orientation.get;
       Efl.Orientation.orientation.set;
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 61a5ecdd62..61da55f63f 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,7 +1,7 @@
 import evas_types;
 import efl_text_types;
 
-abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
+abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
                             Efl.Input.Interface, Efl.Gfx.Size.Hint,
                             Efl.Gfx.Map)
 {
@@ -391,7 +391,7 @@ abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       @property render_parent @protected {
          [[Gets the parent smart object of a given Evas object, if it has one.
 
-           This can be different from @Eo.Base.parent because this one is
+           This can be different from @Efl.Object.parent because this one is
            used internally for rendering and the normal parent is what the
            user expects to be the parent.
 
@@ -552,10 +552,10 @@ abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       .type;
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
-      Eo.Base.provider_find;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
+      Efl.Object.provider_find;
       Efl.Gfx.visible.set;
       Efl.Gfx.visible.get;
       Efl.Gfx.color.set;
diff --git a/src/lib/evas/canvas/efl_canvas_polygon.eo b/src/lib/evas/canvas/efl_canvas_polygon.eo
index 41cb74e4c9..41f5d872c8 100644
--- a/src/lib/evas/canvas/efl_canvas_polygon.eo
+++ b/src/lib/evas/canvas/efl_canvas_polygon.eo
@@ -15,8 +15,8 @@ class Efl.Canvas.Polygon (Efl.Canvas.Object)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 
 }
diff --git a/src/lib/evas/canvas/efl_canvas_rectangle.eo b/src/lib/evas/canvas/efl_canvas_rectangle.eo
index 3e8e81ae55..a6899d8883 100644
--- a/src/lib/evas/canvas/efl_canvas_rectangle.eo
+++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo
@@ -1,6 +1,6 @@
 class Efl.Canvas.Rectangle (Efl.Canvas.Object)
 {
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c
index aa877c37c0..9aae7999f6 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.c
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.c
@@ -4,11 +4,11 @@
 #define MY_CLASS EFL_CANVAS_SNAPSHOT_CLASS
 
 EOLIAN static Eo *
-_efl_canvas_snapshot_eo_base_constructor(Eo *eo_obj, void *pd EINA_UNUSED)
+_efl_canvas_snapshot_efl_object_constructor(Eo *eo_obj, void *pd EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
    if (!eo_obj) return NULL;
 
    efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE);
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo
index b9f5c104e0..e370581685 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.eo
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.eo
@@ -8,6 +8,6 @@ class Efl.Canvas.Snapshot (Efl.Canvas.Image.Internal)
    ]]
    data: null;
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface.c b/src/lib/evas/canvas/efl_canvas_surface.c
index 7f52945565..13c86f0c6a 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.c
+++ b/src/lib/evas/canvas/efl_canvas_surface.c
@@ -3,9 +3,9 @@
 #define MY_CLASS EFL_CANVAS_SURFACE_MIXIN
 
 EOLIAN static Eo *
-_efl_canvas_surface_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd)
+_efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd)
 {
-   eo = eo_constructor(eo_super(eo, MY_CLASS));
+   eo = efl_constructor(eo_super(eo, MY_CLASS));
    pd->surf.version = EVAS_NATIVE_SURFACE_VERSION;
    return eo;
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo
index b973c048c0..d05bd6bbcf 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface.eo
@@ -1,4 +1,4 @@
-mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal)
+mixin Efl.Canvas.Surface (Efl.Interface, Efl.Canvas.Image.Internal)
 {
    [[Native surfaces usually bound to an externally-managed buffer.
 
@@ -27,6 +27,6 @@ mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
index 9a9fd54198..116aad03ab 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
@@ -8,11 +8,11 @@ typedef struct _Efl_Canvas_Surface_Tbm_Data
 } Efl_Canvas_Surface_Tbm_Data;
 
 EOLIAN static Eo *
-_efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd)
+_efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = eo_constructor(eo_super(eo, MY_CLASS));
+   eo = efl_constructor(eo_super(eo, MY_CLASS));
    obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
@@ -28,7 +28,7 @@ _efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data
 }
 
 EOLIAN static void
-_efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd)
+_efl_canvas_surface_tbm_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
@@ -36,7 +36,7 @@ _efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM);
    eo_data_unref(eo, pd->base);
-   eo_destructor(eo);
+   efl_destructor(eo);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
index 0a9cd1de45..7eb3d4d074 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
@@ -1,10 +1,10 @@
-class Efl.Canvas.Surface.Tbm (Eo.Base, Efl.Canvas.Surface)
+class Efl.Canvas.Surface.Tbm (Efl.Object, Efl.Canvas.Surface)
 {
    [[Native Tizen Buffer Manager surface for Efl canvas]]
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Surface.native_buffer.set;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
index d93f439152..f15e969d1b 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
@@ -8,11 +8,11 @@ typedef struct _Efl_Canvas_Surface_Wayland_Data
 } Efl_Canvas_Surface_Wayland_Data;
 
 EOLIAN static Eo *
-_efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd)
+_efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = eo_constructor(eo_super(eo, MY_CLASS));
+   eo = efl_constructor(eo_super(eo, MY_CLASS));
    obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
@@ -28,7 +28,7 @@ _efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayla
 }
 
 EOLIAN static void
-_efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd)
+_efl_canvas_surface_wayland_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
@@ -36,7 +36,7 @@ _efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Waylan
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL);
    eo_data_unref(eo, pd->base);
-   eo_destructor(eo);
+   efl_destructor(eo);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
index b68925833a..b3bf4f51cb 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
@@ -1,10 +1,10 @@
-class Efl.Canvas.Surface.Wayland (Eo.Base, Efl.Canvas.Surface)
+class Efl.Canvas.Surface.Wayland (Efl.Object, Efl.Canvas.Surface)
 {
    [[Native Wayland surface for Efl canvas]]
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Surface.native_buffer.set;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c
index 3c01a2d823..c463a157d8 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c
@@ -9,11 +9,11 @@ typedef struct _Efl_Canvas_Surface_X11_Data
 } Efl_Canvas_Surface_X11_Data;
 
 EOLIAN static Eo *
-_efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd)
+_efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = eo_constructor(eo_super(eo, MY_CLASS));
+   eo = efl_constructor(eo_super(eo, MY_CLASS));
    obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
@@ -30,7 +30,7 @@ _efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data
 }
 
 EOLIAN static void
-_efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd)
+_efl_canvas_surface_x11_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
@@ -38,7 +38,7 @@ _efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11);
    eo_data_unref(eo, pd->base);
-   eo_destructor(eo);
+   efl_destructor(eo);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index c5ed11e3cf..892a3c5615 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -5,7 +5,7 @@ struct Efl.Canvas.Surface.X11_Pixmap
    pixmap: ulong;  [[X11 Pixmap ID.]]
 }
 
-class Efl.Canvas.Surface.X11 (Eo.Base, Efl.Canvas.Surface)
+class Efl.Canvas.Surface.X11 (Efl.Object, Efl.Canvas.Surface)
 {
    [[Native X11 surface for Efl canvas]]
 
@@ -21,8 +21,8 @@ class Efl.Canvas.Surface.X11 (Eo.Base, Efl.Canvas.Surface)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Canvas.Surface.native_buffer.set;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index a3675e93bc..78dc931aff 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -295,9 +295,9 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
       Efl.Canvas.Object.paragraph_direction.set;
       Efl.Canvas.Object.paragraph_direction.get;
       Efl.Text.text.set;
diff --git a/src/lib/evas/canvas/efl_canvas_text_cursor.eo b/src/lib/evas/canvas/efl_canvas_text_cursor.eo
index dcdb1369d6..a13061666e 100644
--- a/src/lib/evas/canvas/efl_canvas_text_cursor.eo
+++ b/src/lib/evas/canvas/efl_canvas_text_cursor.eo
@@ -4,7 +4,7 @@ enum Efl.Canvas.Text.Cursor.Type
    under
 }
 
-class Efl.Canvas.Text.Cursor (Eo.Base)
+class Efl.Canvas.Text.Cursor (Efl.Object)
 {
    legacy_prefix: evas_textblock_cursor;
    methods {
@@ -200,8 +200,8 @@ class Efl.Canvas.Text.Cursor (Eo.Base)
       }
    }
    implements {
-      Eo.Base.destructor;
-      Eo.Base.finalize;
+      Efl.Object.destructor;
+      Efl.Object.finalize;
    }
    events {
       changed; [[The cursor position has changed]]
diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c
index 700d486834..95a4ae7fc0 100644
--- a/src/lib/evas/canvas/efl_event_hold.c
+++ b/src/lib/evas/canvas/efl_event_hold.c
@@ -61,16 +61,16 @@ _efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_H
 }
 
 EOLIAN static Eo *
-_efl_event_hold_eo_base_constructor(Eo *obj, Efl_Event_Hold_Data *pd)
+_efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    pd->eo = obj;
    return obj;
 }
 
 EOLIAN static Efl_Event *
 _efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED,
-                                       Eo_Base *owner, void **priv)
+                                       Efl_Object *owner, void **priv)
 {
    // TODO: Implement a cache. Depends only on how many hold events we trigger.
    Efl_Event *evt = eo_add(MY_CLASS, owner);
@@ -89,7 +89,7 @@ EOLIAN static Efl_Event *
 _efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd)
 {
    Efl_Event_Hold_Data *ev;
-   Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, eo_parent_get(obj));
+   Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
    ev = eo_data_scope_get(evt, MY_CLASS);
    if (ev)
      {
diff --git a/src/lib/evas/canvas/efl_event_hold.eo b/src/lib/evas/canvas/efl_event_hold.eo
index 07e8fcf50f..ddc4c3ced5 100644
--- a/src/lib/evas/canvas/efl_event_hold.eo
+++ b/src/lib/evas/canvas/efl_event_hold.eo
@@ -1,4 +1,4 @@
-class Efl.Event.Hold (Eo.Base, Efl.Event.Input)
+class Efl.Event.Hold (Efl.Object, Efl.Event.Input)
 {
    [[Event data sent when inputs are put on hold or resumed.]]
    methods {
@@ -10,7 +10,7 @@ class Efl.Event.Hold (Eo.Base, Efl.Event.Input)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Event.instance_get;
       Efl.Event.reset;
       Efl.Event.dup;
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c
index bce7c7cbf8..7729432167 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_event_key.c
@@ -18,17 +18,17 @@ _del_hook(Eo *evt)
 {
    if (!s_cached_event)
      {
-        if (eo_parent_get(evt))
+        if (efl_parent_get(evt))
           {
              eo_ref(evt);
-             eo_parent_set(evt, NULL);
+             efl_parent_set(evt, NULL);
           }
         s_cached_event = evt;
      }
    else
      {
-        eo_del_intercept_set(evt, NULL);
-        eo_del(evt);
+        efl_del_intercept_set(evt, NULL);
+        efl_del(evt);
      }
 }
 
@@ -44,12 +44,12 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
         evt = s_cached_event;
         s_cached_event = NULL;
         efl_event_reset(evt);
-        eo_parent_set(evt, owner);
+        efl_parent_set(evt, owner);
      }
    else
      {
         evt = eo_add(EFL_EVENT_KEY_CLASS, owner);
-        eo_del_intercept_set(evt, _del_hook);
+        efl_del_intercept_set(evt, _del_hook);
      }
 
    ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
@@ -60,18 +60,18 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
 }
 
 EOLIAN static void
-_efl_event_key_class_destructor(Eo_Class *klass EINA_UNUSED)
+_efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED)
 {
    // this is a strange situation...
-   eo_del_intercept_set(s_cached_event, NULL);
-   eo_del(s_cached_event);
+   efl_del_intercept_set(s_cached_event, NULL);
+   efl_del(s_cached_event);
    s_cached_event = NULL;
 }
 
-EOLIAN static Eo_Base *
-_efl_event_key_eo_base_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED)
+EOLIAN static Efl_Object *
+_efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_event_reset(obj);
    return obj;
 }
diff --git a/src/lib/evas/canvas/efl_event_key.eo b/src/lib/evas/canvas/efl_event_key.eo
index 897dd4668f..555aadb018 100644
--- a/src/lib/evas/canvas/efl_event_key.eo
+++ b/src/lib/evas/canvas/efl_event_key.eo
@@ -1,4 +1,4 @@
-class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
+class Efl.Event.Key (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input)
 {
    [[Represents a single key event from a keyboard or similar device.
 
@@ -53,7 +53,7 @@ class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
    }
    implements {
       class.destructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Event.instance_get;
       Efl.Event.reset;
       Efl.Event.dup;
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 637f19f8e4..8bd45c42a8 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -29,17 +29,17 @@ _del_hook(Eo *evt)
 {
    if (!s_cached_event)
      {
-        if (eo_parent_get(evt))
+        if (efl_parent_get(evt))
           {
              eo_ref(evt);
-             eo_parent_set(evt, NULL);
+             efl_parent_set(evt, NULL);
           }
         s_cached_event = evt;
      }
    else
      {
-        eo_del_intercept_set(evt, NULL);
-        eo_del(evt);
+        efl_del_intercept_set(evt, NULL);
+        efl_del(evt);
      }
 }
 
@@ -55,12 +55,12 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
         evt = s_cached_event;
         s_cached_event = NULL;
         efl_event_reset(evt);
-        eo_parent_set(evt, owner);
+        efl_parent_set(evt, owner);
      }
    else
      {
         evt = eo_add(EFL_EVENT_POINTER_CLASS, owner);
-        eo_del_intercept_set(evt, _del_hook);
+        efl_del_intercept_set(evt, _del_hook);
      }
 
    ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
@@ -71,18 +71,18 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
 }
 
 EOLIAN static void
-_efl_event_pointer_class_destructor(Eo_Class *klass EINA_UNUSED)
+_efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
 {
    // this is a strange situation...
-   eo_del_intercept_set(s_cached_event, NULL);
-   eo_del(s_cached_event);
+   efl_del_intercept_set(s_cached_event, NULL);
+   efl_del(s_cached_event);
    s_cached_event = NULL;
 }
 
-EOLIAN static Eo_Base *
-_efl_event_pointer_eo_base_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
+EOLIAN static Efl_Object *
+_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
 {
-   eo_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(eo_super(obj, MY_CLASS));
    efl_event_reset(obj);
    return obj;
 }
diff --git a/src/lib/evas/canvas/efl_event_pointer.eo b/src/lib/evas/canvas/efl_event_pointer.eo
index 1fbac08142..09fb1ba995 100644
--- a/src/lib/evas/canvas/efl_event_pointer.eo
+++ b/src/lib/evas/canvas/efl_event_pointer.eo
@@ -1,7 +1,7 @@
 import efl_orientation;
 import efl_event_types;
 
-class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
+class Efl.Event.Pointer (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input)
 {
    [[Event data carried over with any pointer event (mouse, touch, ...)
 
@@ -88,7 +88,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
            propagation or repetition of the event.
          ]]
          values {
-            src: Eo.Base; [[Source object: $Efl.Gfx]]
+            src: Efl.Object; [[Source object: $Efl.Gfx]]
          }
       }
       @property button_flags {
@@ -127,7 +127,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       class.destructor;
       Efl.Event.instance_get;
       Efl.Event.reset;
diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo
index 22703617b3..80d2d6f8af 100644
--- a/src/lib/evas/canvas/efl_gfx_map.eo
+++ b/src/lib/evas/canvas/efl_gfx_map.eo
@@ -1,4 +1,4 @@
-mixin Efl.Gfx.Map (Eo.Interface, Eo.Base)
+mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
 {
    [[Texture UV mapping for all objects (rotation, perspective, 3d, ...).
 
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index 647f86aaf7..3a776e5d3e 100644
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
+abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack)
 {
    eo_prefix: efl_vg;
    legacy_prefix: evas_vg_node;
@@ -106,9 +106,9 @@ abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
       }
    }
    implements {
-      Eo.Base.parent.set;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.parent.set;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.Gfx.visible.set;
       Efl.Gfx.visible.get;
       Efl.Gfx.color.set;
diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo
index 0b0541e6a0..931367afd6 100644
--- a/src/lib/evas/canvas/efl_vg_container.eo
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -13,8 +13,8 @@ class Efl.VG.Container (Efl.VG)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
       Efl.VG.dup;
diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
index a29ac26242..89a7ac6424 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
@@ -9,7 +9,7 @@ class Efl.VG.Gradient.Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear)
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
       Efl.VG.dup;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
index 19ead03eaa..88706d334c 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
@@ -11,7 +11,7 @@ class Efl.VG.Gradient.Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial)
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
       Efl.VG.dup;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/evas/canvas/efl_vg_root_node.eo b/src/lib/evas/canvas/efl_vg_root_node.eo
index 685bf7e134..3855571f0e 100644
--- a/src/lib/evas/canvas/efl_vg_root_node.eo
+++ b/src/lib/evas/canvas/efl_vg_root_node.eo
@@ -2,7 +2,7 @@ class Efl.VG.Root_Node (Efl.VG.Container)
 {
    legacy_prefix: evas_vg_root_node;
    implements {
-      Eo.Base.parent.set;
-      Eo.Base.constructor;
+      Efl.Object.parent.set;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index b8894d34e9..7b74d365dd 100644
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -36,7 +36,7 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape)
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
       Efl.VG.dup;
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 7213736f64..26b04c39d7 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -656,7 +656,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 14e303fc31..82b810518d 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -17,15 +17,15 @@ extern Eina_Hash* signals_hash_table;
  * Evas events descriptions for Eo.
  */
 #define DEFINE_EVAS_CALLBACKS(LAST, ...)                                 \
-  static const Eo_Event_Description *_legacy_evas_callback_table(unsigned int index) \
+  static const Efl_Event_Description *_legacy_evas_callback_table(unsigned int index) \
   {                                                                     \
-     static const Eo_Event_Description *internals[LAST] = { NULL };       \
+     static const Efl_Event_Description *internals[LAST] = { NULL };       \
                                                                         \
      if (internals[0] == NULL)                                          \
        {                                                                \
           memcpy(internals,                                             \
-                 ((const Eo_Event_Description*[]) { __VA_ARGS__ }),            \
-                 sizeof ((const Eo_Event_Description *[]) { __VA_ARGS__ }));    \
+                 ((const Efl_Event_Description*[]) { __VA_ARGS__ }),            \
+                 sizeof ((const Efl_Event_Description *[]) { __VA_ARGS__ }));    \
        }                                                                \
      return internals[index];                                           \
   }
@@ -145,7 +145,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
    if (!obj->callbacks) return;
    EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info)
      {
-        eo_event_callback_del(eo_obj, _legacy_evas_callback_table(info->type), _eo_evas_object_cb, info);
+        efl_event_callback_del(eo_obj, _legacy_evas_callback_table(info->type), _eo_evas_object_cb, info);
 
         obj->callbacks =
            eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -171,7 +171,7 @@ evas_event_callback_all_del(Evas *eo_e)
 
    EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info)
      {
-        eo_event_callback_del(eo_e, _legacy_evas_callback_table(info->type), _eo_evas_cb, info);
+        efl_event_callback_del(eo_e, _legacy_evas_callback_table(info->type), _eo_evas_cb, info);
 
         e->callbacks =
            eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
@@ -188,13 +188,13 @@ evas_event_callback_cleanup(Evas *eo_e)
 void
 evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
 {
-   eo_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info);
+   efl_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info);
 }
 
 void
 evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
                                 Evas_Callback_Type type, void *event_info, int event_id,
-                                const Eo_Event_Description *eo_event_desc, Efl_Event *eo_event_info)
+                                const Efl_Event_Description *efl_event_desc, Efl_Event *efl_event_info)
 {
    /* MEM OK */
    Evas_Button_Flags flags = EVAS_BUTTON_NONE;
@@ -235,9 +235,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
                      ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK);
                 }
               obj->last_mouse_down_counter = e->last_mouse_down_counter;
-              if (eo_event_info)
+              if (efl_event_info)
                 {
-                   efl_event_pointer_button_flags_set(eo_event_info, ev->flags);
+                   efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
                 }
               break;
            }
@@ -252,9 +252,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
                      ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK);
                 }
               obj->last_mouse_up_counter = e->last_mouse_up_counter;
-              if (eo_event_info)
+              if (efl_event_info)
                 {
-                   efl_event_pointer_button_flags_set(eo_event_info, ev->flags);
+                   efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
                 }
               break;
            }
@@ -263,10 +263,10 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
      }
 
    /* legacy callbacks - relying on Efl.Canvas.Object events */
-   eo_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info);
+   efl_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info);
 
    /* new input events */
-   if (eo_event_desc)
+   if (efl_event_desc)
      {
         Efl_Event_Flags *pevflags = NULL;
 
@@ -291,23 +291,23 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
           }
 #undef EV_CASE
 
-        if (pevflags) efl_event_flags_set(eo_event_info, *pevflags);
-        eo_event_callback_call(eo_obj, eo_event_desc, eo_event_info);
+        if (pevflags) efl_event_flags_set(efl_event_info, *pevflags);
+        efl_event_callback_call(eo_obj, efl_event_desc, efl_event_info);
      }
 
    if (type == EVAS_CALLBACK_MOUSE_DOWN)
      {
         Evas_Event_Mouse_Down *ev = event_info;
         ev->flags = flags;
-        if (eo_event_info)
-          efl_event_pointer_button_flags_set(eo_event_info, ev->flags);
+        if (efl_event_info)
+          efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
      }
    else if (type == EVAS_CALLBACK_MOUSE_UP)
      {
         Evas_Event_Mouse_Up *ev = event_info;
         ev->flags = flags;
-        if (eo_event_info)
-          efl_event_pointer_button_flags_set(eo_event_info, ev->flags);
+        if (efl_event_info)
+          efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
      }
 
  nothing_here:
@@ -317,7 +317,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
               (type <= EVAS_CALLBACK_KEY_UP))
           {
              Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
-             evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, eo_event_desc, eo_event_info);
+             evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, efl_event_desc, efl_event_info);
           }
      }
    _evas_unwalk(e);
@@ -347,8 +347,8 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type
    cb_info->data = (void *)data;
    cb_info->type = type;
 
-   const Eo_Event_Description *desc = _legacy_evas_callback_table(type);
-   eo_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info);
+   const Efl_Event_Description *desc = _legacy_evas_callback_table(type);
+   efl_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info);
 
    obj->callbacks =
       eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info));
@@ -374,7 +374,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
         if ((info->func == func) && (info->type == type))
           {
              void *tmp = info->data;
-             eo_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info);
+             efl_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info);
 
              obj->callbacks =
                 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -405,7 +405,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
         if ((info->func == func) && (info->type == type) && info->data == data)
           {
              void *tmp = info->data;
-             eo_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info);
+             efl_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info);
 
              obj->callbacks =
                 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -439,8 +439,8 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
    cb_info->data = (void *)data;
    cb_info->type = type;
 
-   const Eo_Event_Description *desc = _legacy_evas_callback_table(type);
-   eo_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info);
+   const Efl_Event_Description *desc = _legacy_evas_callback_table(type);
+   efl_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info);
 
    e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info));
 }
@@ -465,7 +465,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
         if ((info->func == func) && (info->type == type))
           {
              void *tmp = info->data;
-             eo_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info);
+             efl_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info);
 
              e->callbacks =
                 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
@@ -496,7 +496,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
         if ((info->func == func) && (info->type == type) && (info->data == data))
           {
              void *tmp = info->data;
-             eo_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info);
+             efl_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info);
 
              e->callbacks =
                 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 03a180b39a..ea75d1ec85 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
 import evas_types;
 import efl_event_types;
 
-class Evas.Canvas (Eo.Base, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
+class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
 {
    legacy_prefix: evas;
    data: Evas_Public_Data;
@@ -1190,11 +1190,11 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.event_thaw;
-      Eo.Base.event_freeze;
-      Eo.Base.provider_find;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.event_thaw;
+      Efl.Object.event_freeze;
+      Efl.Object.provider_find;
    }
    events {
       render,flush,pre @beta;
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index d631df6917..ab222e634f 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -63,17 +63,17 @@ evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *
 }
 
 EOLIAN static Eo *
-_evas_canvas3d_camera_eo_base_constructor(Eo *obj,
+_evas_canvas3d_camera_efl_object_constructor(Eo *obj,
                                        Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA);
 
    return obj;
 }
 
 EOLIAN static void
-_evas_canvas3d_camera_eo_base_destructor(Eo *obj,
+_evas_canvas3d_camera_efl_object_destructor(Eo *obj,
                                       Evas_Canvas3D_Camera_Data *pd)
 {
    Eina_Iterator *it = NULL;
@@ -92,7 +92,7 @@ _evas_canvas3d_camera_eo_base_destructor(Eo *obj,
         eina_hash_free(pd->nodes);
      }
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Canvas3D_Camera *
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index 4ac3b0deb9..18d22ae44e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -77,8 +77,8 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object)
    }
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index 11e9c81965..77a7d49d93 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -77,9 +77,9 @@ evas_canvas3d_light_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
+_evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT);
    evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0);
    evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0);
@@ -97,7 +97,7 @@ _evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
 }
 
 EOLIAN static void
-_evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
+_evas_canvas3d_light_efl_object_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
 {
    Eina_Iterator *it = NULL;
    void *data = NULL;
@@ -115,7 +115,7 @@ _evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
         eina_hash_free(pd->nodes);
      }
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo
index 464ab8ee5f..c5458d4ea1 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -248,8 +248,8 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object)
    }
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 5070d44450..150f5eb810 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -89,9 +89,9 @@ evas_canvas3d_material_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
+_evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL);
 
    evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
@@ -104,7 +104,7 @@ _evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_M
 }
 
 EOLIAN static void
-_evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data *pd)
+_evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Data *pd)
 {
    int i = 0;
    Eina_Iterator *it = NULL;
@@ -136,7 +136,7 @@ _evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data
              evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
           }
      }
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo b/src/lib/evas/canvas/evas_canvas3d_material.eo
index 72871fcc00..68cd4927a2 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -116,8 +116,8 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index 9cfc637e17..e59497f9af 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -261,9 +261,9 @@ evas_canvas3d_mesh_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
+_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
    _mesh_init(pd);
 
@@ -271,10 +271,10 @@ _evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 }
 
 EOLIAN static void
-_evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
+_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 {
    _mesh_fini(pd);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index a15edf48f5..8fb7e531c9 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -420,8 +420,8 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
       Efl.File.file.set;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 31963a2473..c4f6eeedf7 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -56,13 +56,13 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
    Eina_List *collision_list = NULL, *l = NULL;
    Evas_Canvas3D_Node *target_node = NULL, *n = NULL;
    Evas_Canvas3D_Node_Data *pd_target = NULL, *pd = NULL;
-   const Eo_Event_Description *eo_desc = NULL;
+   const Efl_Event_Description *eo_desc = NULL;
    Eina_Bool ret = EINA_FALSE;
 
    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");
+   eo_desc = efl_object_legacy_only_event_description_get("collision");
 
    if (collision_list)
      {
@@ -70,14 +70,14 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
           {
              pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
              if (box_intersection_box(&pd_target->aabb, &pd->aabb))
-               ret = eo_event_callback_call(target_node, eo_desc, n);
+               ret = efl_event_callback_call(target_node, eo_desc, n);
           }
         if (!ret)
           {
              /* XXX: Putting it like this because that's how the logic was,
               * but it seems absolutely wrong that it only checks the last
               * and decides based on that. */
-             eo_event_callback_stop(event->object);
+             efl_event_callback_stop(event->object);
           }
      }
 }
@@ -85,11 +85,11 @@ static void
 _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event)
 {
    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->info, eo_desc, event->info);
+   const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked");
+   ret = efl_event_callback_call((Eo *)event->info, eo_desc, event->info);
 
    if (!ret)
-      eo_event_callback_stop(event->object);
+      efl_event_callback_stop(event->object);
 }
 
 static inline Evas_Canvas3D_Node_Mesh *
@@ -205,7 +205,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_register(Eo *obj, Evas_Canvas3
    GET_CALLBACK_TYPE(tcb, event)
 
    if (tcb != PRIVATE_CALLBACK_NONE)
-     eo_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data);
+     efl_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data);
 
 }
 
@@ -218,7 +218,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva
    GET_CALLBACK_TYPE(tcb, event)
 
    if (tcb != PRIVATE_CALLBACK_NONE)
-     eo_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL);
+     efl_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL);
 }
 
 static Eina_Bool
@@ -500,7 +500,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
    Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_List *current;
    Evas_Canvas3D_Node *datanode;
-   const Eo_Event_Description *eo_desc = NULL;
+   const Efl_Event_Description *eo_desc = NULL;
    if (pd->type != EVAS_CANVAS3D_NODE_TYPE_MESH &&
        pd->type != EVAS_CANVAS3D_NODE_TYPE_NODE)
      return EINA_TRUE;
@@ -513,8 +513,8 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
      }
 
    evas_build_sphere(&pd->aabb, &pd->bsphere);
-   eo_desc = eo_base_legacy_only_event_description_get("collision,private");
-   eo_event_callback_call(node, eo_desc, (void *)node);
+   eo_desc = efl_object_legacy_only_event_description_get("collision,private");
+   efl_event_callback_call(node, eo_desc, (void *)node);
 
    return EINA_TRUE;
 }
@@ -538,7 +538,7 @@ _evas_canvas3d_node_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D_No
    evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_ANY_ORDER, EINA_FALSE,
                               _node_billboard_update, NULL);
    /* Update AABB. */
-   if(eo_base_legacy_only_event_description_get("collision,private"))
+   if(efl_object_legacy_only_event_description_get("collision,private"))
    {
       evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE,
               node_aabb_update, NULL);
@@ -1065,11 +1065,11 @@ _evas_canvas3d_node_constructor(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canva
 }
 
 EOLIAN static void
-_evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA_UNUSED)
+_evas_canvas3d_node_efl_object_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA_UNUSED)
 {
    _node_free(obj);
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Evas_Canvas3D_Node_Type
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo
index 2ffcbac3dc..4ecb4122ba 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -382,7 +382,7 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object)
       }
    }
    implements {
-      Eo.Base.destructor;
+      Efl.Object.destructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
       Evas.Canvas3D.Object.callback_register;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
index e868da5e0f..7167217077 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h
+++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
@@ -16,10 +16,10 @@ typedef enum _Evas_Canvas3D_Node_Private_Callback_Type
    PRIVATE_CALLBACK_NONE
 } Evas_Canvas3D_Node_Private_Callback_Type;
 
-const Eo_Event_Description evas_canvas3d_node_private_event_desc[] =
+const Efl_Event_Description evas_canvas3d_node_private_event_desc[] =
 {
-   EO_EVENT_DESCRIPTION("clicked,private"),
-   EO_EVENT_DESCRIPTION("collision,private")
+   EFL_EVENT_DESCRIPTION("clicked,private"),
+   EFL_EVENT_DESCRIPTION("collision,private")
 };
 
 /*Private callbacks */
@@ -28,7 +28,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event);
 static void
 _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event);
 
-Eo_Event_Cb evas_canvas3d_node_private_callback_functions[] =
+Efl_Event_Cb evas_canvas3d_node_private_callback_functions[] =
 {
    _evas_canvas3d_node_private_callback_clicked,
    _evas_canvas3d_node_private_callback_collision,
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index b6b197dc0b..8f9911517b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -4,11 +4,11 @@
 #define MY_CLASS EVAS_CANVAS3D_OBJECT_CLASS
 
 EOLIAN static Eo *
-_evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
+_evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
 {
    Eo *e = NULL;
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   e = eo_parent_get(obj);
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   e = efl_parent_get(obj);
    pd->evas = e;
    pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID;
    memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
@@ -17,11 +17,11 @@ _evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd
 }
 
 EOLIAN static Evas *
- _evas_canvas3d_object_eo_base_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Eo_Class *klass)
+ _evas_canvas3d_object_efl_object_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass)
 {
    if (klass == EVAS_CANVAS_CLASS)
      return pd->evas;
-   return eo_provider_find(eo_super(obj, MY_CLASS), klass);
+   return efl_provider_find(eo_super(obj, MY_CLASS), klass);
 }
 
 EOLIAN static void
@@ -67,29 +67,29 @@ _evas_canvas3d_object_update(Eo *obj, Evas_Canvas3D_Object_Data *pd)
 }
 
 EOLIAN static Eina_Bool
-_evas_canvas3d_object_eo_base_event_callback_priority_add(Eo *obj,
+_evas_canvas3d_object_efl_object_event_callback_priority_add(Eo *obj,
                                                     Evas_Canvas3D_Object_Data *pd EINA_UNUSED,
-                                                    const Eo_Event_Description *desc,
-                                                    Eo_Callback_Priority priority,
-                                                    Eo_Event_Cb func,
+                                                    const Efl_Event_Description *desc,
+                                                    Efl_Callback_Priority priority,
+                                                    Efl_Event_Cb func,
                                                     const void *user_data)
 {
    Eina_Bool r = EINA_FALSE;
 
-   r = eo_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data);
+   r = efl_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data);
    evas_canvas3d_object_callback_register(obj, desc->name, user_data);
 
    return r;
 }
 
 EOLIAN static Eina_Bool
-_evas_canvas3d_object_eo_base_event_callback_del(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED,
-                                           const Eo_Event_Description *desc,
-                                           Eo_Event_Cb func,
+_evas_canvas3d_object_efl_object_event_callback_del(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED,
+                                           const Efl_Event_Description *desc,
+                                           Efl_Event_Cb func,
                                            const void *user_data)
 {
    Eina_Bool r = EINA_FALSE;
-   r = eo_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data);
+   r = efl_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data);
    if (r) evas_canvas3d_object_callback_unregister(obj, desc->name);
    return r;
 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index e4db9c0e3d..204c808c75 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,6 +1,6 @@
 import evas_types;
 
-class Evas.Canvas3D.Object (Eo.Base)
+class Evas.Canvas3D.Object (Efl.Object)
 {
    data: Evas_Canvas3D_Object_Data;
    methods {
@@ -65,10 +65,10 @@ class Evas.Canvas3D.Object (Eo.Base)
    }
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.event_callback_priority_add;
-      Eo.Base.event_callback_del;
-      Eo.Base.provider_find;
+      Efl.Object.constructor;
+      Efl.Object.event_callback_priority_add;
+      Efl.Object.event_callback_del;
+      Efl.Object.provider_find;
    }
    events {
       clicked; [[Clicked Event.]]
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c
index 76dcdd6746..07e63a802d 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.c
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c
@@ -25,9 +25,9 @@ evas_canvas3d_primitive_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
+_evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE);
    _primitive_init(pd);
 
@@ -35,9 +35,9 @@ _evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Da
 }
 
 EOLIAN static void
-_evas_canvas3d_primitive_eo_base_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
+_evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index 005ff55ea4..18e43ff08c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -134,7 +134,7 @@ class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index b67d451f52..4e5cc39b29 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -69,9 +69,9 @@ evas_canvas3d_scene_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_canvas3d_scene_eo_base_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
+_evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE);
    evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0);
    pd->shadows_enabled = EINA_FALSE;
@@ -628,7 +628,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
    Eina_Array *arr = NULL;
    Eina_Bool update_scene = EINA_FALSE;
    Evas_Canvas3D_Node *picked_node = NULL;
-   const Eo_Event_Description *eo_desc = NULL;
+   const Efl_Event_Description *eo_desc = NULL;
 
    pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
    e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
@@ -686,8 +686,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
                             eina_stringshare_del(tmp);
 
                             /*Calling callback clicked*/
-                            eo_desc = eo_base_legacy_only_event_description_get("clicked,private");
-                            eo_event_callback_call(picked_node, eo_desc, picked_node);
+                            eo_desc = efl_object_legacy_only_event_description_get("clicked,private");
+                            efl_event_callback_call(picked_node, eo_desc, picked_node);
 
                             return EINA_TRUE;
                          }
@@ -725,8 +725,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
    if (mesh)  *mesh  = data.mesh;
 
    /*Calling callback clicked*/
-   eo_desc = eo_base_legacy_only_event_description_get("clicked,private");
-   eo_event_callback_call(data.node, eo_desc, data.node);
+   eo_desc = efl_object_legacy_only_event_description_get("clicked,private");
+   efl_event_callback_call(data.node, eo_desc, data.node);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 80762074eb..1bc01f2fed 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -161,7 +161,7 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object)
       }
 }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index abfc79b3cf..d27a803316 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -319,9 +319,9 @@ evas_canvas3d_texture_add(Evas *e)
 
 
 EOLIAN static Eo *
-_evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
+_evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    pd->atlas_enable = EINA_TRUE;
 
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE);
@@ -330,10 +330,10 @@ _evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *
 }
 
 EOLIAN static void
-_evas_canvas3d_texture_eo_base_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd  EINA_UNUSED)
+_evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd  EINA_UNUSED)
 {
    _texture_fini(obj);
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo b/src/lib/evas/canvas/evas_canvas3d_texture.eo
index af187adf67..0ab00befb6 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo
@@ -159,8 +159,8 @@ class Evas.Canvas3D.Texture (Evas.Canvas3D.Object)
    }
 
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
       Evas.Canvas3D.Object.update_notify;
       Evas.Canvas3D.Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 519ece2985..dd26c2887b 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -327,7 +327,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
           state_write->clipper = NULL;
         EINA_COW_STATE_WRITE_END(obj, state_write, cur);
         if (obj->prev->clipper != old_clip)
-          eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj);
+          efl_event_callback_del(old_clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj);
      }
 
    /* image object clipper */
@@ -359,7 +359,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
      state_write->clipper = clip;
    EINA_COW_STATE_WRITE_END(obj, state_write, cur);
    if (obj->prev->clipper != clip)
-     eo_event_callback_add(clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj);
+     efl_event_callback_add(clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj);
 
    clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer);
    clip->clip.clipees = eina_list_append(clip->clip.clipees, obj);
@@ -457,7 +457,7 @@ _efl_canvas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
           state_write->clipper = NULL;
         EINA_COW_STATE_WRITE_END(obj, state_write, cur);
         if (obj->prev->clipper != old_clip)
-          eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj);
+          efl_event_callback_del(old_clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj);
      }
 
    evas_object_update_bounding_box(eo_obj, obj, NULL);
@@ -510,7 +510,7 @@ _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cu
              EINA_COW_STATE_WRITE_END(obj, state_write, prev);
           }
         if (clip != obj->cur->clipper)
-          eo_event_callback_del(clip->object, EO_EVENT_DEL, _clipper_del_cb, obj->object);
+          efl_event_callback_del(clip->object, EFL_EVENT_DEL, _clipper_del_cb, obj->object);
      }
 }
 
diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index b332e1669b..f76fec5868 100644
--- a/src/lib/evas/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
@@ -8,7 +8,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
-   eo_key_data_set(obj, key, data);
+   efl_key_data_set(obj, key, data);
 }
 
 EAPI void *
@@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key)
    return NULL;
    MAGIC_CHECK_END();
    void *data = NULL;
-   data = eo_key_data_get((Evas_Object *)obj, key);
+   data = efl_key_data_get((Evas_Object *)obj, key);
    return data;
 }
 
@@ -29,7 +29,7 @@ evas_object_data_del(Evas_Object *obj, const char *key)
    return NULL;
    MAGIC_CHECK_END();
    void *data = NULL;
-   data = eo_key_data_get(obj, key);
-   eo_key_data_set(obj, key, NULL);
+   data = efl_key_data_get(obj, key);
+   efl_key_data_set(obj, key, NULL);
    return data;
 }
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 0eb5511fa2..a0eb26f0ae 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -49,7 +49,7 @@ evas_device_add(Evas *eo_e)
 
    e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    e->devices = eina_list_append(e->devices, dev);
-   eo_event_callback_add(dev, EO_EVENT_DEL, _del_cb, e);
+   efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
 
    evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev);
 
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 0d3c356729..67d4ed9d0c 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -95,7 +95,7 @@ _efl_event_create(Efl_Event *evt, Evas_Callback_Type type, void *ev,
    return evt;
 }
 
-static inline const Eo_Event_Description *
+static inline const Efl_Event_Description *
 _efl_event_desc_get(Evas_Callback_Type type)
 {
    switch (type)
@@ -1232,7 +1232,7 @@ evas_event_freeze(Evas *eo_e)
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
    MAGIC_CHECK_END();
-   eo_event_freeze(eo_e);
+   efl_event_freeze(eo_e);
 }
 
 EAPI void
@@ -1241,22 +1241,22 @@ evas_event_thaw(Evas *eo_e)
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
    MAGIC_CHECK_END();
-   eo_event_thaw(eo_e);
+   efl_event_thaw(eo_e);
 }
 
 EOLIAN void
-_evas_canvas_eo_base_event_freeze(Eo *eo_e, Evas_Public_Data *e)
+_evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e)
 {
-   eo_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   efl_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS));
    e->is_frozen = EINA_TRUE;
 }
 
 EOLIAN void
-_evas_canvas_eo_base_event_thaw(Eo *eo_e, Evas_Public_Data *e)
+_evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e)
 {
    int fcount = -1;
-   eo_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS));
-   fcount = eo_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   efl_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   fcount = efl_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS));
    if (0 == fcount)
      {
         Evas_Layer *lay;
@@ -1284,7 +1284,7 @@ evas_event_freeze_get(const Evas *eo_e)
    return 0;
    MAGIC_CHECK_END();
    int ret = 0;
-   ret = eo_event_freeze_count_get((Eo *)eo_e);
+   ret = efl_event_freeze_count_get((Eo *)eo_e);
    return ret;
 }
 
@@ -2794,7 +2794,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
                                      unsigned int keycode,
                                      Efl_Event_Key_Data *ke)
 {
-   void *eo_event_info = NULL;
+   void *efl_event_info = NULL;
    Evas_Public_Data *e = _pd;
    int event_id = 0;
 
@@ -2829,7 +2829,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
         ke->event_flags = ev.event_flags;
         ke->modifiers = ev.modifiers;
         ke->locks = ev.locks;
-        eo_event_info = ke->eo;
+        efl_event_info = ke->eo;
      }
 
    if (e->grabs)
@@ -2859,7 +2859,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
                            !evas_event_freezes_through(g->object, object_obj))
                          {
                             EV_CALL(g->object, object_obj, EVAS_CALLBACK_KEY_DOWN,
-                                    &ev, event_id, eo_event_info, NULL);
+                                    &ev, event_id, efl_event_info, NULL);
                          }
                        if (g->exclusive) exclusive = EINA_TRUE;
                     }
@@ -2886,14 +2886,14 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
                }
           }
      }
-   if (!ke) EV_DEL(eo_event_info);
+   if (!ke) EV_DEL(efl_event_info);
    if ((e->focused) && (!exclusive))
      {
         Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS);
         if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
           {
              EV_CALL(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN,
-                     &ev, event_id, eo_event_info, NULL);
+                     &ev, event_id, efl_event_info, NULL);
           }
      }
    _evas_post_event_callback_call(eo_e, e);
@@ -2908,7 +2908,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
         ke->locks = NULL;
      }
    else
-     EV_DEL(eo_event_info);
+     EV_DEL(efl_event_info);
 }
 
 static void
@@ -2923,7 +2923,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
                                    unsigned int keycode,
                                    Efl_Event_Key_Data *ke)
 {
-   void *eo_event_info = NULL;
+   void *efl_event_info = NULL;
    Evas_Public_Data *e = _pd;
    int event_id = 0;
    if (!keyname) return;
@@ -2957,7 +2957,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
         ke->event_flags = ev.event_flags;
         ke->modifiers = ev.modifiers;
         ke->locks = ev.locks;
-        eo_event_info = ke->eo;
+        efl_event_info = ke->eo;
      }
 
    if (e->grabs)
@@ -2987,7 +2987,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
                     {
                        evas_object_event_callback_call
                              (g->object, object_obj, EVAS_CALLBACK_KEY_UP,
-                              &ev, event_id, EFL_EVENT_KEY_UP, eo_event_info);
+                              &ev, event_id, EFL_EVENT_KEY_UP, efl_event_info);
                     }
                   if (g->exclusive) exclusive = EINA_TRUE;
                }
@@ -3022,7 +3022,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
           {
              evas_object_event_callback_call
                    (e->focused, focused_obj, EVAS_CALLBACK_KEY_UP,
-                    &ev, event_id, EFL_EVENT_KEY_UP, eo_event_info);
+                    &ev, event_id, EFL_EVENT_KEY_UP, efl_event_info);
           }
      }
    _evas_post_event_callback_call(eo_e, e);
@@ -3539,11 +3539,11 @@ EO_CALLBACKS_ARRAY_DEFINE(_evas_canvas_event_pointer_callbacks,
 void
 _evas_canvas_event_init(Evas *eo_e, Evas_Public_Data *e)
 {
-   eo_event_callback_array_add(eo_e, _evas_canvas_event_pointer_callbacks(), e);
+   efl_event_callback_array_add(eo_e, _evas_canvas_event_pointer_callbacks(), e);
 }
 
 void
 _evas_canvas_event_shutdown(Evas *eo_e, Evas_Public_Data *e)
 {
-   eo_event_callback_array_del(eo_e, _evas_canvas_event_pointer_callbacks(), e);
+   efl_event_callback_array_del(eo_e, _evas_canvas_event_pointer_callbacks(), e);
 }
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 46ab76594a..1796bc5cbc 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -265,7 +265,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                     {
                        // Post render callback is not required anymore
                        Evas *e = obj->layer->evas->evas;
-                       eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
+                       efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
                        pd->has_cb = EINA_FALSE;
                     }
 
@@ -325,7 +325,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
         if (do_async && !pd->has_cb)
           {
              Evas *e = obj->layer->evas->evas;
-             eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
+             efl_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
              pd->has_cb = EINA_TRUE;
           }
         evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj);
@@ -580,12 +580,12 @@ _efl_canvas_filter_internal_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filt
      }
 }
 
-EOLIAN static Eo_Base *
-_efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
+EOLIAN static Efl_Object *
+_efl_canvas_filter_internal_efl_object_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
 {
    Eo *obj = NULL;
 
-   obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
    pd->data = eina_cow_alloc(evas_object_filter_cow);
    SLKI(pd->lck);
 
@@ -593,7 +593,7 @@ _efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd
 }
 
 EOLIAN static void
-_efl_canvas_filter_internal_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
+_efl_canvas_filter_internal_efl_object_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Filter_Data_Binding *db;
@@ -626,11 +626,11 @@ finish:
    if (pd->has_cb)
      {
         Evas *e = obj->layer->evas->evas;
-        eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
+        efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
      }
    SLKD(pd->lck);
 
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 71979157b0..f8c0f2485c 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -135,6 +135,6 @@ class Evas.Grid (Efl.Canvas.Group.Clipped)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 9134a8f220..8c3abf1e09 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -595,7 +595,7 @@ evas_object_image_data_set(Eo *eo_obj, void *data)
         o->engine_data = NULL;
         if (o->file_obj)
           {
-             eo_del(o->file_obj);
+             efl_del(o->file_obj);
              o->file_obj = NULL;
           }
      }
@@ -679,7 +679,7 @@ evas_object_image_data_copy_set(Eo *eo_obj, void *data)
      ENFN->image_free(ENDT, o->engine_data);
    if (o->file_obj)
      {
-        eo_del(o->file_obj);
+        efl_del(o->file_obj);
         o->file_obj = NULL;
      }
    o->engine_data = ENFN->image_new_from_copied_data(ENDT,
diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo
index 3988b5a451..90a4b3f8fe 100644
--- a/src/lib/evas/canvas/evas_line.eo
+++ b/src/lib/evas/canvas/evas_line.eo
@@ -27,7 +27,7 @@ class Evas.Line (Efl.Canvas.Object)
       }
    }
    implements {
-      Eo.Base.constructor;
+      Efl.Object.constructor;
    }
 
 }
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 44959b3f9c..e0aa03a39b 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -169,9 +169,9 @@ evas_new(void)
 }
 
 EOLIAN static Eo *
-_evas_canvas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e)
+_evas_canvas_efl_object_constructor(Eo *eo_obj, Evas_Public_Data *e)
 {
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    e->evas = eo_obj;
    e->output.render_method = RENDER_METHOD_INVALID;
@@ -224,7 +224,7 @@ evas_free(Evas *eo_e)
 }
 
 EOLIAN static void
-_evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
+_evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e)
 {
    Eina_Rectangle *r;
    Evas_Coord_Touch_Point *touch_point;
@@ -279,7 +279,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
                   ___eo_ref2_reset(eo_obj);
                   while (eo_ref_get(eo_obj) > 1) eo_unref(eo_obj);
                   while (eo_ref_get(eo_obj) < 1) eo_ref(eo_obj);
-                  eo_del(eo_obj);
+                  efl_del(eo_obj);
                }
           }
      }
@@ -350,7 +350,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
    eina_spinlock_free(&(e->render.lock));
 
    e->magic = 0;
-   eo_destructor(eo_super(eo_e, MY_CLASS));
+   efl_destructor(eo_super(eo_e, MY_CLASS));
 }
 
 EOLIAN static Evas_Engine_Info*
@@ -608,12 +608,12 @@ evas_data_argb_unpremul(unsigned int *data, unsigned int len)
 }
 
 EOLIAN static Eo *
-_evas_canvas_eo_base_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
-                                   const Eo_Class *klass)
+_evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
+                                   const Efl_Class *klass)
 {
    if (klass == EVAS_CANVAS_CLASS)
      return eo_e;
-   return eo_provider_find(eo_super(eo_e, MY_CLASS), klass);
+   return efl_provider_find(eo_super(eo_e, MY_CLASS), klass);
 }
 
 Ector_Surface *
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index f39471ee62..d6c8eb96cf 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -163,14 +163,14 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
 
 EO_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
   { EFL_GFX_EVENT_RESIZE, _on_child_resize },
-  { EO_EVENT_DEL, _on_child_del },
+  { EFL_EVENT_DEL, _on_child_del },
   { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
 );
 
 static void
 _evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent)
 {
-   eo_event_callback_array_del(obj, evas_object_box_callbacks(), parent);
+   efl_event_callback_array_del(obj, evas_object_box_callbacks(), parent);
 }
 
 static Evas_Object_Box_Option *
@@ -178,7 +178,7 @@ _evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data
 {
    Evas_Object *obj = opt->obj;
 
-   eo_event_callback_array_add(obj, evas_object_box_callbacks(), o);
+   efl_event_callback_array_add(obj, evas_object_box_callbacks(), o);
 
    return opt;
 }
@@ -214,7 +214,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
 
    priv->children = eina_list_append(priv->children, opt);
    priv->children_changed = EINA_TRUE;
-   eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
+   efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
 
    return opt;
 }
@@ -230,7 +230,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child
 
    priv->children = eina_list_prepend(priv->children, opt);
    priv->children_changed = EINA_TRUE;
-   eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
+   efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
 
    return opt;
 }
@@ -254,7 +254,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object
              priv->children = eina_list_prepend_relative
                 (priv->children, new_opt, opt);
              priv->children_changed = EINA_TRUE;
-             eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
              return new_opt;
           }
      }
@@ -281,7 +281,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *
              priv->children = eina_list_append_relative
                 (priv->children, new_opt, opt);
              priv->children_changed = EINA_TRUE;
-             eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
              return new_opt;
           }
      }
@@ -304,7 +304,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
 
         priv->children = eina_list_prepend(priv->children, new_opt);
         priv->children_changed = EINA_TRUE;
-        eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+        efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
         return new_opt;
      }
 
@@ -323,7 +323,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
              priv->children = eina_list_prepend_relative
                 (priv->children, new_opt, opt);
              priv->children_changed = EINA_TRUE;
-             eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
              return new_opt;
           }
      }
@@ -345,7 +345,7 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
              priv->children = eina_list_remove(priv->children, opt);
              evas_obj_box_internal_option_free(o, opt);
              priv->children_changed = EINA_TRUE;
-             eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
+             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
 
              return obj;
           }
@@ -373,7 +373,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos
    priv->children = eina_list_remove_list(priv->children, node);
    evas_obj_box_internal_option_free(o, opt);
    priv->children_changed = EINA_TRUE;
-   eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
+   efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
    return obj;
 }
 
@@ -464,9 +464,9 @@ evas_object_box_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
+_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_object_smart_callbacks_descriptions_set(obj, _signals);
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
@@ -1972,7 +1972,7 @@ _evas_box_option_property_vget(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_p
 }
 
 EOLIAN static void
-_evas_box_class_constructor(Eo_Class *klass)
+_evas_box_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index f656857b73..2077e21f63 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -270,9 +270,9 @@ evas_object_grid_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_evas_grid_eo_base_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
+_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
 
    return obj;
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 1eb8e9fb9e..98989eecfc 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -169,12 +169,12 @@ _init_cow(void)
 }
 
 EOLIAN static Eo *
-_efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
+_efl_canvas_image_internal_efl_object_constructor(Eo *eo_obj, Evas_Image_Data *o)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Colorspace cspace;
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    evas_object_image_init(eo_obj);
 
@@ -199,11 +199,11 @@ _efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
 }
 
 EOLIAN static Eo *
-_efl_canvas_image_internal_eo_base_finalize(Eo *eo_obj, Evas_Image_Data *o)
+_efl_canvas_image_internal_efl_object_finalize(Eo *eo_obj, Evas_Image_Data *o)
 {
    if (!o->filled_set)
      efl_gfx_fill_auto_set(eo_obj, EINA_TRUE);
-   return eo_finalize(eo_super(eo_obj, MY_CLASS));
+   return efl_finalize(eo_super(eo_obj, MY_CLASS));
 }
 
 void
@@ -262,7 +262,7 @@ _evas_image_init_set(const Eina_File *f, const char *file, const char *key,
      }
    if (o->file_obj)
      {
-        eo_del(o->file_obj);
+        efl_del(o->file_obj);
         o->file_obj = NULL;
      }
    o->load_error = EVAS_LOAD_ERROR_NONE;
@@ -463,10 +463,10 @@ _efl_canvas_image_internal_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Evas_Image
 }
 
 EOLIAN static void
-_efl_canvas_image_internal_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *root)
+_efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    const char *file, *key;
    if (o->cur->mmaped_source)
@@ -1371,14 +1371,14 @@ evas_object_image_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_image_internal_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED)
+_efl_canvas_image_internal_efl_object_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (obj->legacy)
      evas_object_image_video_surface_set(eo_obj, NULL);
    evas_object_image_free(eo_obj, obj);
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 void
@@ -1435,7 +1435,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
    o->engine_data = NULL;
    if (o->file_obj)
      {
-        eo_del(o->file_obj);
+        efl_del(o->file_obj);
         o->file_obj = NULL;
      }
    if (o->pixels->pixel_updates)
@@ -3336,7 +3336,7 @@ _evas_object_image_preloading_check(Evas_Object *eo_obj)
 }
 
 Evas_Object *
-_evas_object_image_video_parent_get(Evas_Object *eo_obj)
+_evas_object_image_videfl_parent_get(Evas_Object *eo_obj)
 {
    Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
    return o->video_surface ? o->pixels->video.parent : NULL;
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index a528d08719..3597bd3a6e 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -216,11 +216,11 @@ evas_object_line_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static Eo *
-_evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED)
+_evas_line_efl_object_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED)
 {
    Evas_Line_Data *o;
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    evas_object_line_init(eo_obj);
 
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f1421faa90..43d3fc9519 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -91,14 +91,14 @@ _animator_repeater(void *data, const Eo_Event *event)
 {
    Evas_Object_Protected_Data *obj = data;
 
-   eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
+   efl_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
    DBG("Emitting animator tick on %p.", obj->object);
 }
 
 static void
 _check_event_catcher_add(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Evas_Object_Protected_Data *obj = data;
    int i;
 
@@ -108,7 +108,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
           {
              if (obj->animator_ref++ > 0) break;
 
-             eo_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
+             efl_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
              INF("Registering an animator tick on canvas %p for object %p.",
                  obj->layer->evas->evas, obj->object);
           }
@@ -122,7 +122,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
 static void
 _check_event_catcher_del(void *data, const Eo_Event *event)
 {
-   const Eo_Callback_Array_Item *array = event->info;
+   const Efl_Callback_Array_Item *array = event->info;
    Evas_Object_Protected_Data *obj = data;
    int i;
 
@@ -132,7 +132,7 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
           {
              if ((--obj->animator_ref) > 0) break;
 
-             eo_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
+             efl_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
              INF("Unregistering an animator tick on canvas %p for object %p.",
                  obj->layer->evas->evas, obj->object);
           }
@@ -144,20 +144,20 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
-                          { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add },
-                          { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del });
+                          { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
+                          { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
 
 EOLIAN static Eo *
-_efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
    Eo *parent = NULL;
    Evas *evas;
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
    efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME);
    eo_manual_free_set(eo_obj, EINA_TRUE);
 
-   parent = eo_parent_get(eo_obj);
+   parent = efl_parent_get(eo_obj);
    evas = evas_object_evas_get(parent);
 
    if (!obj || !_init_cow() || !evas)
@@ -177,7 +177,7 @@ _efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *o
 
    evas_object_inject(eo_obj, obj, evas);
 
-   eo_event_callback_array_add(eo_obj, event_catcher_watch(), obj);
+   efl_event_callback_array_add(eo_obj, event_catcher_watch(), obj);
 
    return eo_obj;
 }
@@ -727,20 +727,20 @@ evas_object_del(Evas_Object *eo_obj)
 
    if (!obj) return;
    evas_object_async_block(obj);
-   if (obj->delete_me || obj->eo_del_called) return;
+   if (obj->delete_me || obj->efl_del_called) return;
    if (obj->ref > 0)
      {
         obj->del_ref = EINA_TRUE;
         return;
      }
    evas_object_hide(eo_obj);
-   obj->eo_del_called = EINA_TRUE;
+   obj->efl_del_called = EINA_TRUE;
 
-   eo_del(eo_obj);
+   efl_del(eo_obj);
 }
 
 EOLIAN static void
-_efl_canvas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -830,7 +830,7 @@ end:
    evas_object_event_callback_all_del(eo_obj);
    evas_object_event_callback_cleanup(eo_obj);
 
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -1771,11 +1771,11 @@ evas_object_render_op_get(const Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root)
+_efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
-   Eo_Dbg_Info *node;
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   Efl_Dbg_Info *node;
    const char *name;
    double dblw, dblh;
    double dblx, dbly;
@@ -1797,7 +1797,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
 
    visible = efl_gfx_visible_get(eo_obj);
    layer = efl_gfx_stack_layer_get(eo_obj);
-   name = eo_name_get(eo_obj); // evas_object_name_get(eo_obj);
+   name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
    efl_gfx_position_get(eo_obj, &x, &y);
    efl_gfx_size_get(eo_obj, &w, &h);
    scale = efl_canvas_object_scale_get(eo_obj);
@@ -1895,14 +1895,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
      {  /* Save map coords count info if object has map */
         node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map");
         int points_count = evas_map_count_get(map);
-        Eo_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points");
-        Eo_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV");
+        Efl_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points");
+        Efl_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV");
         for (int i = 0 ; i < points_count; i++)
           {
                {
                   Evas_Coord px, py, pz;
                   evas_map_point_coord_get(map, i, &px, &py, &pz);
-                  Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points");
+                  Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points");
                   EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px);
                   EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py);
                   EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz);
@@ -1911,7 +1911,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
                {
                   double pu, pv;
                   evas_map_point_image_uv_get(map, i, &pu, &pv);
-                  Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV");
+                  Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV");
                   EO_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu);
                   EO_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv);
                }
@@ -1920,14 +1920,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
 }
 
 EOLIAN static Eo *
-_efl_canvas_object_eo_base_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Eo_Class *klass)
+_efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass)
 {
    if (klass == EVAS_CANVAS_CLASS)
      {
         if ((obj->delete_me) || (!obj->layer)) return NULL;
         return obj->layer->evas->evas;
      }
-   return eo_provider_find(eo_super(eo_obj, MY_CLASS), klass);
+   return efl_provider_find(eo_super(eo_obj, MY_CLASS), klass);
 }
 
 EOLIAN Evas_Object*
@@ -2106,7 +2106,7 @@ _evas_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e,
 EOLIAN static void
 _efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type)
 {
-   if (eo_finalized_get(eo_obj))
+   if (efl_finalized_get(eo_obj))
      {
         ERR("This function is only allowed during construction.");
         return;
@@ -2182,7 +2182,7 @@ _efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Object_P
 EOLIAN static void
 _efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
-   EINA_SAFETY_ON_FALSE_RETURN(!eo_finalized_get(eo_obj));
+   EINA_SAFETY_ON_FALSE_RETURN(!efl_finalized_get(eo_obj));
    obj->legacy = EINA_TRUE;
 }
 
@@ -2299,7 +2299,7 @@ evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y)
 EAPI Evas *
 evas_object_evas_get(const Eo *eo_obj)
 {
-   return eo_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS);
+   return efl_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS);
 }
 
 EAPI void
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 03aa31fc5c..2f9fbc470a 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -88,9 +88,9 @@ evas_object_polygon_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_efl_canvas_polygon_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED)
+_efl_canvas_polygon_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED)
 {
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    evas_object_polygon_init(eo_obj);
 
@@ -260,12 +260,12 @@ evas_object_polygon_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_polygon_eo_base_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED)
+_efl_canvas_polygon_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_polygon_free(eo_obj, obj, obj->private_data);
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index d38379e0c5..956ced2039 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -100,9 +100,9 @@ evas_object_rectangle_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED)
+_efl_canvas_rectangle_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED)
 {
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    evas_object_rectangle_init(eo_obj);
 
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index a189101df7..2a77d9f5da 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -50,7 +50,7 @@ typedef struct
    EINA_INLIST;
    Evas_Smart_Cb func;
    void *data;
-   const Eo_Event_Description *event;
+   const Efl_Event_Description *event;
 } _eo_evas_smart_cb_info;
 
 
@@ -350,7 +350,7 @@ EAPI Eina_Bool
 evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
 {
    const Evas_Smart_Class *sc;
-   Eo_Class *klass;
+   Efl_Class *klass;
    Eina_Bool type_check = EINA_FALSE;
 
    Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE);
@@ -378,7 +378,7 @@ evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
 EAPI Eina_Bool
 evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type)
 {
-   Eo_Class *klass;
+   Efl_Class *klass;
    const Evas_Smart_Class *sc;
    Eina_Bool type_check = EINA_FALSE;
 
@@ -405,7 +405,7 @@ evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type)
 }
 
 EAPI void
-evas_smart_legacy_type_register(const char *type, const Eo_Class *klass)
+evas_smart_legacy_type_register(const char *type, const Efl_Class *klass)
 {
    eina_hash_set(_evas_smart_class_names_hash_table, type, klass);
 }
@@ -438,7 +438,7 @@ _efl_canvas_group_group_iterator_free(Evas_Object_Smart_Iterator *it)
    free(it);
 }
 
-// Should we have an eo_children_iterator_new API and just inherit from it ?
+// Should we have an efl_children_iterator_new API and just inherit from it ?
 EOLIAN static Eina_Iterator*
 _efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv)
 {
@@ -580,7 +580,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
 }
 
 EOLIAN static Eo *
-_efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
+_efl_canvas_group_efl_object_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
 {
    Evas_Smart_Data *smart;
 
@@ -588,7 +588,7 @@ _efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EI
    smart->object = eo_obj;
    smart->inherit_paragraph_direction = EINA_TRUE;
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
    evas_object_smart_init(eo_obj);
 
    efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY);
@@ -753,7 +753,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event,
    if (!event) return;
    if (!func) return;
 
-   const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event);
+   const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
    _eo_evas_smart_cb_info *cb_info = calloc(1, sizeof(*cb_info));
    cb_info->func = func;
    cb_info->data = (void *)data;
@@ -762,7 +762,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event,
    o->callbacks = eina_inlist_append(o->callbacks,
         EINA_INLIST_GET(cb_info));
 
-   eo_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info);
+   efl_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info);
 }
 
 EAPI void *
@@ -778,14 +778,14 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar
    if (!o) return NULL;
 
    if (!event) return NULL;
-   const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event);
+   const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
 
    EINA_INLIST_FOREACH(o->callbacks, info)
      {
         if ((info->func == func) && (info->event == eo_desc))
           {
              void *tmp = info->data;
-             eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info);
+             efl_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info);
 
              o->callbacks =
                 eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
@@ -809,14 +809,14 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas
    o = eo_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
 
-   const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event);
+   const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
 
    EINA_INLIST_FOREACH(o->callbacks, info)
      {
         if ((info->func == func) && (info->event == eo_desc) && (info->data == data))
           {
              void *tmp = info->data;
-             eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info);
+             efl_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info);
 
              o->callbacks =
                 eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
@@ -835,8 +835,8 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
    MAGIC_CHECK_END();
 
    if (!event) return;
-   const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event);
-   eo_event_callback_call(eo_obj, eo_desc, event_info);
+   const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
+   efl_event_callback_call(eo_obj, eo_desc, event_info);
 }
 
 EAPI Eina_Bool
@@ -1305,7 +1305,7 @@ evas_object_smart_cleanup(Evas_Object *eo_obj)
         while (o->callbacks)
           {
              _eo_evas_smart_cb_info *info = (_eo_evas_smart_cb_info *)o->callbacks;
-             eo_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info);
+             efl_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info);
              o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
              free(info);
           }
@@ -1550,14 +1550,14 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
 }
 
 static void
-_efl_canvas_group_class_constructor(Eo_Class *klass EINA_UNUSED)
+_efl_canvas_group_class_constructor(Efl_Class *klass EINA_UNUSED)
 {
    _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL);
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
 
 static void
-_efl_canvas_group_class_destructor(Eo_Class *klass EINA_UNUSED)
+_efl_canvas_group_class_destructor(Efl_Class *klass EINA_UNUSED)
 {
    eina_hash_free(_evas_smart_class_names_hash_table);
 }
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 478685fc6e..332a211b26 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -269,13 +269,13 @@ EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
 static void
 _evas_object_table_child_connect(Evas_Object *o, Evas_Object *child)
 {
-   eo_event_callback_array_add(child, evas_object_table_callbacks(), o);
+   efl_event_callback_array_add(child, evas_object_table_callbacks(), o);
 }
 
 static void
 _evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child)
 {
-   eo_event_callback_array_del(child, evas_object_table_callbacks(), o);
+   efl_event_callback_array_del(child, evas_object_table_callbacks(), o);
 }
 
 static void
@@ -966,9 +966,9 @@ evas_object_table_add(Evas *evas)
 }
 
 EOLIAN static Eo *
-_evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
+_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
@@ -1405,7 +1405,7 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored)
 }
 
 EOLIAN static void
-_evas_table_class_constructor(Eo_Class *klass)
+_evas_table_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index c57544d5ee..1bbbb62029 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -377,9 +377,9 @@ evas_object_text_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
+_evas_text_efl_object_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
 {
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
    evas_object_text_init(eo_obj);
 
    return eo_obj;
@@ -1031,10 +1031,10 @@ _evas_text_ellipsis_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
 }
 
 EOLIAN static void
-_evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
+_evas_text_efl_object_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    const char *text;
    int size;
@@ -1625,11 +1625,11 @@ evas_object_text_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
+_evas_text_efl_object_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_text_free(eo_obj, obj);
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index a48cda49fe..fb003ca134 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -6334,12 +6334,12 @@ evas_object_textblock_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_efl_canvas_text_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED)
+_efl_canvas_text_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Efl_Canvas_Text_Data *o;
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    /* set up methods (compulsory) */
    obj->func = &object_func;
@@ -7027,7 +7027,7 @@ _cursor_emit_if_changed(Efl_Canvas_Text_Cursor *cur_obj)
    if (cur->changed)
      {
         cur->changed = EINA_FALSE;
-        eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+        efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
      }
 }
 
@@ -7081,7 +7081,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
             EINA_INLIST_GET(o->text_nodes),
             EINA_INLIST_GET(co->node)));
 
-   eo_event_freeze(o->cursor);
+   efl_event_freeze(o->cursor);
    evas_textblock_cursor_paragraph_first(o->cursor);
 
    evas_object_textblock_text_markup_prepend(o->cursor, text);
@@ -7093,18 +7093,18 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
         evas_textblock_cursor_paragraph_first(o->cursor);
         EINA_LIST_FOREACH(o->cursors, l, data)
           {
-             eo_event_freeze(data);
+             efl_event_freeze(data);
              evas_textblock_cursor_paragraph_first(data);
           }
 
         EINA_LIST_FOREACH(o->cursors, l, data)
           {
-             eo_event_thaw(data);
-             eo_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+             efl_event_thaw(data);
+             efl_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
           }
      }
-   eo_event_thaw(o->cursor);
-   eo_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_thaw(o->cursor);
+   efl_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 
     o->markup_text = text;
 }
@@ -7633,7 +7633,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event)
 static void
 _obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
 {
-   eo_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
+   efl_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
 }
 
 static void
@@ -7669,7 +7669,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj,
    if (!obs) return EINA_FALSE;
 
    obs->eo_obs = eo_obs;
-   eo_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
+   efl_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
 
    obj->obstacles = eina_list_append(obj->obstacles, obs);
    _obstacle_update(obs, eo_obj);
@@ -8051,8 +8051,8 @@ _efl_canvas_text_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o)
    return o->cursor;
 }
 
-EOLIAN static Eo_Base *
-_efl_canvas_text_cursor_eo_base_finalize(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd)
+EOLIAN static Efl_Object *
+_efl_canvas_text_cursor_efl_object_finalize(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd)
 {
    if (!pd->obj)
      {
@@ -8075,7 +8075,7 @@ _evas_textblock_cursor_init(Efl_Canvas_Text_Cursor_Data *cur, const Evas_Object
 EOLIAN static void
 _efl_canvas_text_cursor_text_object_set(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd, const Evas_Object *tb)
 {
-   if (eo_finalized_get(obj))
+   if (efl_finalized_get(obj))
      {
         ERR("Can't change the cursor's textblock after creation.");
         return;
@@ -8102,9 +8102,9 @@ evas_object_textblock_cursor_new(const Eo *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_text_cursor_eo_base_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
+_efl_canvas_text_cursor_efl_object_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
-   eo_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS));
+   efl_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS));
    Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
    if (cur_obj == o->cursor) return;
    o->cursors = eina_list_remove(o->cursors, cur_obj);
@@ -8113,7 +8113,7 @@ _efl_canvas_text_cursor_eo_base_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_D
 EAPI void
 evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
 {
-   eo_del(cur);
+   efl_del(cur);
 }
 
 EAPI Eina_Bool
@@ -8301,7 +8301,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _canvas_text_cursor_paragraph_first(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 
@@ -8332,7 +8332,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _canvas_text_cursor_paragraph_last(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8371,7 +8371,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_next(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_next(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8414,7 +8414,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_prev(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_prev(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI void
@@ -8571,7 +8571,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_word_start(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED)
 {
    evas_textblock_cursor_word_start(cur_obj);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -8633,7 +8633,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_word_end(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED)
 {
    evas_textblock_cursor_word_end(cur_obj);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8688,7 +8688,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_char_next(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_char_next(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8718,7 +8718,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_char_prev(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_char_prev(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8734,7 +8734,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_char_first(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8762,7 +8762,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_char_last(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8811,7 +8811,7 @@ _efl_canvas_text_cursor_line_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canv
    if (!ln) return;
 
    _cursor_line_first_char_get(ln, cur, o);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8866,7 +8866,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_line_char_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_line_char_last(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 /**
@@ -9377,7 +9377,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_position_set(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur, int _pos)
 {
    _evas_textblock_cursor_pos_set(cur, _pos);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -9447,7 +9447,7 @@ _efl_canvas_text_cursor_line_jump_by(Eo *c, Efl_Canvas_Text_Cursor_Data *pd EINA
 	   evas_textblock_cursor_line_char_last(c);
      }
 
-   eo_event_callback_call(c, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(c, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static int
@@ -9529,7 +9529,7 @@ _efl_canvas_text_cursor_copy(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur,
    if (!efl_canvas_text_cursor_equal(cur_obj, src_obj))
      {
         _evas_textblock_cursor_copy(cur, src);
-        eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+        efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
      }
 }
 
@@ -9909,7 +9909,7 @@ _efl_canvas_text_cursor_text_insert(Eo *cur_obj,
       Efl_Canvas_Text_Cursor_Data *cur, const char *_text)
 {
    int len = _efl_canvas_text_cursor_text_append(cur, _text);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
    return len;
 }
 
@@ -10336,7 +10336,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_char_delete(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_char_delete(cur);
-   eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI void
@@ -11533,7 +11533,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur_obj,  Evas_Coord
 end:
    if (ret)
      {
-        eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+        efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
      }
    return ret;
 }
@@ -12576,12 +12576,12 @@ _efl_canvas_text_style_insets_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coor
 }
 
 EOLIAN static void
-_efl_canvas_text_eo_base_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
+_efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
    if (!root) return;
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
-   Eo_Dbg_Info *node;
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   Efl_Dbg_Info *node;
 
    const char *style;
    const char *text = NULL;
@@ -12642,10 +12642,10 @@ evas_object_textblock_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_text_eo_base_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED)
+_efl_canvas_text_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED)
 {
    evas_object_textblock_free(eo_obj);
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 static void
@@ -12659,14 +12659,14 @@ evas_object_textblock_free(Evas_Object *eo_obj)
      {
         evas_object_textblock_style_user_pop(eo_obj);
      }
-   eo_del(o->cursor);
+   efl_del(o->cursor);
    while (o->cursors)
      {
         Efl_Canvas_Text_Cursor *cur;
 
         cur = (Efl_Canvas_Text_Cursor *)o->cursors->data;
         o->cursors = eina_list_remove_list(o->cursors, o->cursors);
-        eo_del(cur);
+        efl_del(cur);
      }
    if (o->repch) eina_stringshare_del(o->repch);
    if (o->ellip_ti) _item_free(eo_obj, NULL, _ITEM(o->ellip_ti));
@@ -13966,7 +13966,7 @@ _efl_canvas_text_cursor_object_item_insert(Eo *cur_obj EINA_UNUSED,
    Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
    Efl_Canvas_Text_Annotation *ret =
       _textblock_annotation_insert(cur->obj, o, cur, cur, format, EINA_TRUE);
-   eo_event_callback_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL);
+   efl_event_callback_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL);
    return ret;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index d5be2edad6..cb25de7cff 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -241,12 +241,12 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 }
 
 EOLIAN static void
-_evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED)
+_evas_textgrid_efl_object_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_textgrid_free(eo_obj, obj);
    eo_data_unref(eo_obj, obj->private_data);
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 static void
@@ -900,9 +900,9 @@ evas_object_textgrid_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
+_evas_textgrid_efl_object_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
 {
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    evas_object_textgrid_init(eo_obj);
 
@@ -1450,11 +1450,11 @@ _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w
 }
 
 EOLIAN static void
-_evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
+_evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
-   Eo_Dbg_Info *node;
+   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   Efl_Dbg_Info *node;
 
    const char *text;
    int size;
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index 9ef7b26eec..18522481e3 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -92,7 +92,7 @@ _cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED)
 }
 
 void
-_evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd)
+_evas_vg_efl_object_destructor(Eo *eo_obj, Evas_VG_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
    Evas *e = evas_object_evas_get(eo_obj);
@@ -101,19 +101,19 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd)
    if (pd->engine_data)
      obj->layer->evas->engine.func->ector_free(pd->engine_data);
 
-   eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
+   efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
 
    eo_unref(pd->root);
    pd->root = NULL;
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 Eo *
-_evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd)
+_evas_vg_efl_object_constructor(Eo *eo_obj, Evas_VG_Data *pd)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    /* set up methods (compulsory) */
    obj->func = &object_func;
@@ -129,14 +129,14 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd)
    return eo_obj;
 }
 
-static Eo_Base *
-_evas_vg_eo_base_finalize(Eo *obj, Evas_VG_Data *pd)
+static Efl_Object *
+_evas_vg_efl_object_finalize(Eo *obj, Evas_VG_Data *pd)
 {
    Evas *e = evas_object_evas_get(obj);
 
    // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice
    // to actually have one event per canvas and one array per canvas to.
-   eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
+   efl_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
 
    return obj;
 }
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 73c902c20f..25931752ec 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -24,16 +24,16 @@ evas_out_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
+_evas_out_efl_object_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 {
    Eo *eo_parent = NULL;
    Evas_Public_Data *e;
 
-   eo_parent = eo_parent_get(eo_obj);
+   eo_parent = efl_parent_get(eo_obj);
    e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
 
-   eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
 
    if (!e) return NULL;
    e->outputs = eina_list_append(e->outputs, eo_obj);
@@ -52,12 +52,12 @@ evas_output_del(Evas_Out *evo)
 }
 
 EOLIAN static void
-_evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
+_evas_out_efl_object_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 {
    Eo *eo_parent = NULL;
    Evas_Public_Data *e;
 
-   eo_parent = eo_parent_get(eo_obj);
+   eo_parent = efl_parent_get(eo_obj);
    e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
    if (!e) return;
@@ -66,7 +66,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
    // e->engine.func->output_free(eo_dat->output);
    e->engine.func->info_free(eo_parent, eo_dat->info);
    e->outputs = eina_list_remove(e->outputs, eo_obj);
-   eo_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(eo_super(eo_obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -74,7 +74,7 @@ _evas_out_view_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Coord x, Evas_Coord y,
 {
    Eo *eo_parent = NULL;
    Evas_Public_Data *e;
-   eo_parent = eo_parent_get(eo_e);
+   eo_parent = efl_parent_get(eo_e);
    e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
    eo_dat->x = x;
@@ -99,7 +99,7 @@ _evas_out_engine_info_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Engine_Info *inf
 {
    Eo *eo_parent = NULL;
    Evas_Public_Data *e;
-   eo_parent = eo_parent_get(eo_e);
+   eo_parent = efl_parent_get(eo_e);
    e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
    if (eo_dat->info != info) return EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo
index 731da8a156..44e00a4d04 100644
--- a/src/lib/evas/canvas/evas_out.eo
+++ b/src/lib/evas/canvas/evas_out.eo
@@ -1,6 +1,6 @@
 import evas_types;
 
-class Evas.Out (Eo.Base)
+class Evas.Out (Efl.Object)
 {
    eo_prefix: evas_out;
    legacy_prefix: evas_output;
@@ -37,8 +37,8 @@ class Evas.Out (Eo.Base)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
    }
 
 }
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 5aa5d38aca..8426ac3a0b 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -957,7 +957,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj)
    Eina_Bool surface_below, stacking_check, object_above = EINA_FALSE;
    Eina_Bool ignore_window;
 
-   video_parent = _evas_object_image_video_parent_get(eo_obj);
+   video_parent = _evas_object_image_videfl_parent_get(eo_obj);
 
    /* Check if any one is the stack make this object mapped */
    eo_tmp = eo_obj;
@@ -2225,10 +2225,10 @@ _cb_always_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
 {
    int freeze_num = 0, i;
 
-   freeze_num = eo_event_freeze_count_get(eo_e);
-   for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e);
+   freeze_num = efl_event_freeze_count_get(eo_e);
+   for (i = 0; i < freeze_num; i++) efl_event_thaw(eo_e);
    evas_event_callback_call(eo_e, type, event_info);
-   for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e);
+   for (i = 0; i < freeze_num; i++) efl_event_freeze(eo_e);
 }
 
 static inline Eina_Bool
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 087f40b99c..6fd473f7a1 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -215,7 +215,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
+      Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
       Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 068f0d6646..df995ee7ab 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -250,9 +250,9 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
       Efl.Gfx.size.set;
       Efl.Text.text.set;
       Efl.Text.text.get;
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index 43af7b5066..170e880c05 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -196,9 +196,9 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties)
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.destructor;
-      Eo.Base.dbg_info_get;
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+      Efl.Object.dbg_info_get;
       Efl.Text.Properties.font.get;
       Efl.Text.Properties.font.set;
       Efl.Text.Properties.font_source.get;
diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo
index 55ca7b875b..4a1d8abf7d 100644
--- a/src/lib/evas/canvas/evas_vg.eo
+++ b/src/lib/evas/canvas/evas_vg.eo
@@ -14,14 +14,14 @@ class Evas.VG (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View)
               @since 1.14]]
          }
          values {
-            container: Eo.Base; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG */
+            container: Efl.Object; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG */
          }
       }
    }
    implements {
-      Eo.Base.constructor;
-      Eo.Base.finalize;
-      Eo.Base.destructor;
+      Efl.Object.constructor;
+      Efl.Object.finalize;
+      Efl.Object.destructor;
       Efl.Gfx.Fill.fill.set;
       Efl.Gfx.Fill.fill.get;
       Efl.Gfx.View.view_size.set;
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index 3374a9b751..dac9472cea 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -37,14 +37,14 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED,
 }
 
 static Eo *
-_efl_vg_container_eo_base_constructor(Eo *obj,
+_efl_vg_container_efl_object_constructor(Eo *obj,
                                       Efl_VG_Container_Data *pd)
 {
    Efl_VG_Data *nd;
 
    pd->names = eina_hash_stringshared_new(NULL);
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    nd = eo_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_container_render_pre;
@@ -55,10 +55,10 @@ _efl_vg_container_eo_base_constructor(Eo *obj,
 }
 
 static void
-_efl_vg_container_eo_base_destructor(Eo *obj,
+_efl_vg_container_efl_object_destructor(Eo *obj,
                                      Efl_VG_Container_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 
    eina_hash_free(pd->names);
    pd->names = NULL;
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index 11491708aa..713ceeb814 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -89,12 +89,12 @@ _efl_vg_gradient_linear_render_pre(Eo *obj,
 }
 
 static Eo *
-_efl_vg_gradient_linear_eo_base_constructor(Eo *obj,
+_efl_vg_gradient_linear_efl_object_constructor(Eo *obj,
                                             Efl_VG_Gradient_Linear_Data *pd)
 {
    Efl_VG_Data *nd;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    nd = eo_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_gradient_linear_render_pre;
@@ -104,9 +104,9 @@ _efl_vg_gradient_linear_eo_base_constructor(Eo *obj,
 }
 
 static void
-_efl_vg_gradient_linear_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED)
+_efl_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 4a46c7a8d1..39516a8479 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -106,11 +106,11 @@ _efl_vg_gradient_radial_render_pre(Eo *obj,
 }
 
 static Eo *
-_efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd)
+_efl_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd)
 {
    Efl_VG_Data *nd;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    nd = eo_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_gradient_radial_render_pre;
@@ -120,10 +120,10 @@ _efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data
 }
 
 static void
-_efl_vg_gradient_radial_eo_base_destructor(Eo *obj,
+_efl_vg_gradient_radial_efl_object_destructor(Eo *obj,
                                            Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index d2159a173f..b1c788290d 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -25,8 +25,8 @@ _efl_vg_property_changed(void *data, const Eo_Event *event)
 
    if (!pd->flags) pd->flags = EFL_GFX_CHANGE_FLAG_ALL;
 
-   parent = eo_parent_get(event->object);
-   eo_event_callback_call(parent, event->desc, event->info);
+   parent = efl_parent_get(event->object);
+   efl_event_callback_call(parent, event->desc, event->info);
 }
 
 static void
@@ -238,7 +238,7 @@ _efl_vg_parent_checked_get(Eo *obj,
                                 Efl_VG_Container_Data **cd)
 {
    *cd = NULL;
-   *parent = eo_parent_get(obj);
+   *parent = efl_parent_get(obj);
 
    if (eo_isa(*parent, EFL_VG_CONTAINER_CLASS))
      {
@@ -268,20 +268,20 @@ _efl_vg_parent_checked_get(Eo *obj,
 }
 
 static Eo *
-_efl_vg_eo_base_constructor(Eo *obj,
+_efl_vg_efl_object_constructor(Eo *obj,
                                  Efl_VG_Data *pd)
 {
    Efl_VG_Container_Data *cd = NULL;
    Eo *parent;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    if (!_efl_vg_parent_checked_get(obj, &parent, &cd)) {
         ERR("Failed");
         return NULL;
    }
 
-   eo_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_property_changed, pd);
+   efl_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_property_changed, pd);
    pd->flags = EFL_GFX_CHANGE_FLAG_ALL;
    pd->changed = EINA_TRUE;
 
@@ -289,7 +289,7 @@ _efl_vg_eo_base_constructor(Eo *obj,
 }
 
 static void
-_efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd)
+_efl_vg_efl_object_destructor(Eo *obj, Efl_VG_Data *pd)
 {
    if (pd->m)
      {
@@ -299,7 +299,7 @@ _efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd)
 
    if (pd->renderer)
      {
-        eo_del(pd->renderer);
+        efl_del(pd->renderer);
         pd->renderer = NULL;
      }
    if (pd->intp)
@@ -308,7 +308,7 @@ _efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd)
         pd->intp = NULL;
      }
 
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static void
@@ -355,7 +355,7 @@ _efl_vg_name_get(Eo *obj EINA_UNUSED, Efl_VG_Data *pd)
 }
 
 static void
-_efl_vg_eo_base_parent_set(Eo *obj,
+_efl_vg_efl_object_parent_set(Eo *obj,
                                 Efl_VG_Data *pd EINA_UNUSED,
                                 Eo *parent)
 {
@@ -392,7 +392,7 @@ _efl_vg_eo_base_parent_set(Eo *obj,
         if (pd->name) eina_hash_del(old_cd->names, pd->name, obj);
      }
 
-   eo_parent_set(eo_super(obj, MY_CLASS), parent);
+   efl_parent_set(eo_super(obj, MY_CLASS), parent);
    if (cd)
      {
         cd->children = eina_list_append(cd->children, obj);
@@ -417,7 +417,7 @@ _efl_vg_efl_gfx_stack_raise(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
    Eina_List *lookup, *next;
    Eo *parent;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
    cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
@@ -447,7 +447,7 @@ _efl_vg_efl_gfx_stack_stack_above(Eo *obj,
    Eina_List *lookup, *ref;
    Eo *parent;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
    cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
@@ -477,7 +477,7 @@ _efl_vg_efl_gfx_stack_stack_below(Eo *obj,
    Eina_List *lookup, *ref;
    Eo *parent;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
    cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
@@ -505,7 +505,7 @@ _efl_vg_efl_gfx_stack_lower(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
    Eina_List *lookup, *prev;
    Eo *parent;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
    if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
    cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
@@ -534,7 +534,7 @@ _efl_vg_root_parent_get(Eo *obj)
    if (eo_isa(obj, EFL_VG_ROOT_NODE_CLASS))
      return obj;
 
-   parent = eo_parent_get(obj);
+   parent = efl_parent_get(obj);
 
    if (!parent) return NULL;
    return _efl_vg_root_parent_get(parent);
@@ -682,7 +682,7 @@ _efl_vg_interpolate(Eo *obj,
    tod = eo_data_scope_get(to, EFL_VG_CLASS);
    from_map = 1.0 - pos_map;
 
-   eo_del(pd->renderer);
+   efl_del(pd->renderer);
    pd->renderer = NULL;
 
    if (fromd->m || tod->m)
@@ -772,7 +772,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from)
 
    if (pd->renderer)
      {
-        eo_del(pd->renderer);
+        efl_del(pd->renderer);
         pd->renderer = NULL;
      }
 
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index 711e2875ad..87f327bcd2 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -85,7 +85,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
 static inline void
 _efl_vg_changed(Eo *obj)
 {
-   eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static inline void *
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index f53587ea5c..9925b7963a 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -45,12 +45,12 @@ _evas_vg_root_node_changed(void *data, const Eo_Event *event)
 }
 
 static void
-_efl_vg_root_node_eo_base_parent_set(Eo *obj,
+_efl_vg_root_node_efl_object_parent_set(Eo *obj,
                                      Efl_VG_Root_Node_Data *pd,
                                      Eo *parent)
 {
    // Nice little hack, jump over parent parent_set in Efl_VG_Root
-   eo_parent_set(eo_super(obj, EFL_VG_CLASS), parent);
+   efl_parent_set(eo_super(obj, EFL_VG_CLASS), parent);
    if (parent && !eo_isa(parent, EVAS_VG_CLASS))
      {
         ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
@@ -63,7 +63,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj,
 }
 
 static Eo *
-_efl_vg_root_node_eo_base_constructor(Eo *obj,
+_efl_vg_root_node_efl_object_constructor(Eo *obj,
                                       Efl_VG_Root_Node_Data *pd)
 {
    Efl_VG_Container_Data *cd;
@@ -77,8 +77,8 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
    cd->names = eina_hash_stringshared_new(NULL);
 
    // Nice little hack, jump over parent constructor in Efl_VG_Root
-   obj = eo_constructor(eo_super(obj, EFL_VG_CLASS));
-   parent = eo_parent_get(obj);
+   obj = efl_constructor(eo_super(obj, EFL_VG_CLASS));
+   parent = efl_parent_get(obj);
    efl_vg_name_set(obj, "root");
    if (!eo_isa(parent, EVAS_VG_CLASS)) {
         ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
@@ -89,7 +89,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
    nd->render_pre = _evas_vg_root_node_render_pre;
    nd->data = cd;
 
-   eo_event_callback_add(obj, EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd);
+   efl_event_callback_add(obj, EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd);
 
    return obj;
 }
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 69d9b822a6..5b0a0c8b38 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -151,11 +151,11 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
 }
 
 static Eo *
-_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
+_efl_vg_shape_efl_object_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
 {
    Efl_VG_Data *nd;
 
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(eo_super(obj, MY_CLASS));
 
    efl_gfx_shape_stroke_scale_set(obj, 1);
    efl_gfx_shape_stroke_location_set(obj, 0.5);
@@ -170,9 +170,9 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
 }
 
 static void
-_efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
+_efl_vg_shape_efl_object_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
 {
-   eo_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Bool
diff --git a/src/lib/evas/canvas/render2/evas_render2.c b/src/lib/evas/canvas/render2/evas_render2.c
index 72a913291a..532718af67 100644
--- a/src/lib/evas/canvas/render2/evas_render2.c
+++ b/src/lib/evas/canvas/render2/evas_render2.c
@@ -32,10 +32,10 @@ _always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info)
 {
    int freeze_num = 0, i;
 
-   freeze_num = eo_event_freeze_count_get(eo_e);
-   for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e);
+   freeze_num = efl_event_freeze_count_get(eo_e);
+   for (i = 0; i < freeze_num; i++) efl_event_thaw(eo_e);
    evas_event_callback_call(eo_e, type, event_info);
-   for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e);
+   for (i = 0; i < freeze_num; i++) efl_event_freeze(eo_e);
 }
 
 // a list of canvases currently rendering
diff --git a/src/lib/evas/canvas/render2/evas_render2_old.c b/src/lib/evas/canvas/render2/evas_render2_old.c
index 490399b19d..62c9b955ec 100644
--- a/src/lib/evas/canvas/render2/evas_render2_old.c
+++ b/src/lib/evas/canvas/render2/evas_render2_old.c
@@ -119,10 +119,10 @@ _evas_render2_always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info)
 {
    int freeze_num = 0, i;
 
-   freeze_num = eo_event_freeze_count_get(eo_e);
-   for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e);
+   freeze_num = efl_event_freeze_count_get(eo_e);
+   for (i = 0; i < freeze_num; i++) efl_event_thaw(eo_e);
    evas_event_callback_call(eo_e, type, event_info);
-   for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e);
+   for (i = 0; i < freeze_num; i++) efl_event_freeze(eo_e);
 }
 
 static void
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index f369fd02be..9eb8c2ead7 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -90,7 +90,7 @@ static void
 _filter_buffer_backing_free(Evas_Filter_Buffer *fb)
 {
    if (!fb || !fb->buffer) return;
-   eo_del(fb->buffer);
+   efl_del(fb->buffer);
    fb->buffer = NULL;
 }
 
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 474a66ebba..0d41ab6ff7 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1166,7 +1166,7 @@ struct _Evas_Object_Protected_Data
 
    Eina_Bool                   is_frame : 1;
    Eina_Bool                   child_has_map : 1;
-   Eina_Bool                   eo_del_called : 1;
+   Eina_Bool                   efl_del_called : 1;
    Eina_Bool                   is_smart : 1;
    Eina_Bool                   no_render : 1; // since 1.15
    Eina_Bool                   legacy : 1; // used legacy constructor
@@ -1551,7 +1551,7 @@ void evas_object_clip_across_check(Evas_Object *obj, Evas_Object_Protected_Data
 void evas_object_clip_across_clippees_check(Evas_Object *obj, Evas_Object_Protected_Data *pd);
 void evas_object_mapped_clip_across_mark(Evas_Object *obj, Evas_Object_Protected_Data *pd);
 void evas_event_callback_call(Evas *e, Evas_Callback_Type type, void *event_info);
-void evas_object_event_callback_call(Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Callback_Type type, void *event_info, int event_id, const Eo_Event_Description *eo_event_desc, Efl_Event *eo_event_info);
+void evas_object_event_callback_call(Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Callback_Type type, void *event_info, int event_id, const Efl_Event_Description *efl_event_desc, Efl_Event *efl_event_info);
 Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y);
 int evas_mem_free(int mem_required);
 int evas_mem_degrade(int mem_required);
@@ -1571,7 +1571,7 @@ Evas_Object *_evas_object_image_source_get(Evas_Object *obj);
 Eina_Bool _evas_object_image_preloading_get(const Evas_Object *obj);
 void _evas_object_image_preloading_set(Evas_Object *obj, Eina_Bool preloading);
 void _evas_object_image_preloading_check(Evas_Object *obj);
-Evas_Object *_evas_object_image_video_parent_get(Evas_Object *obj);
+Evas_Object *_evas_object_image_videfl_parent_get(Evas_Object *obj);
 void _evas_object_image_video_overlay_show(Evas_Object *obj);
 void _evas_object_image_video_overlay_hide(Evas_Object *obj);
 void _evas_object_image_video_overlay_do(Evas_Object *obj);