Eo: Finish the renaming of Eo to the EFL.

This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
author: Tom Hacohen <tom@stosb.com> 2016-08-15 14:44:41 +0100
committer: Tom Hacohen <tom@stosb.com> 2016-08-15 15:07:42 +0100
commit: e65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree: 7ecaf136e45470635889191aded2b47057720a98
parent: 35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
download: efl-e65aae994e72c1d3f8ac6b5360d3772f177b77ef.tar.gz
519 files changed, 5824 insertions, 5824 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index e825291270..b8fd274191 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -19,7 +19,7 @@ _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int ti
      }
 }
 
-EAPI EO_VOID_FUNC_BODYV(simple_other_call, EO_FUNC_CALL(other, times), Eo *other, int times);
+EAPI EFL_VOID_FUNC_BODYV(simple_other_call, EFL_FUNC_CALL(other, times), Eo *other, int times);
 
 static void
 _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
@@ -28,23 +28,23 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
    pd->a = a;
 }
 
-EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
 
 static Efl_Op_Description op_desc[] = {
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_other_call, _other_call),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_desc),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_desc),
      NULL,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
 
diff --git a/src/benchmarks/eo/eo_bench.c b/src/benchmarks/eo/eo_bench.c
index 3b6584e2b1..455fd9a9cd 100644
--- a/src/benchmarks/eo/eo_bench.c
+++ b/src/benchmarks/eo/eo_bench.c
@@ -20,7 +20,7 @@ struct _Eina_Benchmark_Case
 
 static const Eina_Benchmark_Case etc[] = {
    { "eo_do", eo_bench_eo_do },
-   { "eo_add", eo_bench_eo_add },
+   { "efl_add", eo_bench_efl_add },
    { "eo_callbacks", eo_bench_callbacks },
    { NULL, NULL }
 };
@@ -35,7 +35,7 @@ main(int argc, char **argv)
       return -1;
 
    eina_init();
-   eo_init();
+   efl_object_init();
 
    for (i = 0; etc[i].bench_case; ++i)
      {
@@ -50,7 +50,7 @@ main(int argc, char **argv)
         eina_benchmark_free(test);
      }
 
-   eo_shutdown();
+   efl_object_shutdown();
    eina_shutdown();
 
    return 0;
diff --git a/src/benchmarks/eo/eo_bench.h b/src/benchmarks/eo/eo_bench.h
index 88ee999d69..5fc14be271 100644
--- a/src/benchmarks/eo/eo_bench.h
+++ b/src/benchmarks/eo/eo_bench.h
@@ -2,7 +2,7 @@
 #define EINA_BENCH_H_
 
 void eo_bench_eo_do(Eina_Benchmark *bench);
-void eo_bench_eo_add(Eina_Benchmark *bench);
+void eo_bench_efl_add(Eina_Benchmark *bench);
 void eo_bench_callbacks(Eina_Benchmark *bench);
 
 #define _EO_BENCH_TIMES(Start, Repeat, Jump) (Start), ((Start) + ((Jump) * (Repeat))), (Jump)
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index ed76228c3d..4c8a9f38c2 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -16,14 +16,14 @@ static void
 bench_eo_callbacks_add(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i++)
      {
         efl_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
      }
 
-   eo_unref(obj);
+   efl_unref(obj);
 }
 
 static void
@@ -52,7 +52,7 @@ bench_eo_callbacks_call(int request)
    Eo *obj[len];
    for (i = 0 ; i < len ; i++)
      {
-        obj[i] = eo_add(SIMPLE_CLASS, NULL);
+        obj[i] = efl_add(SIMPLE_CLASS, NULL);
 
         for (j = 0 ; j < i ; j++)
           {
@@ -71,7 +71,7 @@ bench_eo_callbacks_call(int request)
 
    for (i = 0 ; i < len ; i++)
      {
-        eo_unref(obj[i]);
+        efl_unref(obj[i]);
      }
 }
 
diff --git a/src/benchmarks/eo/eo_bench_eo_add.c b/src/benchmarks/eo/eo_bench_eo_add.c
index 462f3b9c56..7bd10d8109 100644
--- a/src/benchmarks/eo/eo_bench_eo_add.c
+++ b/src/benchmarks/eo/eo_bench_eo_add.c
@@ -7,41 +7,41 @@
 #include "class_simple.h"
 
 static void
-bench_eo_add_linear(int request)
+bench_efl_add_linear(int request)
 {
    int i;
    Eo **objs = calloc(request, sizeof(Eo *));
    for (i = 0 ; i < request ; i++)
-      objs[i] = eo_add(SIMPLE_CLASS, NULL);
+      objs[i] = efl_add(SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i++)
-      eo_unref(objs[i]);
+      efl_unref(objs[i]);
    free(objs);
 }
 
 static void
-bench_eo_add_jump_by_2(int request)
+bench_efl_add_jump_by_2(int request)
 {
    int i;
    Eo **objs = calloc(request, sizeof(Eo *));
    for (i = 0 ; i < request ; i++)
-      objs[i] = eo_add(SIMPLE_CLASS, NULL);
+      objs[i] = efl_add(SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i += 2)
-      eo_unref(objs[i]);
+      efl_unref(objs[i]);
 
    for (i = 0 ; i < request ; i += 2)
-      objs[i] = eo_add(SIMPLE_CLASS, NULL);
+      objs[i] = efl_add(SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i++)
-      eo_unref(objs[i]);
+      efl_unref(objs[i]);
    free(objs);
 }
 
-void eo_bench_eo_add(Eina_Benchmark *bench)
+void eo_bench_efl_add(Eina_Benchmark *bench)
 {
-   eina_benchmark_register(bench, "eo_add_linear",
-         EINA_BENCHMARK(bench_eo_add_linear), _EO_BENCH_TIMES(1000, 10, 50000));
-   eina_benchmark_register(bench, "eo_add_jump_by_2",
-         EINA_BENCHMARK(bench_eo_add_jump_by_2), _EO_BENCH_TIMES(1000, 10, 50000));
+   eina_benchmark_register(bench, "efl_add_linear",
+         EINA_BENCHMARK(bench_efl_add_linear), _EO_BENCH_TIMES(1000, 10, 50000));
+   eina_benchmark_register(bench, "efl_add_jump_by_2",
+         EINA_BENCHMARK(bench_efl_add_jump_by_2), _EO_BENCH_TIMES(1000, 10, 50000));
 }
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 485f29725f..d9279901e1 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -10,44 +10,44 @@ static void
 bench_eo_do_simple(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    for (i = 0 ; i < request ; i++)
      {
         simple_a_set(obj, i);
      }
 
-   eo_unref(obj);
+   efl_unref(obj);
 }
 
 static void
 bench_eo_do_two_objs(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
    for (i = 0 ; i < request ; i++)
      {
         simple_a_set(obj, i);
         simple_a_set(obj2, i);
      }
 
-   eo_unref(obj);
-   eo_unref(obj2);
+   efl_unref(obj);
+   efl_unref(obj2);
 }
 
 static void
 bench_eo_do_two_objs_growing_stack(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
    for (i = 0 ; i < request ; i++)
      {
         simple_other_call(obj, obj2, 20);
      }
 
-   eo_unref(obj);
-   eo_unref(obj2);
+   efl_unref(obj);
+   efl_unref(obj2);
 }
 
 static const Efl_Class *cur_klass;
@@ -55,11 +55,11 @@ static const Efl_Class *cur_klass;
 static void
 _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
 {
-   simple_a_set(eo_super(obj, cur_klass), a);
+   simple_a_set(efl_super(obj, cur_klass), a);
 }
 
 static Efl_Op_Description op_desc[] = {
-     EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
 };
 
 static void
@@ -68,23 +68,23 @@ bench_eo_do_super(int request)
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple2",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_desc),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_desc),
         NULL,
         0,
         NULL,
         NULL
    };
-   cur_klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
+   cur_klass = efl_class_new(&class_desc, SIMPLE_CLASS, NULL);
 
    int i;
-   Eo *obj = eo_add(cur_klass, NULL);
+   Eo *obj = efl_add(cur_klass, NULL);
    for (i = 0 ; i < request ; i++)
      {
         simple_a_set(obj, i);
      }
 
-   eo_unref(obj);
+   efl_unref(obj);
 }
 
 void eo_bench_eo_do(Eina_Benchmark *bench)
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index 822a0c1cd0..941e5d9b32 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -96,7 +96,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
         return NULL;
      }
 
-   view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(eo_self, NULL));
+   view = efl_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(efl_self, NULL));
 
    id = elm_app_server_view_id_get(view);
    pkg = elm_app_server_package_get(app_server);
@@ -126,7 +126,7 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
    title = elm_app_server_title_get(event->object);
 
    printf("Closing: %s\n", title);
-   eo_unref(event->object);
+   efl_unref(event->object);
 }
 
 Elm_App_Server *
@@ -136,7 +136,7 @@ test_application_server_common(const char *pkg)
    Elm_App_Server_View *view;
    Elm_App_Server *server;
 
-   server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb));
+   server = efl_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(efl_self, pkg, _create_view_cb));
    elm_app_server_title_set(server, pkg);
    views_iter = elm_app_server_views_get(server);
    efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index 51ce46a2a4..a8d24bbc73 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -55,7 +55,7 @@ _elm_code_test_welcome_setup(Evas_Object *parent)
    Elm_Code_Widget *widget;
 
    code = elm_code_create();
-   widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
+   widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
    elm_obj_code_widget_font_set(widget, NULL, 12);
    efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
    efl_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
@@ -83,7 +83,7 @@ _elm_code_test_editor_setup(Evas_Object *parent, Eina_Bool log)
    Elm_Code_Widget *widget;
 
    code = elm_code_create();
-   widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
+   widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
    elm_obj_code_widget_font_set(widget, NULL, 14);
    elm_obj_code_widget_editable_set(widget, EINA_TRUE);
    elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE);
@@ -113,7 +113,7 @@ _elm_code_test_mirror_setup(Elm_Code *code, char *font_name, Evas_Object *parent
 {
    Elm_Code_Widget *widget;
 
-   widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
+   widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
    elm_obj_code_widget_font_set(widget, font_name, 11);
    elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE);
 
@@ -131,7 +131,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
    Elm_Code *code;
 
    code = elm_code_create();
-   diff = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
+   diff = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
 
    evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 5f58b37578..f3983f5afe 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -2991,7 +2991,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
 
-   en = eo_add(EFL_UI_TEXT_CLASS, win);
+   en = efl_add(EFL_UI_TEXT_CLASS, win);
    printf("Added Efl.Ui.Text object\n");
    efl_text_set(en, "Hello world! Goodbye world! This is a test text for the"
          " new UI Text widget.\xE2\x80\xA9This is the next paragraph.\nThis"
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 094ca19172..3d7c9de778 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -166,12 +166,12 @@ _win_del(void *data, const Eo_Event *ev EINA_UNUSED)
    free(td);
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(rect_pointer_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(rect_pointer_callbacks,
 { EFL_EVENT_POINTER_DOWN, _pointer_down },
 { EFL_EVENT_POINTER_MOVE, _pointer_move },
 { EFL_EVENT_POINTER_UP, _pointer_up })
 
-EO_CALLBACKS_ARRAY_DEFINE(win_key_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(win_key_callbacks,
 { EFL_EVENT_KEY_DOWN, _key_down },
 { EFL_EVENT_KEY_UP, _key_up })
 
@@ -186,7 +186,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    win = elm_win_util_standard_add("buttons", "Buttons");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bx = eo_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(eo_self, EFL_ORIENT_VERTICAL));
+   bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_self, EFL_ORIENT_VERTICAL));
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bx, -1, -1);
    efl_pack(win, bx);
@@ -216,7 +216,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    efl_pack(bx, bt);
    evas_object_show(bt);
 
-   o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, -1, -1);
    efl_pack(bx, o);
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 2cf4d115d5..12e20bf690 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -636,10 +636,10 @@ test_glview(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_config_accel_preference_set(accel);
    eina_stringshare_del(accel);
 #else
-   win = eo_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
-                efl_ui_win_name_set(eo_self, "glview"),
-                efl_text_set(eo_self, "GLView"),
-                efl_ui_win_accel_preference_set(eo_self, "gl:depth"));
+   win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
+                efl_ui_win_name_set(efl_self, "glview"),
+                efl_text_set(efl_self, "GLView"),
+                efl_ui_win_accel_preference_set(efl_self, "gl:depth"));
    elm_win_autodel_set(win, EINA_TRUE);
 #endif
 
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index 59d7062a47..bd620c8b95 100644
--- a/src/bin/elementary/test_grid_static.c
+++ b/src/bin/elementary/test_grid_static.c
@@ -104,23 +104,23 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
    Eo *win, *gd, *bt, *rc, *en;
    api_data *api = calloc(1, sizeof(*api));
 
-   win = eo_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
-                efl_ui_win_name_set(eo_self, "grid"),
-                efl_text_set(eo_self, "Grid"),
-                efl_ui_win_autodel_set(eo_self, EINA_TRUE),
-                efl_event_callback_add(eo_self, EFL_EVENT_DEL, _win_del, api));
+   win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
+                efl_ui_win_name_set(efl_self, "grid"),
+                efl_text_set(efl_self, "Grid"),
+                efl_ui_win_autodel_set(efl_self, EINA_TRUE),
+                efl_event_callback_add(efl_self, EFL_EVENT_DEL, _win_del, api));
 
    static int run_count = 0;
    if (((run_count++) % 2) == 0)
      {
-        gd = eo_add(EFL_UI_GRID_STATIC_CLASS, win,
-                    efl_gfx_size_hint_weight_set(eo_self, 1, 1));
+        gd = efl_add(EFL_UI_GRID_STATIC_CLASS, win,
+                    efl_gfx_size_hint_weight_set(efl_self, 1, 1));
      }
    else
      {
-        gd = eo_add(EFL_UI_GRID_CLASS, win,
-                    efl_gfx_size_hint_weight_set(eo_self, 1, 1),
-                    efl_pack_layout_engine_set(eo_self, EFL_UI_GRID_STATIC_CLASS, NULL));
+        gd = efl_add(EFL_UI_GRID_CLASS, win,
+                    efl_gfx_size_hint_weight_set(efl_self, 1, 1),
+                    efl_pack_layout_engine_set(efl_self, EFL_UI_GRID_STATIC_CLASS, NULL));
      }
    efl_pack(win, gd);
    api->data.grid = gd;
@@ -176,27 +176,27 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
    efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
    efl_gfx_visible_set(bt, 1);
 
-   rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    efl_gfx_color_set(rc, 128, 0, 0, 128);
    efl_pack_grid(gd, rc, 40, 70, 20, 10);
    efl_gfx_visible_set(rc, 1);
 
-   rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    efl_gfx_color_set(rc, 0, 128, 0, 128);
    efl_pack_grid(gd, rc, 60, 70, 10, 10);
    efl_gfx_visible_set(rc, 1);
 
-   rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    efl_gfx_color_set(rc, 0, 0, 128, 128);
    efl_pack_grid(gd, rc, 40, 80, 10, 10);
    efl_gfx_visible_set(rc, 1);
 
-   rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    efl_gfx_color_set(rc, 128, 0, 128, 128);
    efl_pack_grid(gd, rc, 50, 80, 10, 10);
    efl_gfx_visible_set(rc, 1);
 
-   rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    efl_gfx_color_set(rc, 128, 64, 0, 128);
    efl_pack_grid(gd, rc, 60, 80, 10, 10);
    efl_gfx_visible_set(rc, 1);
diff --git a/src/bin/elementary/test_nstate.c b/src/bin/elementary/test_nstate.c
index 9444fb11d2..cac6a6974f 100644
--- a/src/bin/elementary/test_nstate.c
+++ b/src/bin/elementary/test_nstate.c
@@ -29,7 +29,7 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
 
-   nstate = eo_add(EFL_UI_NSTATE_CLASS, win);
+   nstate = efl_add(EFL_UI_NSTATE_CLASS, win);
    efl_ui_nstate_count_set(nstate, 5);
    elm_object_text_set(nstate, "nstate = 0");
    elm_box_pack_end(bx, nstate);
diff --git a/src/bin/elementary/test_systray.c b/src/bin/elementary/test_systray.c
index 1271242d54..a1ddeb379c 100644
--- a/src/bin/elementary/test_systray.c
+++ b/src/bin/elementary/test_systray.c
@@ -82,7 +82,7 @@ test_systray(void *data EINA_UNUSED,
    elm_menu_item_add(it, it2, NULL, "item 2",  _menu_clicked, "item 2");
 
    // Status Notifier Item Handler
-   item = eo_add(ELM_SYSTRAY_CLASS, win);
+   item = efl_add(ELM_SYSTRAY_CLASS, win);
    elm_obj_systray_icon_name_set(item, "elementary");
    elm_obj_systray_att_icon_name_set(item, "elementary");
    elm_obj_systray_menu_set(item, it);
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index df0ab2d5d6..8e57a585cc 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -300,7 +300,7 @@ _app_open(const char *package)
           return;
      }
 
-   app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package));
+   app = efl_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(efl_self, package));
    efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
    efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
    efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index bf14767f5f..4ce6950114 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -177,14 +177,14 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
 static void
 custom_check_cb(void *data, const Eo_Event *event)
 {
-   EO_OVERRIDE_OPS_DEFINE(custom_layout_ops,
-                          EO_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update));
+   EFL_OBJECT_OVERRIDE_OPS_DEFINE(custom_layout_ops,
+                          EFL_OBJECT_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update));
 
    Eina_Bool chk = elm_check_selected_get(event->object);
    Eo *obj = data;
 
    // Overriding just the one function we need
-   eo_override(obj, chk ? &custom_layout_ops : NULL);
+   efl_object_override(obj, chk ? &custom_layout_ops : NULL);
 
    // Layout request is required as the pack object doesn't know the layout
    // function was just overridden.
@@ -204,7 +204,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_win_autodel_set(win, EINA_TRUE);
    efl_gfx_size_set(win, 600, 400);
 
-   vbox = eo_add(EFL_UI_BOX_CLASS, win);
+   vbox = efl_add(EFL_UI_BOX_CLASS, win);
    efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
    efl_orientation_set(vbox, EFL_ORIENT_DOWN);
    efl_gfx_size_hint_weight_set(vbox, 1, 1);
@@ -214,7 +214,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
 
 
    // create here to pass in cb
-   bottombox = eo_add(EFL_UI_BOX_CLASS, win);
+   bottombox = efl_add(EFL_UI_BOX_CLASS, win);
 
 
    /* controls */
@@ -225,15 +225,15 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    efl_pack(vbox, f);
    efl_gfx_visible_set(f, 1);
 
-   hbox = eo_add(EFL_UI_BOX_CLASS, win);
+   hbox = efl_add(EFL_UI_BOX_CLASS, win);
    elm_object_content_set(f, hbox);
    efl_pack_padding_set(hbox, 10, 0, EINA_TRUE);
    efl_gfx_visible_set(hbox, 1);
 
 
    /* weights radio group */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_pack(hbox, bx);
    efl_gfx_visible_set(bx, 1);
@@ -286,8 +286,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
 
 
    /* misc */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -349,8 +349,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
 
 
    /* user min size setter */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -376,8 +376,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
 
 
    /* inner box padding */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -403,8 +403,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
 
 
    /* outer margin */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -430,8 +430,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
 
 
    /* Box align */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 1, 1);
    efl_pack(hbox, bx);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 0617bd91eb..bc5fb95ed3 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -20,15 +20,15 @@ static void _custom_engine_layout_do(Eo *obj, void *pd, Efl_Pack *pack, const vo
 
 /* Common Efl Class boilerplate. */
 static const Efl_Op_Description custom_engine_op_desc[] = {
-   EO_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do),
+   EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do),
 };
 
 static const Efl_Class_Description custom_engine_class_desc = {
-   EO_VERSION, "Custom Layout Engine", EO_CLASS_TYPE_INTERFACE,
-   EO_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
+   EO_VERSION, "Custom Layout Engine", EFL_CLASS_TYPE_INTERFACE,
+   EFL_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
 };
 
-EO_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL)
+EFL_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL)
 
 #define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get()
 
@@ -73,7 +73,7 @@ weights_cb(void *data, const Eo_Event *event)
         break;
       case CUSTOM:
         // See also test_ui_box.c for another solution for custom layouts
-        // using eo_override.
+        // using efl_object_override.
         efl_pack_layout_engine_set(grid, CUSTOM_ENGINE_CLASS, NULL);
         break;
      }
@@ -191,7 +191,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
    elm_win_autodel_set(win, EINA_TRUE);
    efl_gfx_size_set(win, 600, 400);
 
-   vbox = eo_add(EFL_UI_BOX_CLASS, win);
+   vbox = efl_add(EFL_UI_BOX_CLASS, win);
    efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
    efl_orientation_set(vbox, EFL_ORIENT_DOWN);
    efl_gfx_size_hint_weight_set(vbox, 1, 1);
@@ -201,7 +201,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 
 
    // create here to pass in cb
-   grid = eo_add(EFL_UI_GRID_CLASS, win);
+   grid = efl_add(EFL_UI_GRID_CLASS, win);
 
 
    /* controls */
@@ -212,15 +212,15 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
    efl_pack(vbox, f);
    efl_gfx_visible_set(f, 1);
 
-   hbox = eo_add(EFL_UI_BOX_CLASS, win);
+   hbox = efl_add(EFL_UI_BOX_CLASS, win);
    elm_object_content_set(f, hbox);
    efl_pack_padding_set(hbox, 10, 0, EINA_TRUE);
    efl_gfx_visible_set(hbox, 1);
 
 
    /* weights radio group */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_pack(hbox, bx);
    efl_gfx_visible_set(bx, 1);
@@ -282,8 +282,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 
 
    /* min size setter */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0.5, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -309,8 +309,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 
 
    /* inner box padding */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -336,8 +336,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 
 
    /* outer margin */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 0, 1);
    efl_pack(hbox, bx);
@@ -363,8 +363,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 
 
    /* button margins */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 1, 1);
    efl_pack(hbox, bx);
@@ -390,8 +390,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
 
 
    /* ro info */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 1, 1);
    efl_pack(hbox, bx);
@@ -428,7 +428,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
    elm_object_content_set(f, grid);
    efl_gfx_visible_set(grid, 1);
 
-   objects[i++] = o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
+   objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
    efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
    efl_gfx_size_hint_min_set(o, 10, 10);
@@ -525,7 +525,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    elm_win_autodel_set(win, EINA_TRUE);
    efl_gfx_size_set(win, 600, 400);
 
-   vbox = eo_add(EFL_UI_BOX_CLASS, win);
+   vbox = efl_add(EFL_UI_BOX_CLASS, win);
    efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
    efl_orientation_set(vbox, EFL_ORIENT_DOWN);
    efl_gfx_size_hint_weight_set(vbox, 1, 1);
@@ -535,7 +535,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 
 
    // create here to pass in cb
-   grid = eo_add(EFL_UI_GRID_CLASS, win);
+   grid = efl_add(EFL_UI_GRID_CLASS, win);
 
 
    /* controls */
@@ -546,7 +546,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    efl_pack(vbox, f);
    efl_gfx_visible_set(f, 1);
 
-   hbox = eo_add(EFL_UI_BOX_CLASS, win);
+   hbox = efl_add(EFL_UI_BOX_CLASS, win);
    elm_object_content_set(f, hbox);
    efl_pack_padding_set(hbox, 5, 0, EINA_TRUE);
    efl_gfx_visible_set(hbox, 1);
@@ -571,8 +571,8 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 
 
    /* ro info */
-   bx = eo_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+               efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
    efl_gfx_size_hint_align_set(bx, 0, -1);
    efl_gfx_size_hint_weight_set(bx, 1, 1);
    efl_pack(hbox, bx);
diff --git a/src/bin/elementary/test_video.c b/src/bin/elementary/test_video.c
index 0dfca3e7ea..60718ede79 100644
--- a/src/bin/elementary/test_video.c
+++ b/src/bin/elementary/test_video.c
@@ -30,7 +30,7 @@ test_video(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
    elm_win_resize_object_add(win, bg);
    evas_object_show(bg);
 
-   video = elm_video_add(win);
+   video = elm_videfl_add(win);
    evas_object_size_hint_weight_set(video, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(video);
 
diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c
index 1c222145c1..b9b8d84d8c 100644
--- a/src/bin/elementary/test_win_inline.c
+++ b/src/bin/elementary/test_win_inline.c
@@ -225,7 +225,7 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
    elm_win_resize_object_add(win, bg);
    evas_object_show(bg);
 
-   box = eo_add(EFL_UI_BOX_CLASS, win);
+   box = efl_add(EFL_UI_BOX_CLASS, win);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    efl_pack(win, box);
    evas_object_show(box);
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 5c2259dbe3..96e2618ee7 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -46,7 +46,7 @@ static const Efl_Class_Description _@#class_class_desc = {\n\
      @#dtor_name\n\
 };\n\
 \n\
-EO_DEFINE_CLASS(@#klasstype_get, &_@#class_class_desc, @#list_inheritNULL);\
+EFL_DEFINE_CLASS(@#klasstype_get, &_@#class_class_desc, @#list_inheritNULL);\
 ";
 
 static const char
@@ -526,7 +526,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
         Eina_Bool ret_is_void = (!rettype || !strcmp(rettype, "void"));
         _class_func_env_create(class, eolian_function_name_get(funcid), ftype, &func_env);
         eina_strbuf_append_printf(eo_func_decl,
-              "EOAPI EO_%sFUNC_BODY%s%s(%s",
+              "EOAPI EFL_%sFUNC_BODY%s%s(%s",
               ret_is_void?"VOID_":"", has_params?"V":"",
               (ftype == EOLIAN_PROP_GET ||
                eolian_function_object_is_const(funcid) ||
@@ -553,7 +553,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
         if (has_params)
           {
              eina_strbuf_replace_all(full_params, " EINA_UNUSED", "");
-             eina_strbuf_append_printf(eo_func_decl, ", EO_FUNC_CALL(%s)%s",
+             eina_strbuf_append_printf(eo_func_decl, ", EFL_FUNC_CALL(%s)%s",
                    eina_strbuf_string_get(params),
                    eina_strbuf_string_get(full_params));
           }
@@ -562,10 +562,10 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
         if(has_promise)
           {
              eina_strbuf_append_printf(fbody,
-                                       "#undef _EO_API_BEFORE_HOOK\n#undef _EO_API_AFTER_HOOK\n#undef _EO_API_CALL_HOOK\n"
-                                       "#define _EO_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n"
-                                       "#define _EO_API_AFTER_HOOK _EINA_PROMISE_AFTER_HOOK(%s)\n"
-                                       "#define _EO_API_CALL_HOOK(x) _EINA_PROMISE_CALL_HOOK(EO_FUNC_CALL(%s))\n\n",
+                                       "#undef _EFL_OBJECT_API_BEFORE_HOOK\n#undef _EFL_OBJECT_API_AFTER_HOOK\n#undef _EFL_OBJECT_API_CALL_HOOK\n"
+                                       "#define _EFL_OBJECT_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n"
+                                       "#define _EFL_OBJECT_API_AFTER_HOOK _EINA_PROMISE_AFTER_HOOK(%s)\n"
+                                       "#define _EFL_OBJECT_API_CALL_HOOK(x) _EINA_PROMISE_CALL_HOOK(EFL_FUNC_CALL(%s))\n\n",
                                        promise_value_type, !rettype ? "void" : rettype,
                                        eina_strbuf_string_get(impl_full_params),
                                        promise_param_name,
@@ -576,9 +576,9 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
 
         if(has_promise)
           {
-             eina_strbuf_append_printf(fbody, "\n#undef _EO_API_BEFORE_HOOK\n#undef _EO_API_AFTER_HOOK\n#undef _EO_API_CALL_HOOK\n"
-                                       "#define _EO_API_BEFORE_HOOK\n#define _EO_API_AFTER_HOOK\n"
-                                       "#define _EO_API_CALL_HOOK(x) x\n");
+             eina_strbuf_append_printf(fbody, "\n#undef _EFL_OBJECT_API_BEFORE_HOOK\n#undef _EFL_OBJECT_API_AFTER_HOOK\n#undef _EFL_OBJECT_API_CALL_HOOK\n"
+                                       "#define _EFL_OBJECT_API_BEFORE_HOOK\n#define _EFL_OBJECT_API_AFTER_HOOK\n"
+                                       "#define _EFL_OBJECT_API_CALL_HOOK(x) x\n");
           }
 
         eina_strbuf_free(eo_func_decl);
@@ -629,7 +629,7 @@ eo_op_desc_generate(const Eolian_Class *class, const Eolian_Function *fid, Eolia
    Eina_Bool is_virtual_pure = eolian_function_is_virtual_pure(fid, ftype);
    const char *class_str = "";
    if (eolian_function_is_class(fid)) class_str = "CLASS_";
-   eina_strbuf_append_printf(buf, "\n     EO_OP_%sFUNC(%s, ", class_str, func_env.lower_eo_func);
+   eina_strbuf_append_printf(buf, "\n     EFL_OBJECT_OP_%sFUNC(%s, ", class_str, func_env.lower_eo_func);
    if (!is_virtual_pure)
      {
         Eolian_Function_Type ftype2 = (Eolian_Function_Type) eina_hash_find(_funcs_params_init, funcname);
@@ -697,16 +697,16 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
    switch(eolian_class_type_get(class))
     {
       case EOLIAN_CLASS_REGULAR:
-        str_classtype = "EO_CLASS_TYPE_REGULAR";
+        str_classtype = "EFL_CLASS_TYPE_REGULAR";
         break;
       case EOLIAN_CLASS_ABSTRACT:
-        str_classtype = "EO_CLASS_TYPE_REGULAR_NO_INSTANT";
+        str_classtype = "EFL_CLASS_TYPE_REGULAR_NO_INSTANT";
         break;
       case EOLIAN_CLASS_MIXIN:
-        str_classtype = "EO_CLASS_TYPE_MIXIN";
+        str_classtype = "EFL_CLASS_TYPE_MIXIN";
         break;
       case EOLIAN_CLASS_INTERFACE:
-        str_classtype = "EO_CLASS_TYPE_INTERFACE";
+        str_classtype = "EFL_CLASS_TYPE_INTERFACE";
         break;
       default:
         break;
@@ -831,7 +831,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
               if (ftype != EOLIAN_PROP_GET)
                 {
                    Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, EOLIAN_PROP_SET, EINA_FALSE);
-                   eina_strbuf_append_printf(str_op, "\n     EO_OP_%sFUNC_OVERRIDE(%s, %s_%s_set),",
+                   eina_strbuf_append_printf(str_op, "\n     EFL_OBJECT_OP_%sFUNC_OVERRIDE(%s, %s_%s_set),",
                          class_str, rets, implname, funcname);
                    eo_bind_func_generate(class, fnid, EOLIAN_PROP_SET, str_bodyf, impl_desc, &impl_env);
                    eina_stringshare_del(rets);
@@ -840,7 +840,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
               if (ftype != EOLIAN_PROP_SET)
                 {
                    Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, EOLIAN_PROP_GET, EINA_FALSE);
-                   eina_strbuf_append_printf(str_op, "\n     EO_OP_%sFUNC_OVERRIDE(%s, %s_%s_get),",
+                   eina_strbuf_append_printf(str_op, "\n     EFL_OBJECT_OP_%sFUNC_OVERRIDE(%s, %s_%s_get),",
                          class_str, rets, implname, funcname);
                    eo_bind_func_generate(class, fnid, EOLIAN_PROP_GET, str_bodyf, impl_desc, &impl_env);
                    eina_stringshare_del(rets);
@@ -849,7 +849,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
            default:
              {
                 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, ftype, EINA_FALSE);
-                eina_strbuf_append_printf(str_op, "\n     EO_OP_%sFUNC_OVERRIDE(%s, %s_%s),",
+                eina_strbuf_append_printf(str_op, "\n     EFL_OBJECT_OP_%sFUNC_OVERRIDE(%s, %s_%s),",
                       class_str, rets, implname, funcname);
                 eo_bind_func_generate(class, fnid, ftype, str_bodyf, impl_desc, &impl_env);
                 eina_stringshare_del(rets);
@@ -933,13 +933,13 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
         eina_strbuf_replace_all(str_end, "@#ops_desc", eina_strbuf_string_get(ops_desc));
         eina_strbuf_free(ops_desc);
         _template_fill(tmpbuf,
-              "EO_CLASS_DESCRIPTION_OPS(_@#class_op_desc)",
+              "EFL_CLASS_DESCRIPTION_OPS(_@#class_op_desc)",
               class, NULL, NULL, EINA_TRUE);
      }
    else
      {
         eina_strbuf_replace_all(str_end, "@#ops_desc", "");
-        eina_strbuf_append_printf(tmpbuf, "EO_CLASS_DESCRIPTION_NOOPS()");
+        eina_strbuf_append_printf(tmpbuf, "EFL_CLASS_DESCRIPTION_NOOPS()");
      }
 
    eina_strbuf_replace_all(str_end, "@#functions_body", eina_strbuf_string_get(str_bodyf));
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 3aacf47708..cd161855df 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -173,7 +173,7 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina
                {
                   eina_strbuf_append_printf
                   (super_invok,
-                   "   %s_%s(eo_super(obj, %s_%s)%s);\n",
+                   "   %s_%s(efl_super(obj, %s_%s)%s);\n",
                    impl_env.lower_eo_prefix, eolian_function_name_get(foo),
                    class_env.upper_eo_prefix, class_env.upper_classtype,
                    eina_strbuf_string_get(short_params));
diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c
index 2570a9e20d..9d88c756a6 100644
--- a/src/examples/ecore/ecore_audio_custom.c
+++ b/src/examples/ecore/ecore_audio_custom.c
@@ -56,9 +56,9 @@ main(int argc, const char *argv[])
 
    ecore_app_args_set(argc, argv);
 
-   out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
 
-   in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
+   in = efl_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
    if (!in)
      {
         printf("error when creating ecore audio source.\n");
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index e4ab597343..2bb8a21df1 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -252,7 +252,7 @@ main(int argc, const char *argv[])
      {
        if (!strncmp(argv[i], "tone:", 5))
          {
-            in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
+            in = efl_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
             if (!in)
               {
                  printf("error when creating ecore audio source.\n");
@@ -276,7 +276,7 @@ main(int argc, const char *argv[])
          }
        else
          {
-            in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
+            in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
             if (!in)
               {
                  printf("error when creating ecore audio source.\n");
@@ -307,7 +307,7 @@ main(int argc, const char *argv[])
 
    printf("Start: %s (%0.2fs)\n", name, length);
 
-   out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
    ret = ecore_audio_obj_out_input_attach(out, in);
    if (!ret)
      printf("Could not attach input %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 13abdb11e8..932a25781c 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
    ecore_audio_init();
 
 
-   in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
+   in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
    ecore_audio_obj_name_set(in, basename(argv[1]));
    ret = ecore_audio_obj_source_set(in, argv[1]);
    if (!ret) {
@@ -60,7 +60,7 @@ main(int argc, char *argv[])
 
    efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
 
-   out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
    ret = ecore_audio_obj_source_set(out, argv[2]);
    if (!ret) {
      printf("Could not set %s as output\n", argv[2]);
diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c
index 8831a4dfc8..5e6ba84cc2 100644
--- a/src/examples/ecore/ecore_idler_example.c
+++ b/src/examples/ecore/ecore_idler_example.c
@@ -110,7 +110,7 @@ main(void)
    ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
    ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
    ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
-//   ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eo_self, _idler_cb, &ctxt));
+//   ctxt.idler = efl_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_self, _idler_cb, &ctxt));
    ctxt.handler = ecore_event_handler_add(_event_type,
                                           _event_handler_cb,
                                           &ctxt);
diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c
index 73a09b38e4..2e0006c6f8 100644
--- a/src/examples/ecore/ecore_poller_example.c
+++ b/src/examples/ecore/ecore_poller_example.c
@@ -48,9 +48,9 @@ main(void)
    poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
    poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
 
-//   poller1 = eo_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
-//   poller2 = eo_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
-//   poller3 = eo_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
+//   poller1 = efl_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
+//   poller2 = efl_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
+//   poller3 = efl_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
 
 
    ecore_main_loop_begin();
@@ -61,9 +61,9 @@ main(void)
 //   ecore_poller_interval_set(poller2, 16, NULL);
    ecore_main_loop_begin();
 
-//   eo_unref(poller1);
-//   eo_unref(poller2);
-//   eo_unref(poller3);
+//   efl_unref(poller1);
+//   efl_unref(poller2);
+//   efl_unref(poller3);
    ecore_poller_del(poller1);
    ecore_poller_del(poller2);
    ecore_poller_del(poller3);
diff --git a/src/examples/eio/efl_io_manager_ls.c b/src/examples/eio/efl_io_manager_ls.c
index a411de1efb..ea2dcca422 100644
--- a/src/examples/eio/efl_io_manager_ls.c
+++ b/src/examples/eio/efl_io_manager_ls.c
@@ -15,7 +15,7 @@ void done_cb(void *data, void *value EINA_UNUSED)
     Efl_Io_Manager *job = data;
     printf("%s done listing files.\n", __FUNCTION__);
     ecore_main_loop_quit();
-    eo_unref(job);
+    efl_unref(job);
 }
 
 void error_cb(void *data, Eina_Error error)
@@ -25,7 +25,7 @@ void error_cb(void *data, Eina_Error error)
     printf("%s error: %s\n", __FUNCTION__, msg);
     ecore_main_loop_quit();
 
-    eo_unref(job);
+    efl_unref(job);
 }
 
 void filter_cb(void *data EINA_UNUSED, const Eo_Event *event)
@@ -51,7 +51,7 @@ void list_files(void *data)
     Eina_Promise *promise;
     const char *path = data;
 
-    Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+    Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
     efl_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Efl_Event_Cb)&filter_cb, NULL);
     promise = efl_io_manager_file_ls(job, path);
     eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL);
diff --git a/src/examples/eio/efl_io_manager_open.c b/src/examples/eio/efl_io_manager_open.c
index daa9ded23d..4c9f4a46a2 100644
--- a/src/examples/eio/efl_io_manager_open.c
+++ b/src/examples/eio/efl_io_manager_open.c
@@ -51,10 +51,10 @@ void done_open_cb(void *data, void* value)
 
 void open_file(const char *path)
 {
-    Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+    Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
     eina_promise_then(efl_io_manager_file_open(job, path, EINA_FALSE), &done_open_cb, &error_cb, job);
 
-    eo_unref(job);
+    efl_unref(job);
 }
 
 int main(int argc, char const *argv[])
diff --git a/src/examples/eio/efl_io_manager_open_multi.c b/src/examples/eio/efl_io_manager_open_multi.c
index 291f5a2a1e..e55f039de7 100644
--- a/src/examples/eio/efl_io_manager_open_multi.c
+++ b/src/examples/eio/efl_io_manager_open_multi.c
@@ -17,7 +17,7 @@ void error_cb(void *data, Eina_Error error)
     EINA_LOG_ERR("error: %s", msg);
 
     Efl_Io_Manager *job = data;
-    eo_unref(job);
+    efl_unref(job);
 
     ecore_main_loop_quit();
 }
@@ -31,7 +31,7 @@ void done_closing_cb(void *data, void* value EINA_UNUSED)
     printf("%s closed file.\n", __FUNCTION__);
 
     Efl_Io_Manager *job = data;
-    eo_unref(job);
+    efl_unref(job);
 
     ecore_main_loop_quit();
 }
@@ -74,7 +74,7 @@ void open_file(const char *path, const char *path2)
     Eina_Promise *promise;
     Eina_Promise *tasks[3] = {NULL, NULL, NULL};
 
-    Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+    Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
     tasks[0] = efl_io_manager_file_open(job, path, EINA_FALSE);
     tasks[1] = efl_io_manager_file_open(job, path2, EINA_FALSE);
     promise = eina_promise_all(eina_carray_iterator_new((void**)&tasks[0]));
diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c
index 9f8d03d704..4c57f7a802 100644
--- a/src/examples/eio/eio_sentry.c
+++ b/src/examples/eio/eio_sentry.c
@@ -27,7 +27,7 @@ void
 monitor_stuff(void *data)
 {
     const char *path = data;
-    Eio_Sentry *sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+    Eio_Sentry *sentry = efl_add(EIO_SENTRY_CLASS, NULL);
     efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
 
     printf("Starting monitoring path %s\n", path);
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index ea43bc4020..5edbcc82ed 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -134,7 +134,7 @@ main(int argc, char **argv EINA_UNUSED)
    if (argc > 1) bus = argv[1];
    if (argc > 2) path = argv[2];
 
-   root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
+   root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
 
    Eina_Promise *promises[] = { NULL, NULL, NULL};
    promises[0] = efl_model_children_slice_get(root, 0, 0);
@@ -145,6 +145,6 @@ main(int argc, char **argv EINA_UNUSED)
 
    ecore_main_loop_begin();
 
-   eo_unref(root);
+   efl_unref(root);
    eldbus_shutdown();
 }
diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c
index 0ce96ed4ff..7ff577c2f0 100644
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -462,7 +462,7 @@ zoom_factor_set(double new_zoom_factor)
         evas_object_resize(map, src_size, src_size);
 
         /* Apply updated texture source. */
-        texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+        texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
         evas_canvas3d_texture_source_set(texture_diffuse, map);
         evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
 
@@ -845,7 +845,7 @@ skybox_setup(void)
    Evas_Object      *skybox_image;
    char              buf[PATH_MAX];
 
-   skybox_mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   skybox_mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_vertex_count_set(skybox_mesh, 24);
    evas_canvas3d_mesh_frame_add(skybox_mesh, 0);
    evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &skybox_vertices[0]);
@@ -863,10 +863,10 @@ skybox_setup(void)
    evas_object_show(skybox_image);
 
    /* Set skybox texture material. */
-   skybox_material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   skybox_material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_mesh_frame_material_set(skybox_mesh, 0, skybox_material);
 
-   skybox_texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   skybox_texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    evas_canvas3d_texture_source_set(skybox_texture_diffuse, skybox_image);
    evas_canvas3d_texture_source_visible_set(skybox_texture_diffuse, EINA_FALSE);
@@ -880,7 +880,7 @@ skybox_setup(void)
    evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
    evas_canvas3d_material_shininess_set(skybox_material, 50.0);
 
-   skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   skybox_mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
    evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
    evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
@@ -921,7 +921,7 @@ static void
 camera_setup(void)
 {
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 100.0);
 
    /* Set camera position. */
@@ -939,7 +939,7 @@ camera_setup(void)
    camera_right_vec.y = 0.0;
    camera_right_vec.z = 0.0;
 
-   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
@@ -949,12 +949,12 @@ camera_setup(void)
 static void
 light_setup(void)
 {
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0);
 
-   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -967,7 +967,7 @@ mesh_setup(void)
    /* Create a sphere mesh. */
    sphere_init(50);
 
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_vertex_count_set(mesh, vertex_count);
    evas_canvas3d_mesh_frame_add(mesh, 0);
    evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &vertices[0].position);
@@ -978,14 +978,14 @@ mesh_setup(void)
    evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
 
-   texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_source_set(texture_diffuse, map);
    evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
 
-   texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   texture_normal = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_source_set(texture_normal, normal_map);
    evas_canvas3d_texture_source_visible_set(texture_normal, EINA_FALSE);
 
@@ -1000,7 +1000,7 @@ mesh_setup(void)
    evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
    evas_canvas3d_material_shininess_set(material, 50.0);
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(root_node, mesh_node);
    evas_canvas3d_node_mesh_add(mesh_node, mesh);
    evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
@@ -1155,7 +1155,7 @@ elm_main(int argc, char **argv)
    evas_object_show(bg);
 
    /* Add an image which shows a scene. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
 
@@ -1165,10 +1165,10 @@ elm_main(int argc, char **argv)
    evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_WHEEL, mouse_wheel_cb, NULL);
 
    /* Add a scene object. */
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add a root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    skybox_setup();
    texture_source_setup();
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index dc40bb5cf4..a53d233e21 100644
--- a/src/examples/elementary/evas3d_object_on_button_example.c
+++ b/src/examples/elementary/evas3d_object_on_button_example.c
@@ -158,12 +158,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0);
@@ -173,13 +173,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -189,8 +189,8 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material and texture as widget button. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    evas_canvas3d_texture_source_set(data->texture, btn);
    evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE);
@@ -205,7 +205,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
    evas_canvas3d_mesh_frame_add(data->mesh, 0);
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -219,7 +219,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
@@ -227,12 +227,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -256,7 +256,7 @@ elm_main(int argc, char **argv)
    evas = evas_object_evas_get(win);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index 57e8a7f6a8..51e47d3faf 100644
--- a/src/examples/elementary/evas3d_scene_on_button_example.c
+++ b/src/examples/elementary/evas3d_scene_on_button_example.c
@@ -119,12 +119,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -134,13 +134,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -150,7 +150,7 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -161,7 +161,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
    evas_canvas3d_mesh_frame_add(data->mesh, 0);
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -174,7 +174,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
@@ -182,12 +182,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH - d_w, HEIGHT - d_h);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -247,7 +247,7 @@ elm_main(int argc, char **argv)
 
    _scene_setup(&data);
 
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_visible_set(image, EINA_TRUE);
 
    /* Set the image object as render target for 3D scene. */
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index b669c02869..d28a593f8c 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -32,10 +32,10 @@ static void
 _cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Efl_Model_Test_Filemvc_Data *priv = (Efl_Model_Test_Filemvc_Data *)data;
-   eo_unref(priv->fileview);
-   eo_unref(priv->treeview);
-   eo_unref(priv->formview);
-   eo_unref(priv->treemodel);
+   efl_unref(priv->fileview);
+   efl_unref(priv->treeview);
+   efl_unref(priv->formview);
+   efl_unref(priv->treemodel);
 }
 
 static Eina_Bool
@@ -65,7 +65,7 @@ _promise_then(void *data, void *value)
    Eo *model;
 
    eina_value_get(value, &path);
-   model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
+   model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
    elm_view_list_model_set(priv->fileview, model);
 }
 
@@ -144,12 +144,12 @@ elm_main(int argc, char **argv)
    else dirname = EFL_MODEL_TEST_FILENAME_PATH;
 
    //treemodel
-   priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname));
+   priv.treemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname));
    eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
 
    //treeview
    genlist = elm_genlist_add(win);
-   priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, NULL));
+   priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, NULL));
    elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
    elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
    elm_view_list_model_set(priv.treeview, priv.treemodel);
@@ -164,7 +164,7 @@ elm_main(int argc, char **argv)
 
    //listview
    genlist = elm_genlist_add(win);
-   priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
+   priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
    elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
    elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub");
 
@@ -178,7 +178,7 @@ elm_main(int argc, char **argv)
    bxr = elm_box_add(win);
    _widget_init(bxr);
    elm_object_part_content_set(vpanes, "right", bxr);
-   priv.formview = eo_add(ELM_VIEW_FORM_CLASS, NULL);
+   priv.formview = efl_add(ELM_VIEW_FORM_CLASS, NULL);
 
    /*Label widget */
    elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name"));
diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index a3a434ef1c..a4613ef54b 100644
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -27,8 +27,8 @@ static void
 _cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Efl_Model_Test_Fileview_Data *priv = (Efl_Model_Test_Fileview_Data *)data;
-   eo_unref(priv->fileview);
-   eo_unref(priv->filemodel);
+   efl_unref(priv->fileview);
+   efl_unref(priv->filemodel);
 }
 
 EAPI_MAIN int
@@ -54,8 +54,8 @@ elm_main(int argc, char **argv)
    evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(genlist);
 
-   priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname));
-   priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
+   priv.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname));
+   priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
    elm_view_list_model_set(priv.fileview, priv.filemodel);
    evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
 
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 1dd5822bba..70a40cd00e 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -248,7 +248,7 @@ void _init_bounding()
         20, 21, 22, 22, 21, 23
      };
 
-   globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
+   globalGraphical.material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
 
    evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -259,7 +259,7 @@ void _init_bounding()
    evas_canvas3d_material_shininess_set(globalGraphical.material_box, 100.0);
 
    /* Setup mesh. */
-   globalGraphical.mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
+   globalGraphical.mesh_box = efl_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
    evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh_box, 24);
    evas_canvas3d_mesh_frame_add(globalGraphical.mesh_box, 0);
    evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -272,7 +272,7 @@ void _init_bounding()
    evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
 
    globalGraphical.mesh_nodebox =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 0, -30.0, 0.0));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, 0, -30.0, 0.0));
    evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox);
    evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box);
 }
@@ -307,7 +307,7 @@ _change_scene_setup()
    _sphere_init(globalGraphical.precision);
    for (i = 0; i < quantity; i++)
      {
-        globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
+        globalGraphical.mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
         if (!globalGraphical.model_path)
           {
               evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
@@ -359,7 +359,7 @@ _change_scene_setup()
    for (i = 0; i < quantity; i++)
      {
         globalGraphical.mesh_node =
-           eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
+           efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
         if (globalGraphical.model_path)
           evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
         evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
@@ -394,23 +394,23 @@ _init_scene(Evas_Object *img)
    /*Allocate memory - eina_mempool*/
 
    /* Add a scene object .*/
-   globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
+   globalGraphical.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
 
    /* Add the root node for the scene. */
-   globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   globalGraphical.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
+   globalGraphical.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
    evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0);
 
    globalGraphical.camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera);
    evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0);
    evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.camera_node);
 
-   globalGraphical.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
+   globalGraphical.light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
    evas_canvas3d_light_ambient_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
@@ -418,15 +418,15 @@ _init_scene(Evas_Object *img)
    evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15);
 
    globalGraphical.light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light);
    evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0);
    evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.light_node);
 
 
-   globalGraphical.material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
-   globalGraphical.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
+   globalGraphical.material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
+   globalGraphical.texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
    evas_canvas3d_texture_file_set(globalGraphical.texture, "target_texture.png", NULL);
    evas_canvas3d_texture_filter_set(globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
    evas_canvas3d_texture_wrap_set(globalGraphical.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -444,7 +444,7 @@ _init_scene(Evas_Object *img)
 
    for (i = 0; i < quantity; i++)
      {
-        globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
+        globalGraphical.mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
         if (!globalGraphical.model_path)
           {
               evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
@@ -474,7 +474,7 @@ _init_scene(Evas_Object *img)
    for (i = 0; i < quantity; i++)
      {
         globalGraphical.mesh_node =
-           eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
+           efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
         if (globalGraphical.model_path)
           evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
         evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
diff --git a/src/examples/elementary/performance/performance.c b/src/examples/elementary/performance/performance.c
index cdfe6bec9e..1b1091b5c4 100644
--- a/src/examples/elementary/performance/performance.c
+++ b/src/examples/elementary/performance/performance.c
@@ -622,7 +622,7 @@ EAPI_MAIN
    evas_object_show(startexitbox);
 
    evas = evas_object_evas_get(win);
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
 
    btnstart = elm_button_add(win);
    elm_object_text_set(btnstart, "Apply");
diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index cb829a3e25..9c7f55d541 100644
--- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -434,10 +434,10 @@ _quit_game(void *data EINA_UNUSED, Evas_Object *btn EINA_UNUSED, void *ev EINA_U
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0);
 
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -458,14 +458,14 @@ _animate_camera(void *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
 
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0);
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -476,8 +476,8 @@ _light_setup(Scene_Data *data)
 static void
 _mesh_cube_setup(Scene_Data *data)
 {
-   data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->mesh_cube = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->material_cube = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
@@ -505,9 +505,9 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
    Eo *node = NULL;
    Eo *material = NULL;
 
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -555,7 +555,7 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count)
         Eo *node = NULL;
 
         alpha = d_alpha * i * M_PI / 180;
-        node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+        node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
         evas_canvas3d_node_mesh_add(node, data->mesh_cube);
         evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
@@ -572,9 +572,9 @@ _mesh_ball_setup(Scene_Data *data)
 {
    _sphere_init(100);
 
-   data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->material_ball = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->mesh_node_ball = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    /* Setup material for ball. */
    evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
@@ -608,10 +608,10 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
 {
    Eina_List *l = NULL;
    Eo *item = NULL;
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE);
@@ -813,7 +813,7 @@ elm_main(int argc, char **argv)
 
    _scene_setup(&data, 10.0, 10);
 
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_visible_set(image, EINA_TRUE);
    efl_canvas_scene3d_set(image, data.scene);
 
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index d2328a699e..c113f6dc90 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -155,7 +155,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
    evas_object_resize(em, w - 20, h - 20);
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
        { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb },
        { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb },
        { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb },
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index 71c8e7dc06..febd0e330f 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -152,7 +152,7 @@ _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
 	   emotion_object_progress_info_get(ev->object));
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
        { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb },
        { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb },
        { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb },
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index 7cf57e3288..325a03e08e 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -84,7 +84,7 @@ _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
    _display_info(ev->object);
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
        { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb },
        { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_finished_cb },
        { EMOTION_OBJECT_EVENT_OPEN_DONE, _open_done_cb },
diff --git a/src/examples/eolian_cxx/colourable.c b/src/examples/eolian_cxx/colourable.c
index 3dcaf36728..141bd55c1b 100644
--- a/src/examples/eolian_cxx/colourable.c
+++ b/src/examples/eolian_cxx/colourable.c
@@ -35,7 +35,7 @@ _ns_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED
           = eina_log_domain_register("colourable", EINA_COLOR_BLUE);
      }
    DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 void
@@ -47,7 +47,7 @@ _ns_colourable_efl_object_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
         _ns_colourable_impl_logdomain = 0;
      }
    DBG("_ns_colourable_destructor()\n");
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 void
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index cd2509f274..6399b1ef36 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -142,40 +142,40 @@ main(void)
 
    evas = ecore_evas_get(ecore_evas);
 
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
 
    camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_member_add(root_node, camera_node);
    evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(light, EINA_TRUE);
 
    light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(root_node, light_node);
 
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    efl_file_set(mesh, model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
    evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
-   texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(texture, image_path, NULL);
    evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -189,16 +189,16 @@ main(void)
    evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(material, 50.0);
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
-   mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_box_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
-   material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
 
-   cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
-   mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   mesh_box = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube);
    evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
    evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR);
@@ -215,12 +215,12 @@ main(void)
    evas_canvas3d_scene_camera_node_set(scene, camera_node);
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
    evas_object_focus_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 51dff5a1c6..8e41cf1f97 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -148,12 +148,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
   data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
   evas_canvas3d_node_camera_set(data->camera_node, data->camera);
   evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
@@ -165,13 +165,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -189,7 +189,7 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
 static void
 _mesh_setup(Scene_Data *data)
 {
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -199,7 +199,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2);
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
-   data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material1 = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -209,24 +209,24 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2);
    evas_canvas3d_material_shininess_set(data->material1, 100.0);
 
-   data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->sphere = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(data->sphere, 50);
 
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh1 = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
    _set_ball(data->mesh, data->sphere, data->material);
    _set_ball(data->mesh1, data->sphere, data->material1);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 
    data->mesh_node1 =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
    evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -242,13 +242,13 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -288,7 +288,7 @@ main(void)
    evas_object_show(background);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 3d79500a91..bbfcdddb39 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -237,9 +237,9 @@ Eina_Bool
 _init_sphere(void *this, const char *texture)
 {
    Test_object *sphere  = (Test_object *)this;
-   sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
-   sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   sphere->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   sphere->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(sphere->primitive, 50);
    evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive);
@@ -248,7 +248,7 @@ _init_sphere(void *this, const char *texture)
 
    evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE);
 
-   sphere->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   sphere->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(sphere->texture, texture, NULL);
    evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -272,27 +272,27 @@ _init_scene(const char *texture)
    Evas_Real tmp;
    Test_object *m;
 
-   globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   globalscene.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
-   globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
-   globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   globalscene.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0);
 
    globalscene.camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera);
    evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node);
    evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0);
    evas_canvas3d_node_look_at_set(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
-   globalscene.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   globalscene.light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(globalscene.light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(globalscene.light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(globalscene.light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE);
 
    globalscene.light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light);
    evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0);
    evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0);
@@ -313,7 +313,7 @@ _init_scene(const char *texture)
              m->material = spheretmp->material;
              m->texture = spheretmp->texture;
           }
-        m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+        m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
         m->speed = tmp;
         m->sphere_animate = _animate_sphere;
         m->animate = ecore_timer_add(m->speed, m->sphere_animate, m);
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
    globalscene.precision = precision;
    globalscene.scene_init(texture);
 
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
 
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 6ed1ad5c77..24dc10a0c9 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -152,10 +152,10 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
 
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -166,13 +166,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
 
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
 
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0);
@@ -185,7 +185,7 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -196,16 +196,16 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
    evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
-   data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
@@ -213,8 +213,8 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(scene, 0.0, 0.0, 0.0, 0.0);
@@ -259,7 +259,7 @@ main(void)
    evas_object_show(background);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_geometry_set(image, 0, 0, WIDTH, HEIGHT);
    evas_object_show(image);
 
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index 9bb15cef3c..6c9b0d2fe9 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -137,12 +137,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -152,13 +152,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -168,7 +168,7 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -179,7 +179,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
    evas_canvas3d_mesh_frame_add(data->mesh, 0);
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -192,7 +192,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
@@ -200,12 +200,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -237,13 +237,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 07daf1906f..7f6dbb5d39 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -111,11 +111,11 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -125,13 +125,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -142,8 +142,8 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material0 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material0 = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material1 = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -163,9 +163,9 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(data->material1, 100.0);
 
-   data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture0 = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture1 = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture_normal = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    evas_canvas3d_texture_data_set(data->texture0, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]);
    evas_canvas3d_texture_data_set(data->texture1, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0]);
@@ -176,11 +176,11 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_texture_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_normal);
 
    /* Set data of primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material0);
    evas_canvas3d_mesh_frame_add(data->mesh, 20);
@@ -188,7 +188,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
@@ -196,12 +196,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -234,13 +234,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index 4e75aa9ffe..aa883f4d44 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -115,37 +115,37 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
 
-   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_member_add(root_node, camera_node);
    evas_canvas3d_node_position_set(camera_node, 200.0, 0.0, 40.0);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(light, EINA_TRUE);
 
-   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(root_node, light_node);
 
    /* Add the meshes. */
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   mesh2 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   mesh2 = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    efl_file_set(mesh, input_model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
@@ -169,13 +169,13 @@ main(void)
    efl_file_set(mesh2, output_model_path, NULL);
    evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(root_node, mesh_node);
    evas_canvas3d_node_mesh_add(mesh_node, mesh);
    evas_canvas3d_node_position_set(mesh_node, 0.0, -40.0, 0.0);
 
-   mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_node2 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(root_node, mesh_node2);
    evas_canvas3d_node_mesh_add(mesh_node2, mesh2);
    evas_canvas3d_node_position_set(mesh_node2, 0.0, 40.0, 0.0);
@@ -186,13 +186,13 @@ main(void)
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index 97bb6e2a1c..a29521aff9 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -83,12 +83,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
   data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
   evas_canvas3d_node_camera_set(data->camera_node, data->camera);
   evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0);
@@ -100,13 +100,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -125,7 +125,7 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
 static void
 _mesh_setup(Scene_Data *data)
 {
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -135,21 +135,21 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
-   data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->sphere = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(data->sphere, 50);
 
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh1 = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
    _set_ball(data->mesh, data->sphere, data->material);
    _set_ball(data->mesh1, data->sphere, data->material);
 
    data->animation_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(data->animation_node, data->mesh_node);
    evas_canvas3d_node_member_add(data->root_node, data->animation_node);
@@ -157,7 +157,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0);
 
    data->mesh_node1 =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
    evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -172,13 +172,13 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -211,13 +211,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
 
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 5cdf2e4897..a7d2c2ef8e 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -279,8 +279,8 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -293,12 +293,12 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 200.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
@@ -309,7 +309,7 @@ _light_setup(Scene_Data *data)
 static void
 _mesh_setup(Scene_Data *data)
 {
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -319,27 +319,27 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
-   data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->sphere = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(data->sphere, 20);
 
-   data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_aabb = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_aabb, 0, data->cube);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_aabb, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
    evas_canvas3d_mesh_shader_mode_set(data->mesh_aabb, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_frame_material_set(data->mesh_aabb, 0, data->material);
 
-   data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_sphere = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, data->sphere);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
    evas_canvas3d_mesh_shader_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_aabb);
 }
@@ -347,9 +347,9 @@ _mesh_setup(Scene_Data *data)
 static void
 _mesh_setup_model(Scene_Data *data)
 {
-   data->mesh_model = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->material_model = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->texture_model = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->mesh_model = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->material_model = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->texture_model = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    evas_canvas3d_texture_file_set(data->texture_model, texture_path, NULL);
    evas_canvas3d_texture_filter_set(data->texture_model, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
@@ -374,15 +374,15 @@ _mesh_setup_model(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _light_setup(data);
    _mesh_setup_model(data);
    _camera_setup(data);
 
-   data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->mesh_node_model = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_position_set(data->mesh_node_model, obj_x, obj_y, obj_z);
    evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_model, -90, 1.0, 0.0, 0.0);
    evas_canvas3d_node_scale_set(data->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z);
@@ -425,7 +425,7 @@ main(void)
    evas_object_resize(background, WIDTH, HEIGHT);
    evas_object_show(background);
 
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index 5a3bc5ffbf..96d85bb502 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -84,7 +84,7 @@ typedef struct _Scene_Data
 int rr;
 
 #define MODEL_MESH_INIT(name, model, shade)                                              \
-   data->mesh_##name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                          \
+   data->mesh_##name = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);                          \
    efl_file_set(data->mesh_##name, model, NULL); \
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
    evas_canvas3d_mesh_shader_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADER_MODE_##shade); \
@@ -96,7 +96,7 @@ int rr;
    evas_canvas3d_mesh_convex_hull_data_get(data->mesh_##name, 0, vert, ind);  \
    vertex = (float*) vert->members;\
    index = ind->members;\
-   data->mesh_##name##_ch = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                                    \
+   data->mesh_##name##_ch = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);                                    \
    evas_canvas3d_mesh_vertex_count_set(data->mesh_##name##_ch, (vert->len / 10)); \
    evas_canvas3d_mesh_frame_add(data->mesh_##name##_ch, 0); \
    evas_canvas3d_mesh_frame_vertex_data_copy_set(data->mesh_##name##_ch, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \
@@ -255,12 +255,12 @@ _key_down(void *data,
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -270,13 +270,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -292,7 +292,7 @@ _mesh_setup(Scene_Data *data)
    Eo *primitive = NULL;
    /* Setup material. */
 
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
@@ -302,17 +302,17 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup mesh sphere */
-   primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(primitive, 10);
-   data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_sphere = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, primitive);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
    evas_canvas3d_mesh_shader_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
 
    /* Setup mesh torus */
-   data->mesh_torus = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_torus = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_TORUS);
    evas_canvas3d_primitive_precision_set(primitive, 50);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_torus, 0, primitive);
@@ -321,7 +321,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_mesh_frame_material_set(data->mesh_torus, 0, data->material);
 
    /* Setup mesh cube */
-   data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_cube = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
    evas_canvas3d_primitive_precision_set(primitive, 50);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_cube, 0, primitive);
@@ -354,7 +354,7 @@ _mesh_setup(Scene_Data *data)
    MODEL_MESH_INIT(blender_test_sonic, sonic_test, DIFFUSE)
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_sphere);
    evas_canvas3d_node_scale_set(data->mesh_node, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
@@ -372,14 +372,14 @@ _mesh_setup(Scene_Data *data)
    _print_result(data->mesh_sphere_ch, data->mesh_blender_test_sphere);
 
    data->mesh_node_convex_hull =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node_convex_hull);
    evas_canvas3d_node_position_set(data->mesh_node_convex_hull, 0.0, 0.0, 0.0);
    evas_canvas3d_node_scale_set(data->mesh_node_convex_hull, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
    evas_canvas3d_node_mesh_add(data->mesh_node_convex_hull, data->mesh_sphere_ch);
 
    data->mesh_node_blender =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node_blender);
    evas_canvas3d_node_position_set(data->mesh_node_blender, -3.0, 0.0, 0.0);
    evas_canvas3d_node_scale_set(data->mesh_node_blender, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
@@ -389,12 +389,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -429,13 +429,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 1d788f9c37..875cc46df8 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -91,44 +91,44 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
 
    camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_member_add(root_node, camera_node);
    evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 20.0);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(light, EINA_TRUE);
 
    light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(root_node, light_node);
 
    /* Add the mesh. */
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    efl_file_set(mesh, model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
    evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
-   texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(texture, image_path, NULL);
    evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -142,7 +142,7 @@ main(void)
    evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(material, 50.0);
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(root_node, mesh_node);
    evas_canvas3d_node_mesh_add(mesh_node, mesh);
 
@@ -152,13 +152,13 @@ main(void)
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index bd3e7991b7..2c04deca7d 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -32,11 +32,11 @@
 #define LOAD_AND_ADD_MESH(extention, number)                                          \
    snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention);                     \
    extention##_file = eina_file_open(buffer , 0);                                     \
-   mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                               \
+   mesh_##extention = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);                               \
    efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \
    evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \
    evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG);                      \
-   node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));          \
+   node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));          \
    evas_canvas3d_node_member_add(root_node, node_##extention);                       \
    evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \
    evas_canvas3d_node_position_set(node_##extention, initial_node_data[number * 10], \
@@ -181,36 +181,36 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 10.0, 1.0, 1.0, 500.0);
 
    camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_member_add(root_node, camera_node);
    evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 100.0);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(light, EINA_TRUE);
 
    light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 1.0, 0.0, 100.0);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(root_node, light_node);
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -233,13 +233,13 @@ main(void)
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 20, 20, 200, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 64dc6fd8a8..aaac77ca6f 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -44,12 +44,12 @@
 #define NUMBER_OF_MESHES 8
 
 #define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material)               \
-   mesh[num] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                                  \
+   mesh[num] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);                                  \
    snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj");                      \
    efl_file_set(mesh[num], full_file_path, NULL); \
    evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \
    evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode);                                \
-   mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));   \
+   mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));   \
    evas_canvas3d_node_member_add(root_node, mesh_node[num]);                                \
    evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \
    evas_canvas3d_node_position_set(mesh_node[num], 0, Y, Z);                                     \
@@ -63,7 +63,7 @@
    ADD_OBJ_MESH(buffer, Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material)
 
 #define ADD_TEXTURE(name, path)                                       \
-   name = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                        \
+   name = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                        \
    evas_canvas3d_texture_file_set(name, path, NULL); \
    evas_canvas3d_texture_filter_set(name, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \
                                     EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \
@@ -71,7 +71,7 @@
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT);
 
 #define ADD_MATERIAL(name)                                                 \
-   name = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);                            \
+   name = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);                            \
    evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); \
    evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); \
    evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); \
@@ -157,30 +157,30 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 20.0, 1.0, 1.0, 500.0);
 
    camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_member_add(root_node, camera_node);
    evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 0.0);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(light, EINA_TRUE);
 
    light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 10.0, 0.0, 0.0);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -212,13 +212,13 @@ main(void)
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
    /* Add a background rectangle MESHES. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index af84f53078..ac9b7a4008 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -104,11 +104,11 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
 
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -118,12 +118,12 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, -20.0, 20.0, 50.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -134,10 +134,10 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material_rocks = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material_rocks = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   data->texture_rocks = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture_rocks_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture_rocks = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture_rocks_n = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(data->texture_rocks, rock_diffuse, NULL);
    evas_canvas3d_texture_wrap_set(data->texture_rocks, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
    evas_canvas3d_texture_file_set(data->texture_rocks_n, rock_n_and_height_map, NULL);
@@ -156,10 +156,10 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(data->material_rocks, 100.0);
 
-   data->material_wood = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material_wood = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   data->texture_wood = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture_four_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture_wood = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture_four_n = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(data->texture_wood, wood_diffuse, NULL);
    evas_canvas3d_texture_wrap_set(data->texture_wood, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
    evas_canvas3d_texture_file_set(data->texture_four_n, wood_n_and_height_map, NULL);
@@ -179,11 +179,11 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material_wood, 100.0);
 
    /* Set data of primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 100, data->cube);
    evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION);
@@ -191,7 +191,7 @@ _mesh_setup(Scene_Data *data)
 
    evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood);
 
-   data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
    evas_canvas3d_node_scale_set(data->mesh_node, 3, 3, 3);
@@ -200,11 +200,11 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -237,13 +237,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
    evas_object_focus_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index ad8754cfe7..71608de62f 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -117,32 +117,32 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0);
 
    camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(root_node, camera_node);
 
-   sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   sphere = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(sphere, 50);
 
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere);
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(texture_diffuse, image_path, NULL);
    evas_canvas3d_texture_filter_set(texture_diffuse, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
    evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse);
@@ -154,7 +154,7 @@ main(void)
    evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(material, 50.0);
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(root_node, mesh_node);
    evas_canvas3d_node_mesh_add(mesh_node, mesh);
@@ -167,12 +167,12 @@ main(void)
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
    /* Add evas objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_canvas_scene3d_set(image, scene);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index b4a09621b8..842be8e385 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -130,35 +130,35 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
 
-   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(camera_node, camera);
    evas_canvas3d_node_member_add(root_node, camera_node);
    evas_canvas3d_node_position_set(camera_node, 15.0, 0.0, 0.0);
    evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_directional_set(light, EINA_TRUE);
 
-   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(light_node, light);
    evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
    evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
    evas_canvas3d_node_member_add(root_node, light_node);
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(texture, image_path, NULL);
    evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -179,7 +179,7 @@ main(void)
    /* Add the meshes. */
    for (i = 0; i < NUMBER_OF_MESHES; i++)
      {
-        mesh[i] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+        mesh[i] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
         snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]);
         efl_file_set(mesh[i], buffer, NULL);
@@ -196,7 +196,7 @@ main(void)
              evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
           }
 
-        mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+        mesh_node[i] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
         evas_canvas3d_node_member_add(root_node, mesh_node[i]);
         evas_canvas3d_node_mesh_add(mesh_node[i], mesh[i]);
         evas_canvas3d_node_position_set(mesh_node[i], 0, ((i % 4) * 4) + ((i / 16) * 1) - 6.5, (((i % 16) / 4) * 4) - 6);
@@ -208,13 +208,13 @@ main(void)
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 100, 100, 100, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 6a16bec0dc..5d62ff7b2e 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -116,11 +116,11 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -130,13 +130,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -147,8 +147,8 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    evas_canvas3d_texture_source_set(data->texture, source);
    evas_canvas3d_texture_source_visible_set(data->texture, EINA_TRUE);
@@ -163,17 +163,17 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_texture_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture);
 
    /* Set data of primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
    evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_FLAT);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
    evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
@@ -182,12 +182,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -218,14 +218,14 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add a background image. */
 #ifdef USE_EO_IMAGE
-   source = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_buffer_data_set(source, NULL, WIDTH, HEIGHT, 0, EFL_GFX_COLORSPACE_ARGB8888);
    efl_gfx_position_set(source, (WIDTH / 2), (HEIGHT / 2));
    efl_gfx_size_set(source, (WIDTH / 2), (HEIGHT / 2));
@@ -239,7 +239,7 @@ main(void)
 #endif
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, (WIDTH / 2), (HEIGHT / 2));
    efl_gfx_visible_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 2467340ce4..0bbfeac7bd 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -183,7 +183,7 @@ _on_canvas_resize(Ecore_Evas *ee)
 static void
 _body_material_set(Body_3D *body, float r, float g, float b)
 {
-   body->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   body->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -200,33 +200,33 @@ _body_material_set(Body_3D *body, float r, float g, float b)
 static void
 _sphere_setup(Body_3D *sphere)
 {
-   sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   sphere->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(sphere->primitive, 50);
 
-   sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive);
 
    _body_material_set(sphere, 1, 0.0, 0.0);
 
-   sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 3.0, 3.0, 0.0));
+   sphere->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, 3.0, 3.0, 0.0));
    evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh);
 }
 
 static void
 _cone_setup(Body_3D *cone)
 {
-   cone->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   cone->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(cone->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CONE);
    evas_canvas3d_primitive_precision_set(cone->primitive, 50);
 
-   cone->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   cone->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(cone->mesh, 0, cone->primitive);
 
    _body_material_set(cone, 0.8, 0.5, 0.5);
 
    cone->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(cone->node, cone->mesh);
    evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0);
    evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0);
@@ -235,17 +235,17 @@ _cone_setup(Body_3D *cone)
 static void
 _cylinder_setup(Body_3D *cylinder)
 {
-   cylinder->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   cylinder->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(cylinder->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER);
    evas_canvas3d_primitive_precision_set(cylinder->primitive, 50);
 
-   cylinder->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   cylinder->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(cylinder->mesh, 0, cylinder->primitive);
 
    _body_material_set(cylinder, 0.0, 0.0, 1.0);
 
    cylinder->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh);
    evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0);
    evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0);
@@ -255,17 +255,17 @@ static void
 _fence_setup(Body_3D *fence)
 {
 
-   Eo *texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   Eo *texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_atlas_enable_set(texture, EINA_FALSE);
    evas_canvas3d_texture_file_set(texture, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid.png", NULL);
    evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
-   Eo *texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   Eo *texture1 = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_atlas_enable_set(texture1, EINA_FALSE);
    evas_canvas3d_texture_file_set(texture1, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid_n.png", NULL);
    evas_canvas3d_texture_filter_set(texture1, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(texture1, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
-   fence->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   fence->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_texture_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture);
    evas_canvas3d_material_texture_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, texture);
@@ -279,13 +279,13 @@ _fence_setup(Body_3D *fence)
    evas_canvas3d_material_color_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(fence->material, 100.0);
 
-   fence->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   fence->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(fence->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER);
    evas_canvas3d_primitive_mode_set(fence->primitive, EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE);
    evas_canvas3d_primitive_tex_scale_set(fence->primitive, 160.0, 12.0);
    evas_canvas3d_primitive_precision_set(fence->primitive, 50);
 
-   fence->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   fence->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(fence->mesh, 0, fence->primitive);
 
    evas_canvas3d_mesh_frame_material_set(fence->mesh, 0, fence->material);
@@ -293,7 +293,7 @@ _fence_setup(Body_3D *fence)
    evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE);
    evas_canvas3d_mesh_shader_mode_set(fence->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
    fence->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(fence->node, fence->mesh);
    evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0);
    evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0);
@@ -303,16 +303,16 @@ _fence_setup(Body_3D *fence)
 static void
 _square_setup(Body_3D *square)
 {
-   square->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   square->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(square->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE);
 
-   square->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   square->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(square->mesh, 0, square->primitive);
 
    _body_material_set(square, 0.4, 0.4, 0.4);
 
    square->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(square->node, square->mesh);
    evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0);
    evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0);
@@ -322,15 +322,15 @@ _square_setup(Body_3D *square)
 static void
 _box_setup(Body_3D *box)
 {
-   box->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   box->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(box->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
 
-   box->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   box->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(box->mesh, 0, box->primitive);
 
    _body_material_set(box, 0, 1, 0);
 
-   box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   box->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(box->node, box->mesh);
    evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0);
 }
@@ -338,11 +338,11 @@ _box_setup(Body_3D *box)
 static void
 _model_setup(Body_3D *model)
 {
-   model->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   model->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(model->texture, image_path, NULL);
    evas_canvas3d_texture_filter_set(model->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(model->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
-   model->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   model->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_texture_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, model->texture);
    evas_canvas3d_material_texture_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, model->texture);
@@ -352,13 +352,13 @@ _model_setup(Body_3D *model)
    evas_canvas3d_material_shininess_set(model->material, 100.0);
 
 
-   model->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   model->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    efl_file_set(model->mesh, model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material);
    evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    model->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(model->node, model->mesh);
    evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1);
    evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577);
@@ -367,15 +367,15 @@ _model_setup(Body_3D *model)
 static void
 _billboard_setup(Scene_Data *data)
 {
-   data->billboard.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->billboard.texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(data->billboard.texture, b_image_path, NULL);
    evas_canvas3d_texture_filter_set(data->billboard.texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
    evas_canvas3d_texture_wrap_set(data->billboard.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
 
-   data->billboard.primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->billboard.primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->billboard.primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE);
 
-   data->billboard.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->billboard.mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->billboard.mesh, 0, data->billboard.primitive);
 
    _body_material_set(&(data->billboard), 1.0, 1.0, 1.0);
@@ -389,7 +389,7 @@ _billboard_setup(Scene_Data *data)
    evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE);
    evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
 
-   data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->billboard.node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh);
    evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0);
    evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0);
@@ -400,13 +400,13 @@ _billboard_setup(Scene_Data *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
-   data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->mediator = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0);
 
   data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
   evas_canvas3d_node_camera_set(data->camera_node, data->camera);
 
@@ -421,7 +421,7 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, AMBIENT_LIGHT, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, DIFFUSE_LIGHT, 1.0);
    evas_canvas3d_light_specular_set(data->light, SPECULAR_LIGHT, 1.0);
@@ -429,7 +429,7 @@ _light_setup(Scene_Data *data)
    evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 15.0, 0.0, -5.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
@@ -441,13 +441,13 @@ _scene_setup(Scene_Data *data)
 {
    data->init = EINA_FALSE;
 
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
 
    _camera_setup(data);
@@ -635,13 +635,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
    evas_object_anti_alias_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index a4023c258e..49d723c8b6 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -110,13 +110,13 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    evas_canvas3d_camera_projection_perspective_set(data->camera, NEAR, 1.0, 2.0, FAR);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+                    evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    evas_canvas3d_node_camera_set(data->camera_node, data->camera);
    evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0);
    evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
@@ -127,14 +127,14 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+                    evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 300.0);
    evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
@@ -149,7 +149,7 @@ _mesh_setup(Scene_Data *data)
    Evas_Real m_distances[NUMBER_MESHS + 2] = {NEAR, 200.0, 500.0, 500.0};
 
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
@@ -159,23 +159,23 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    data->lod_mesh_node1 =
-         eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+         efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+                evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_position_set(data->lod_mesh_node1, 2.0, 0.0, 0.0);
 
    data->lod_mesh_node2 =
-         eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+         efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+                evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    data->complex_node =
-         eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+         efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+                evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
    evas_canvas3d_node_scale_set(data->complex_node, 30.0, 30.0, 30.0);
 
    /* Setup mesh. One model, two meshes object with dufferent lod distances.*/
    for (i = 0; i <= NUMBER_MESHS; i++)
      {
-        Eo *mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+        Eo *mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
         Eina_Stringshare *str = eina_stringshare_printf("%s%d%s", model_path,
                                                         i, ".obj");
         efl_file_set(mesh, str, NULL);
@@ -184,7 +184,7 @@ _mesh_setup(Scene_Data *data)
         evas_canvas3d_mesh_lod_boundary_set(mesh, distances[i], distances[i + 1]);
         evas_canvas3d_node_mesh_add(data->lod_mesh_node1, mesh);
 
-        mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+        mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
         efl_file_set(mesh, str, NULL);
         evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
         evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
@@ -203,13 +203,13 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
    evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+      efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+                    evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -251,13 +251,13 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_color_set(background, 0, 0, 0, 255);
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
    evas_object_focus_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index a1ba77e9ac..fc7621597a 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -174,7 +174,7 @@ main(void)
 
    /* Creating object with Eo.
     * Object must be deleted explixitly at the end of program.*/
-   d.bg = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
+   d.bg = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
 
    /* Eo-styled way to perform actions on an object*/
    evas_object_name_set(d.bg, "background rectangle");
@@ -190,7 +190,7 @@ main(void)
    evas_object_event_callback_add(
      d.bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
 
-   d.img = eo_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
+   d.img = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
 
    /* As soon as 'canvas' object is a parent for 'image' object,
     * 'canvas' keeps reference to 'image'.
@@ -210,11 +210,11 @@ main(void)
         efl_gfx_size_set(d.img, WIDTH, HEIGHT);
         efl_gfx_visible_set(d.img, EINA_TRUE);
         fprintf(stdout, "Image object added, class name is: %s\n",
-                eo_class_name_get(d.img));
+                efl_class_name_get(d.img));
      }
 
    /* border on the image's clipper, here just to emphasize its position */
-   d.clipper_border = eo_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
+   d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
    efl_file_set(d.clipper_border, border_img_path, NULL);
    err = efl_image_load_error_get(d.clipper_border);
 
@@ -233,7 +233,7 @@ main(void)
    /* solid white clipper (note that it's the default color for a
     * rectangle) - it won't change clippees' colors, then (multiplying
     * by 255) */
-   d.clipper = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
+   d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
 
    efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4);
    efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2);
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 61a646bb40..d7d641a194 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -101,18 +101,18 @@ vector_set(int x, int y, int w, int h)
    eina_matrix3_identity(&matrix);
    eina_matrix3_rotate(&matrix, radian);
 
-   root = eo_add(EFL_VG_CONTAINER_CLASS, NULL);
+   root = efl_add(EFL_VG_CONTAINER_CLASS, NULL);
    //evas_vg_node_transformation_set(root, &matrix);
 
-   Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "bg"));
+   Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "bg"));
    evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0);
    evas_vg_node_origin_set(bg, 0,0);
    evas_vg_shape_stroke_width_set(bg, 1.0);
    evas_vg_node_color_set(bg, 80, 80, 80, 80);
 
-   Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "shape"));
-   Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eo_self, "rgradient"));
-   Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eo_self, "lgradient"));
+   Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "shape"));
+   Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_self, "rgradient"));
+   Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_self, "lgradient"));
 
    evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330);
 
@@ -153,7 +153,7 @@ vector_set(int x, int y, int w, int h)
    evas_vg_node_color_set(shape, 0, 0, 255, 255);
    evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
 
-   Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "rect"));
+   Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect"));
    evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0);
    evas_vg_node_origin_set(rect, 100, 100);
    evas_vg_shape_fill_set(rect, lgradient);
@@ -161,7 +161,7 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
 
-   Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "rect1"));
+   Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect1"));
    evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0);
    evas_vg_node_origin_set(rect1, 50, 70);
    evas_vg_shape_stroke_scale_set(rect1, 2);
@@ -169,7 +169,7 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
 
-   Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "circle"));
+   Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "circle"));
    evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300);
    evas_vg_shape_fill_set(circle, lgradient);
    //evas_vg_node_transformation_set(&matrix),
@@ -177,27 +177,27 @@ vector_set(int x, int y, int w, int h)
    evas_vg_node_color_set(circle, 50, 0, 0, 50);
 
    // Foreground
-   Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "fg"));
+   Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "fg"));
    evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0);
    evas_vg_node_origin_set(fg, 0, 0);
    evas_vg_shape_stroke_width_set(fg, 5.0);
    evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
 
-   Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "tst"));
+   Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "tst"));
    evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
    evas_vg_node_color_set(tst, 0, 0, 200, 200);
    evas_vg_shape_stroke_width_set(tst, 2);
    evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
 
-   Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "vc"));
+   Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "vc"));
    evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
    evas_vg_node_color_set(vc, 0, 200, 0, 255);
    evas_vg_shape_stroke_width_set(vc, 4);
    evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
 
-   beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eo_self, root));
-   end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eo_self, root));
+   beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root));
+   end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root));
 
    circle = efl_vg_container_child_get(end, "circle");
    efl_vg_transformation_set(circle, &matrix);
diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.c b/src/examples/evas/shooter/evas-3d-shooter-header.c
index 62b36f85a5..3907f66324 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-header.c
+++ b/src/examples/evas/shooter/evas-3d-shooter-header.c
@@ -26,11 +26,11 @@ _distance(float x1, float z1, float x2, float z2)
 void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
    evas_canvas3d_camera_projection_perspective_set(data->camera, 65.0, 1.0, 1.0, 300.0);
 
-   data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   data->mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
    evas_canvas3d_node_member_add(data->root_node, data->mediator_node);
    evas_canvas3d_node_member_add(data->mediator_node, data->camera_node);
@@ -43,14 +43,14 @@ _camera_setup(Scene_Data *data)
 void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
 
    evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_light_specular_set(data->light, 0.2, 0.2, 0.2, 1.0);
    evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 200.0);
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
 
    evas_canvas3d_node_light_set(data->light_node, data->light);
    evas_canvas3d_node_position_set(data->light_node, -30.0, 70.0, 0.0);
diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h
index d7f21860da..91d1563722 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-macros.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h
@@ -124,7 +124,7 @@ typedef struct _vec2
 
 
 #define ADD_MESH(Object, Name, a, d, s)                                                   \
-   data->material_##Object = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);                        \
+   data->material_##Object = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);                        \
                                                                                           \
    evas_canvas3d_material_enable_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); \
    evas_canvas3d_material_enable_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); \
@@ -135,7 +135,7 @@ typedef struct _vec2
    evas_canvas3d_material_color_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, s, s, s, 1.0); \
    evas_canvas3d_material_shininess_set(data->material_##Object, 50.0);                                           \
                                                                                           \
-   data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_##Name = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
 #define SETUP_DEFAULT_MESH(Object, Name, Shade_Mode)                                      \
    evas_canvas3d_mesh_shader_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADER_MODE_##Shade_Mode); \
@@ -144,7 +144,7 @@ typedef struct _vec2
 
 
 #define SETUP_MESH_NODE(Name)                                                             \
-   data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));     \
+   data->mesh_node_##Name = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));     \
                                                                                           \
    evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name);
 
@@ -153,7 +153,7 @@ typedef struct _vec2
    efl_file_set(data->mesh_##Name, file, NULL);                                                       \
                                                                                           \
    SETUP_DEFAULT_MESH(Object, Name, PHONG)                                                \
-   data->texture_diffuse_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                  \
+   data->texture_diffuse_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                  \
                                                                                           \
    evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \
    evas_canvas3d_texture_file_set(data->texture_diffuse_##Object, image, NULL); \
@@ -172,7 +172,7 @@ typedef struct _vec2
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_##Name, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, \
                                             2 * sizeof(float), vertex);                        \
    SETUP_DEFAULT_MESH(Object, Name, NORMAL_MAP)                                                 \
-   data->texture_diffuse_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                        \
+   data->texture_diffuse_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                        \
                                                                                                 \
    evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \
    evas_canvas3d_texture_file_set(data->texture_diffuse_##Object, image, NULL); \
@@ -187,7 +187,7 @@ typedef struct _vec2
 
 
 #define NORMAL_SET(Object, Name, normal)                                                  \
-   data->texture_normal_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                   \
+   data->texture_normal_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                   \
                                                                                           \
    evas_canvas3d_texture_atlas_enable_set(data->texture_normal_##Object, EINA_FALSE); \
    evas_canvas3d_texture_file_set(data->texture_normal_##Object, normal, NULL); \
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 21eafe4b0b..1aa3223300 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -802,7 +802,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
    evas_canvas3d_node_position_set(data->mesh_node_column_c, 10, 9.0, -12);
 
    /* Setup mesh for bounding sphere */
-   data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material_ball = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
@@ -811,7 +811,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
    evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(data->material_ball, 50.0);
 
-   data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
    _set_ball(data->mesh_ball, 10);
 
@@ -865,7 +865,7 @@ _mesh_setup_column(Scene_Data *data, int index)
 {
    /* Setup mesh for column */
 
-   data->material_column = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material_column = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    evas_canvas3d_material_enable_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -876,7 +876,7 @@ _mesh_setup_column(Scene_Data *data, int index)
    evas_canvas3d_material_color_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(data->material_column, 50.0);
 
-   data->mesh_column[index] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   data->mesh_column[index] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
    SETUP_MESH_NODE(column[index])
 
@@ -886,7 +886,7 @@ _mesh_setup_column(Scene_Data *data, int index)
    evas_canvas3d_mesh_shader_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_column[index], 0, data->material_column);
 
-   data->texture_diffuse_column = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   data->texture_diffuse_column = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    evas_canvas3d_texture_file_set(data->texture_diffuse_column, red_brick_path, NULL);
    evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_column, EINA_FALSE);
@@ -991,20 +991,20 @@ _scene_setup(Scene_Data *data)
    for (i = 0; i < 4; i++)
       motion_vec[i] = 0;
 
-   data->cube_primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cube_primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->cube_primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
    evas_canvas3d_primitive_precision_set(data->cube_primitive, 10);
 
-   data->sphere_primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->sphere_primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_form_set(data->sphere_primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
    evas_canvas3d_primitive_precision_set(data->sphere_primitive, 50);
 
-   global_scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   global_scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    evas_canvas3d_scene_size_set(global_scene, WIDTH, HEIGHT);
    evas_canvas3d_scene_background_color_set(global_scene, 0.5, 0.5, 0.9, 0.0);
 
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
@@ -1014,7 +1014,7 @@ _scene_setup(Scene_Data *data)
    for (i = 0; i < 10; i++)
      _mesh_setup_rocket(data, i);
 
-   data->cylinder_primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   data->cylinder_primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    evas_canvas3d_primitive_mode_set(data->cylinder_primitive, EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE);
    evas_canvas3d_primitive_form_set(data->cylinder_primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER);
    evas_canvas3d_primitive_tex_scale_set(data->cylinder_primitive, 1.0, 1.0);
@@ -1069,7 +1069,7 @@ _scene_setup(Scene_Data *data)
           }
      }
 
-   data->carp_mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->carp_mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    evas_canvas3d_node_member_add(data->carp_mediator_node, data->mesh_node_carpet);
 
@@ -1146,7 +1146,7 @@ main(int argc, char *argv[])
    _scene_setup(&data);
 
    /* Add an image object for 3D scene rendering. */
-   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 60d43670e5..a7e8d93403 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -54,7 +54,7 @@ extern "C" {
 
 #include "efl_loop_fd.eo.h"
 
-/* We ue the factory pattern here, so you shouldn't call eo_add directly. */
+/* We ue the factory pattern here, so you shouldn't call efl_add directly. */
 EAPI Eo *ecore_main_loop_get(void);
 
 /**
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 3a96c1c4aa..b09184ea9f 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -243,17 +243,17 @@ ecore_init(void)
         goto shutdown_log_dom;
      }
 
-   eo_init();
+   efl_object_init();
 
    if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
    if (_ecore_fps_debug) _ecore_fps_debug_init();
    if (!ecore_mempool_init()) goto shutdown_mempool;
    _ecore_main_loop_init();
 
-   vpath = eo_add(EFL_VPATH_CORE_CLASS, NULL);
+   vpath = efl_add(EFL_VPATH_CORE_CLASS, NULL);
    if (vpath) efl_vpath_manager_register(EFL_VPATH_MANAGER_CLASS, 0, vpath);
 
-   _mainloop_singleton = eo_add(EFL_LOOP_CLASS, NULL);
+   _mainloop_singleton = efl_add(EFL_LOOP_CLASS, NULL);
 
    _ecore_signal_init();
 #ifndef HAVE_EXOTIC
@@ -277,7 +277,7 @@ ecore_init(void)
 #if defined(GLIB_INTEGRATION_ALWAYS)
    if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
 #endif
-   _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
+   _ecore_parent = efl_add(ECORE_PARENT_CLASS, NULL);
 
 #if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
    if (getenv("ECORE_MEM_STAT"))
@@ -323,7 +323,7 @@ ecore_init(void)
 
 shutdown_mempool:
    ecore_mempool_shutdown();
-   eo_shutdown();
+   efl_object_shutdown();
 shutdown_log_dom:
    eina_shutdown();
 shutdown_evil:
@@ -439,8 +439,8 @@ ecore_shutdown(void)
      eina_prefix_free(_ecore_pfx);
      _ecore_pfx = NULL;
 
-     eo_unref(_ecore_parent);
-     eo_shutdown();
+     efl_unref(_ecore_parent);
+     efl_object_shutdown();
 
      eina_shutdown();
 #ifdef HAVE_EVIL
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index d48219dec6..e1616ce4b9 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -68,10 +68,10 @@ ecore_exe_pipe_run(const char     *exe_cmd,
                    const void     *data)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eo_self, exe_cmd, flags));
+   Ecore_Exe *ret = efl_add(MY_CLASS, NULL, ecore_obj_exe_command_set(efl_self, exe_cmd, flags));
    if (ret)
      {
-        Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS);
+        Ecore_Exe_Data *pd = efl_data_scope_get(ret, MY_CLASS);
         pd->data = (void *) data;
      }
 
@@ -97,7 +97,7 @@ EOLIAN static Eo *
 _ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   obj = efl_finalize(eo_super(obj, MY_CLASS));
+   obj = efl_finalize(efl_super(obj, MY_CLASS));
 
    if (!obj)
       return obj;
@@ -110,8 +110,8 @@ ecore_exe_callback_pre_free_set(Ecore_Exe   *obj,
                                 Ecore_Exe_Cb func)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
    exe->pre_free_cb = func;
 }
@@ -122,8 +122,8 @@ ecore_exe_send(Ecore_Exe  *obj,
                int         size)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return EINA_FALSE;
 
    if (exe->close_stdin)
@@ -140,8 +140,8 @@ EAPI void
 ecore_exe_close_stdin(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    exe->close_stdin = 1;
@@ -155,8 +155,8 @@ ecore_exe_auto_limits_set(Ecore_Exe *obj,
                           int        end_lines)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_auto_limits_set(obj, exe, start_bytes, end_bytes, start_lines, end_lines);
@@ -167,8 +167,8 @@ ecore_exe_event_data_get(Ecore_Exe      *obj,
                          Ecore_Exe_Flags flags)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return NULL;
 
    return _impl_ecore_exe_event_data_get(obj, exe, flags);
@@ -179,8 +179,8 @@ ecore_exe_tag_set(Ecore_Exe  *obj,
                   const char *tag)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    IF_FREE(exe->tag);
@@ -194,8 +194,8 @@ EAPI const char *
 ecore_exe_tag_get(const Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return NULL;
 
    return exe->tag;
@@ -205,8 +205,8 @@ EAPI void *
 ecore_exe_free(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return NULL;
 
    void *data = exe->data;
@@ -218,7 +218,7 @@ ecore_exe_free(Ecore_Exe *obj)
 EOLIAN static void
 _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
 {
-   efl_destructor(eo_super(obj, ECORE_EXE_CLASS));
+   efl_destructor(efl_super(obj, ECORE_EXE_CLASS));
 
    _impl_ecore_exe_efl_object_destructor(obj, exe);
 }
@@ -236,8 +236,8 @@ EAPI pid_t
 ecore_exe_pid_get(const Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return -1;
 
    return exe->pid;
@@ -258,8 +258,8 @@ EAPI void *
 ecore_exe_data_get(const Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return NULL;
 
    return exe->data;
@@ -271,8 +271,8 @@ ecore_exe_data_set(Ecore_Exe *obj,
 {
    void *ret;
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return NULL;
 
    ret = exe->data;
@@ -284,8 +284,8 @@ EAPI Ecore_Exe_Flags
 ecore_exe_flags_get(const Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return 0;
 
    return exe->flags;
@@ -322,8 +322,8 @@ EAPI void
 ecore_exe_interrupt(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_interrupt(obj, exe);
@@ -333,8 +333,8 @@ EAPI void
 ecore_exe_quit(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_quit(obj, exe);
@@ -344,8 +344,8 @@ EAPI void
 ecore_exe_terminate(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_terminate(obj, exe);
@@ -355,8 +355,8 @@ EAPI void
 ecore_exe_kill(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_kill(obj, exe);
@@ -367,8 +367,8 @@ ecore_exe_signal(Ecore_Exe *obj,
                  int        num)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_signal(obj, exe, num);
@@ -378,8 +378,8 @@ EAPI void
 ecore_exe_hup(Ecore_Exe *obj)
 {
    EINA_MAIN_LOOP_CHECK_RETURN;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
-   if (!eo_isa(obj, MY_CLASS))
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
+   if (!efl_isa(obj, MY_CLASS))
       return;
 
    _impl_ecore_exe_hup(obj, exe);
@@ -411,7 +411,7 @@ _ecore_exe_find(pid_t pid)
 
    EINA_LIST_FOREACH(_ecore_exe_exes, itr, obj)
    {
-      Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+      Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
       if (exe->pid == pid)
         return obj;
    }
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index 2babbbf6a5..5ad60f9010 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -889,7 +889,7 @@ _ecore_exe_make_sure_its_dead(void *data)
 
       if ((obj = _ecore_exe_is_it_alive(dead->pid)))
       {
-         Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+         Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
          if (dead->cmd)
            INF("Sending KILL signal to allegedly dead %s (%d).",
                dead->cmd, dead->pid);
@@ -922,7 +922,7 @@ _ecore_exe_make_sure_its_really_dead(void *data)
 
       if ((obj = _ecore_exe_is_it_alive(dead->pid)))
       {
-         Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+         Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
          ERR("RUN!  The zombie wants to eat your brains!  And your CPU!");
          if (dead->cmd)
            INF("%s (%d) is not really dead.", dead->cmd, dead->pid);
@@ -939,7 +939,7 @@ _ecore_exe_make_sure_its_really_dead(void *data)
 Ecore_Timer *
 _ecore_exe_doomsday_clock_get(Ecore_Exe *obj)
 {
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
    return exe->doomsday_clock;
 }
 
@@ -947,7 +947,7 @@ void
 _ecore_exe_doomsday_clock_set(Ecore_Exe   *obj,
                               Ecore_Timer *dc)
 {
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
    exe->doomsday_clock = dc;
 }
 
@@ -1070,7 +1070,7 @@ _ecore_exe_data_generic_handler(void             *data,
    int event_type;
    const Efl_Event_Description *eo_event = NULL;
 
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
 
    /* Sort out what sort of handler we are. */
    if (flags & ECORE_EXE_PIPE_READ)
@@ -1223,7 +1223,7 @@ _ecore_exe_data_write_handler(void             *data,
                               Ecore_Fd_Handler *fd_handler EINA_UNUSED)
 {
    Ecore_Exe *obj = data;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
 
    if ((exe->write_fd_handler) &&
        (ecore_main_fd_handler_active_get
@@ -1253,7 +1253,7 @@ static void
 _ecore_exe_flush(Ecore_Exe *obj)
 {
    int count;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
 
    /* check whether we need to write anything at all. */
    if ((exe->child_fd_write == -1) || (!exe->write_data_buf))
@@ -1291,7 +1291,7 @@ static void
 _ecore_exe_dead_attach(Ecore_Exe *obj)
 {
    struct _ecore_exe_dead_exe *dead;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
 
    if (exe->doomsday_clock_dead) return;
    dead = calloc(1, sizeof(struct _ecore_exe_dead_exe));
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index 0316754027..e2ef5ac94e 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -39,7 +39,7 @@ static int run_pri = NORMAL_PRIORITY_CLASS;
 static void
 _ecore_exe_threads_terminate(Ecore_Exe *obj)
 {
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
    HANDLE threads[2] = { NULL, NULL };
    int i = 0;
 
@@ -68,7 +68,7 @@ _ecore_exe_close_cb(void *data,
 {
    Ecore_Exe_Event_Del *e;
    Ecore_Exe *obj = data;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
    DWORD exit_code = 0;
 
    _ecore_exe_threads_terminate(obj);
@@ -105,7 +105,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
 {
    char buf[64];
    Ecore_Exe *obj = data;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
    Ecore_Exe_Event_Data *event_data;
    char *current_buf = NULL;
    DWORD size;
@@ -175,7 +175,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
 {
    char buf[64];
    Ecore_Exe *obj = data;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
    Ecore_Exe_Event_Data *event_data;
    char *current_buf = NULL;
    DWORD size;
@@ -253,7 +253,7 @@ _ecore_exe_enum_windows_procedure(HWND window,
                                   LPARAM data)
 {
    Ecore_Exe *obj = (Ecore_Exe *) data;
-   Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS);
+   Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
    DWORD thread_id;
 
    thread_id = GetWindowThreadProcessId(window, NULL);
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index ecc74dc923..08e7d9d95a 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -9,7 +9,7 @@
 #include "Ecore.h"
 #include "ecore_private.h"
 
-EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
                           { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process },
                           { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
 
@@ -31,7 +31,7 @@ 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
    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);
+   efl_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EFL_CALLBACK_PRIORITY_BEFORE, ie);
 
    return ie;
 }
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index c53a182081..8295af24f8 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -9,7 +9,7 @@
 #include "Ecore.h"
 #include "ecore_private.h"
 
-EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
                           { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
                           { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
 
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 3c94e6d0a0..e116852853 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -96,7 +96,7 @@ _ecore_factorized_idle_add(const Efl_Callback_Array_Item *desc,
 
 /* Specific to Ecore_Idler implementation */
 
-EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
                           { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
                           { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
 
@@ -122,7 +122,7 @@ _ecore_idler_all_call(Eo *loop)
 int
 _ecore_idler_exist(Eo *loop)
 {
-   Efl_Loop_Data *dt = eo_data_scope_get(loop, EFL_LOOP_CLASS);
+   Efl_Loop_Data *dt = efl_data_scope_get(loop, EFL_LOOP_CLASS);
 
    return dt->idlers;
 }
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index f0e18787fc..5e941ed3d7 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2721,7 +2721,7 @@ _efl_loop_main_get(Efl_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
 {
    if (!_mainloop_singleton)
      {
-        _mainloop_singleton = eo_add(EFL_LOOP_CLASS, NULL);
+        _mainloop_singleton = efl_add(EFL_LOOP_CLASS, NULL);
      }
 
    return _mainloop_singleton;
@@ -2768,7 +2768,7 @@ _efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object
    r = eina_hash_find(pd->providers, &klass);
    if (r) return r;
 
-   return efl_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
+   return efl_provider_find(efl_super(obj, EFL_LOOP_CLASS), klass);
 }
 
 static void
@@ -2803,19 +2803,19 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
      }
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
+EFL_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
                           { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
                           { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
 
 EOLIAN static Efl_Object *
 _efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, EFL_LOOP_CLASS));
+   obj = efl_constructor(efl_super(obj, EFL_LOOP_CLASS));
    if (!obj) return NULL;
 
    efl_event_callback_array_add(obj, event_catcher_watch(), pd);
 
-   pd->providers = eina_hash_pointer_new((void*) eo_unref);
+   pd->providers = eina_hash_pointer_new((void*) efl_unref);
 
    return obj;
 }
@@ -2823,7 +2823,7 @@ _efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
 EOLIAN static void
 _efl_loop_efl_object_destructor(Eo *obj, Efl_Loop_Data *pd)
 {
-   efl_destructor(eo_super(obj, EFL_LOOP_CLASS));
+   efl_destructor(efl_super(obj, EFL_LOOP_CLASS));
 
    eina_hash_free(pd->providers);
 }
@@ -2905,7 +2905,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
 static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED);
 static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED);
 
-EO_CALLBACKS_ARRAY_DEFINE(timeout,
+EFL_CALLBACKS_ARRAY_DEFINE(timeout,
                           { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
                           { EFL_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
 
@@ -3007,9 +3007,9 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
    if (!t) goto on_error;
 
    t->job_is = EINA_FALSE;
-   t->u.timer = eo_add(EFL_LOOP_TIMER_CLASS, obj,
-                       efl_loop_timer_interval_set(eo_self, time),
-                       efl_event_callback_array_add(eo_self, timeout(), t));
+   t->u.timer = efl_add(EFL_LOOP_TIMER_CLASS, obj,
+                       efl_loop_timer_interval_set(efl_self, time),
+                       efl_event_callback_array_add(efl_self, timeout(), t));
 
    if (!t->u.timer) goto on_error;
 
@@ -3026,11 +3026,11 @@ static Eina_Bool
 _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;
+   if (!efl_isa(provider, klass)) return EINA_FALSE;
 
-   // Note: I would prefer to use eo_xref here, but I can't figure a nice way to
-   // call eo_xunref on hash destruction.
-   return eina_hash_add(pd->providers, &klass, eo_ref(provider));
+   // Note: I would prefer to use efl_xref here, but I can't figure a nice way to
+   // call efl_xunref on hash destruction.
+   return eina_hash_add(pd->providers, &klass, efl_ref(provider));
 }
 
 static Eina_Bool
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index cc4e4f406e..d1c645a5bd 100644
--- a/src/lib/ecore/ecore_poller.c
+++ b/src/lib/ecore/ecore_poller.c
@@ -14,7 +14,7 @@
 #define MY_CLASS_NAME "Ecore_Poller"
 
 #define ECORE_POLLER_CHECK(obj)                       \
-  if (!eo_isa((obj), ECORE_POLLER_CLASS)) \
+  if (!efl_isa((obj), ECORE_POLLER_CLASS)) \
     return
 
 struct _Ecore_Poller_Data
@@ -174,10 +174,10 @@ _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));
 
                         efl_parent_set(poller->obj, NULL);
-                        if (eo_destructed_is(poller->obj))
-                           eo_manual_free(poller->obj);
+                        if (efl_destructed_is(poller->obj))
+                           efl_manual_free(poller->obj);
                         else
-                           eo_manual_free_set(poller->obj, EINA_FALSE);
+                           efl_manual_free_set(poller->obj, EINA_FALSE);
 
                         poller_delete_count--;
                         changes++;
@@ -237,7 +237,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
                  const void       *data)
 {
    Ecore_Poller *poller;
-   poller = eo_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(eo_self, type, interval, func, data));
+   poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_self, type, interval, func, data));
    return poller;
 }
 
@@ -253,7 +253,7 @@ _ecore_poller_constructor(Eo *obj, Ecore_Poller_Data *poller, Ecore_Poller_Type
          EINA_MAIN_LOOP_CHECK_RETURN;
       }
 
-   eo_manual_free_set(obj, EINA_TRUE);
+   efl_manual_free_set(obj, EINA_TRUE);
 
    if (!func)
      {
@@ -337,7 +337,7 @@ ecore_poller_del(Ecore_Poller *obj)
 
    if (!obj) return NULL;
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Poller_Data *poller = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Poller_Data *poller = efl_data_scope_get(obj, MY_CLASS);
    /* we are walking the poller list - a bad idea to remove from it while
     * walking it, so just flag it as delete_me and come back to it after
     * the loop has finished */
@@ -352,10 +352,10 @@ ecore_poller_del(Ecore_Poller *obj)
    pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
 
    efl_parent_set(poller->obj, NULL);
-   if (eo_destructed_is(poller->obj))
-      eo_manual_free(obj);
+   if (efl_destructed_is(poller->obj))
+      efl_manual_free(obj);
    else
-      eo_manual_free_set(obj, EINA_FALSE);
+      efl_manual_free_set(obj, EINA_FALSE);
 
    _ecore_poller_next_tick_eval();
    return data;
@@ -370,7 +370,7 @@ _ecore_poller_efl_object_destructor(Eo *obj, Ecore_Poller_Data *pd)
      poller_delete_count++;
    }
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eo *
@@ -381,7 +381,7 @@ _ecore_poller_efl_object_finalize(Eo *obj, Ecore_Poller_Data *pd)
       return NULL;
    }
 
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 void
@@ -396,10 +396,10 @@ _ecore_poller_shutdown(void)
           {
              pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
              efl_parent_set(poller->obj, NULL);
-             if (eo_destructed_is(poller->obj))
-                eo_manual_free(poller->obj);
+             if (efl_destructed_is(poller->obj))
+                efl_manual_free(poller->obj);
              else
-                eo_manual_free_set(poller->obj, EINA_FALSE);
+                efl_manual_free_set(poller->obj, EINA_FALSE);
           }
      }
 }
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index d9572f0075..9998ff3126 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -14,7 +14,7 @@
 #define MY_CLASS_NAME "Efl_Loop_Timer"
 
 #define ECORE_TIMER_CHECK(obj)                       \
-  if (!eo_isa((obj), MY_CLASS)) \
+  if (!efl_isa((obj), MY_CLASS)) \
     return
 
 struct _Efl_Loop_Timer_Data
@@ -112,14 +112,14 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
      }
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(timer_watch,
+EFL_CALLBACKS_ARRAY_DEFINE(timer_watch,
                           { EFL_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
                           { EFL_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
 
 EOLIAN static Eo *
 _efl_loop_timer_efl_object_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
 {
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
 
    efl_event_callback_array_add(obj, timer_watch(), timer);
 
@@ -137,7 +137,7 @@ _efl_loop_timer_efl_object_finalize(Eo *obj, Efl_Loop_Timer_Data *pd)
 {
    _efl_loop_timer_util_instanciate(pd);
 
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy;
@@ -172,7 +172,7 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
      legacy->inside_call = 0;
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(legacy_timer,
+EFL_CALLBACKS_ARRAY_DEFINE(legacy_timer,
                           { EFL_LOOP_TIMER_EVENT_TICK, _ecore_timer_legacy_tick },
                           { EFL_EVENT_DEL, _ecore_timer_legacy_del });
 
@@ -190,10 +190,10 @@ ecore_timer_add(double        in,
 
    legacy->func = func;
    legacy->data = data;
-   timer = eo_add(MY_CLASS, ecore_main_loop_get(),
-                  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));
+   timer = efl_add(MY_CLASS, ecore_main_loop_get(),
+                  efl_event_callback_array_add(efl_self, legacy_timer(), legacy),
+                  efl_key_data_set(efl_self, "_legacy", legacy),
+                  efl_loop_timer_interval_set(efl_self, in));
 
    return timer;
 }
@@ -212,11 +212,11 @@ ecore_timer_loop_add(double        in,
 
    legacy->func = func;
    legacy->data = data;
-   timer = eo_add(MY_CLASS, ecore_main_loop_get(),
-                  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));
+   timer = efl_add(MY_CLASS, ecore_main_loop_get(),
+                  efl_event_callback_array_add(efl_self, legacy_timer(), legacy),
+                  efl_key_data_set(efl_self, "_legacy", legacy),
+                  efl_loop_timer_loop_reset(efl_self),
+                  efl_loop_timer_interval_set(efl_self, in));
 
    return timer;
 }
@@ -236,7 +236,7 @@ ecore_timer_del(Ecore_Timer *timer)
      {
         // Just in case it is an Eo timer, but not a legacy one.
         ERR("You are trying to destroy a timer which seems dead already.");
-        eo_unref(timer);
+        efl_unref(timer);
         return NULL;
      }
 
@@ -356,7 +356,7 @@ _efl_loop_timer_efl_object_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data
 
    EINA_MAIN_LOOP_CHECK_RETURN;
 
-   efl_event_freeze(eo_super(obj, MY_CLASS));
+   efl_event_freeze(efl_super(obj, MY_CLASS));
 
    /* Timer already frozen */
    if (timer->frozen)
@@ -404,7 +404,7 @@ _efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
 
    EINA_MAIN_LOOP_CHECK_RETURN;
 
-   efl_event_thaw(eo_super(obj, MY_CLASS));
+   efl_event_thaw(efl_super(obj, MY_CLASS));
 
    /* Timer not frozen */
    if (!timer->frozen)
@@ -479,7 +479,7 @@ _efl_loop_timer_efl_object_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *
    else if (first == suspended)
      suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
 
-   efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
+   efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
 
    if (efl_parent_get(obj) != parent)
      return ;
@@ -511,7 +511,7 @@ _efl_loop_timer_efl_object_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
    else if (first == suspended)
      suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 void
@@ -575,7 +575,7 @@ _efl_loop_timer_next_get(void)
    object = _efl_loop_timer_first_get();
    if (!object) return -1;
 
-   first = _efl_loop_timer_after_get(eo_data_scope_get(object, MY_CLASS));
+   first = _efl_loop_timer_after_get(efl_data_scope_get(object, MY_CLASS));
 
    now = ecore_loop_time_get();
    in = first->at - now;
@@ -656,7 +656,7 @@ _efl_loop_timer_expired_call(double when)
              continue;
           }
 
-        eo_ref(timer->object);
+        efl_ref(timer->object);
         eina_evlog("+timer", timer, 0.0, NULL);
         efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
         eina_evlog("-timer", timer, 0.0, NULL);
@@ -667,7 +667,7 @@ _efl_loop_timer_expired_call(double when)
           timer_current = (Efl_Loop_Timer_Data *)EINA_INLIST_GET(timer_current)->next;
 
         _efl_loop_timer_reschedule(timer, when);
-        eo_unref(timer->object);
+        efl_unref(timer->object);
      }
    return 0;
 }
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index dc7f472349..672dc187fe 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -146,14 +146,14 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
      }
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(fd_watch,
+EFL_CALLBACKS_ARRAY_DEFINE(fd_watch,
                           { EFL_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
                           { EFL_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
 
 static Efl_Object *
 _efl_loop_fd_efl_object_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
 {
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
 
    efl_event_callback_array_add(obj, fd_watch(), pd);
 
@@ -168,7 +168,7 @@ _efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *pa
    if (pd->handler) ecore_main_fd_handler_del(pd->handler);
    pd->handler = NULL;
 
-   efl_parent_set(eo_super(obj, MY_CLASS), parent);
+   efl_parent_set(efl_super(obj, MY_CLASS), parent);
 
    if (parent == NULL) return ;
 
@@ -178,7 +178,7 @@ _efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *pa
 static void
 _efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 
    ecore_main_fd_handler_del(pd->handler);
 }
diff --git a/src/lib/ecore/efl_loop_user.c b/src/lib/ecore/efl_loop_user.c
index 3dc8ffaa9e..78ac3a83d7 100644
--- a/src/lib/ecore/efl_loop_user.c
+++ b/src/lib/ecore/efl_loop_user.c
@@ -23,7 +23,7 @@ _efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED
    if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
      return ;
 
-   efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
+   efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
 }
 
 #include "efl_loop_user.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio.c b/src/lib/ecore_audio/ecore_audio.c
index 2a104eb36d..f57eca8256 100644
--- a/src/lib/ecore_audio/ecore_audio.c
+++ b/src/lib/ecore_audio/ecore_audio.c
@@ -37,7 +37,7 @@ ecore_audio_init(void)
    if (!ecore_init())
      return --_ecore_audio_init_count;
 
-   if (!eo_init()) {
+   if (!efl_object_init()) {
      ecore_shutdown();
      return --_ecore_audio_init_count;
    }
@@ -85,7 +85,7 @@ ecore_audio_shutdown(void)
    eina_log_domain_unregister(_ecore_audio_log_dom);
    _ecore_audio_log_dom = -1;
 
-   eo_shutdown();
+   efl_object_shutdown();
    ecore_shutdown();
 
    return _ecore_audio_init_count;
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index 26b34ae4e5..5c7abe2688 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -58,7 +58,7 @@ EOLIAN static Eo *
 _ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
 {
   obj->volume = 1.0;
-  return efl_constructor(eo_super(eo_obj, MY_CLASS));
+  return efl_constructor(efl_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 6f20d43bb5..ff8bd5b900 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -98,7 +98,7 @@ EOLIAN static ssize_t
 _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
 {
   ssize_t len_read = 0;
-  const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (ea_obj->paused) {
     memset(buf, 0, len);
@@ -124,7 +124,7 @@ EOLIAN static ssize_t
 _ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len)
 {
   ssize_t len_read = 0;
-  const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (ea_obj->vio && ea_obj->vio->vio->read) {
       len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len);
@@ -151,7 +151,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, efl_key_data_free_func free_func)
 {
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (ea_obj->vio)
     _free_vio(ea_obj);
@@ -173,7 +173,7 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
 EOLIAN static Eo *
 _ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
 {
-  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
   obj->speed = 1.0;
 
@@ -186,7 +186,7 @@ _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);
 
-  efl_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(efl_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 887ec8b7c0..22ad63d758 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -49,8 +49,8 @@ _ecore_audio_in_sndfile_ecore_audio_in_seek(Eo *eo_obj EINA_UNUSED, Ecore_Audio_
 EOLIAN static Eina_Bool
 _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source)
 {
-  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);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
 
   if (!ESF_LOAD()) return EINA_FALSE;
   if (obj->handle) {
@@ -92,14 +92,14 @@ _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
 EOLIAN static const char*
 _ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
 {
-  Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
   return obj->source;
 }
 
 EOLIAN static Eina_Bool
 _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format)
 {
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (ea_obj->source) {
       ERR("Input is already open - cannot change format");
@@ -131,7 +131,7 @@ _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
 EOLIAN static Ecore_Audio_Format
 _ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
 {
-  Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
   return obj->format;;
 }
 
@@ -147,8 +147,8 @@ 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, 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);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
 
   if (!ESF_LOAD()) return;
   if (obj->handle) {
@@ -201,7 +201,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
 EOLIAN static void
 _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);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ESF_LOAD()) return;
   if (obj->handle)
@@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile
   if (ea_obj->vio)
     _free_vio(ea_obj);
 
-  efl_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(efl_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 a44387b727..0c22edb90e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -29,7 +29,7 @@ EOLIAN static ssize_t
 _ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len)
 {
   size_t i, remain;
-  Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
+  Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
 
   float *val = data;
 
@@ -50,7 +50,7 @@ EOLIAN static double
 _ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode)
 {
   int tmp;
-  Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
+  Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
 
   switch (mode) {
     case SEEK_SET:
@@ -78,7 +78,7 @@ err:
 EOLIAN static void
 _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length)
 {
-  Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
+  Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
   in_obj->length = length;
 }
 
@@ -90,7 +90,7 @@ _ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Dat
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       obj->freq = *(int *)val;
   } else {
-      efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
+      efl_key_data_set(efl_super(eo_obj, MY_CLASS), key, val);
   }
 
 }
@@ -101,16 +101,16 @@ _ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Dat
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       return (void *) (intptr_t) obj->freq;
   } else {
-      return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key);
+      return efl_key_data_get(efl_super(eo_obj, MY_CLASS), key);
   }
 }
 
 EOLIAN static Eo *
 _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);
+  Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
 
-  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
   in_obj->channels = 1;
   in_obj->samplerate = 44100;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 10e26c5430..7e1d39beca 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -22,8 +22,8 @@ static Eina_Bool _write_cb(void *data)
   Eo *eo_obj = data;
   Eo *in;
 
-  Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   ssize_t written, bread = 0;
   float buf[1024];
@@ -54,9 +54,9 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
 {
   Ecore_Audio_Input *in;
 
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
-  in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
+  in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
 
   if (in->output == eo_obj)
     return EINA_FALSE;
@@ -81,7 +81,7 @@ _ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
 {
   Ecore_Audio_Input *in;
 
-  in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
+  in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
 
   if (in->output != eo_obj)
     return EINA_FALSE;
@@ -115,7 +115,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, efl_key_data_free_func free_func)
 {
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (ea_obj->vio)
     _free_vio(ea_obj);
@@ -132,7 +132,7 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
 EOLIAN static Eo *
 _ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
 {
-  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
   obj->need_writer = EINA_TRUE;
 
@@ -149,7 +149,7 @@ _ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
       ecore_audio_obj_out_input_detach(eo_obj, in);
   }
 
-  efl_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(efl_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 91977b80c2..21c21c1ddb 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
@@ -209,7 +209,7 @@ EOLIAN static void
 _ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, void *sd EINA_UNUSED, double volume)
 {
    // TODO Change volume of playing inputs
-   ecore_audio_obj_volume_set(eo_super(obj, MY_CLASS), volume);
+   ecore_audio_obj_volume_set(efl_super(obj, MY_CLASS), volume);
 }
 
 EOLIAN static Eina_Bool
@@ -220,7 +220,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
    OSStatus err;
    Eina_Bool chk;
 
-   chk = ecore_audio_obj_out_input_attach(eo_super(obj, MY_CLASS), input);
+   chk = ecore_audio_obj_out_input_attach(efl_super(obj, MY_CLASS), input);
    if (EINA_UNLIKELY(!chk))
      {
         ERR("Failed to attach input (eo_do_super)");
@@ -312,7 +312,7 @@ free_proc_id:
 free_helper:
    free(helper);
 detach:
-   ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input);
+   ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input);
 return_failure:
    return EINA_FALSE;
 }
@@ -328,7 +328,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
    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);
+   ret = ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input);
 
    return ret;
 }
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 c920f95f89..5adef64a67 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -52,7 +52,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
   Eina_List *input;
   uint32_t idx;
   pa_cvolume pa_volume;
-  Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
   if (!EPA_LOAD()) return;
   if (volume < 0)
@@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
 
   EPA_CALL(pa_cvolume_set)(&pa_volume, 2, volume * PA_VOLUME_NORM);
 
-  ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume);
+  ecore_audio_obj_volume_set(efl_super(eo_obj, MY_CLASS), volume);
 
   EINA_LIST_FOREACH(out_obj->inputs, input, in) {
       stream = efl_key_data_get(in, "pulse_data");
@@ -110,10 +110,10 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
   double speed = 0;
   pa_stream *stream;
   Eina_Bool ret = EINA_FALSE;
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!EPA_LOAD()) return EINA_FALSE;
-  ret = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in);
+  ret = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in);
   if (!ret)
     return EINA_FALSE;
 
@@ -128,7 +128,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
   stream = EPA_CALL(pa_stream_new)(class_vars.context, name, &ss, NULL);
   if (!stream) {
       ERR("Could not create stream");
-      ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in);
+      ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
       return EINA_FALSE;
   }
 
@@ -184,7 +184,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
   pa_operation *op;
 
   if (!EPA_LOAD()) return EINA_FALSE;
-  ret2 = ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in);
+  ret2 = ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
   if (!ret2)
     return EINA_FALSE;
 
@@ -214,7 +214,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
    
    //ref everything in the list to be sure...
    EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-      eo_ref(eo_obj);
+      efl_ref(eo_obj);
    }
    // the callback here can delete things in the list..
    if (state == PA_CONTEXT_READY) {
@@ -232,7 +232,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
    }
    // now unref everything safely
    EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
-      eo_unref(eo_obj);
+      efl_unref(eo_obj);
    }
 }
 
@@ -247,7 +247,7 @@ static void _state_job(void *data EINA_UNUSED)
         DBG("PA context fail.");
         //ref everything in the list to be sure...
         EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-           eo_ref(eo_obj);
+           efl_ref(eo_obj);
         }
         // the callback here can delete things in the list..
         EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
@@ -255,7 +255,7 @@ static void _state_job(void *data EINA_UNUSED)
         }
         // now unref everything safely
         EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
-           eo_unref(eo_obj);
+           efl_unref(eo_obj);
         }
      }
    class_vars.state_job = NULL;
@@ -266,10 +266,10 @@ _ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_
 {
   int argc;
   char **argv;
-  Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
   if (!EPA_LOAD()) return NULL;
-  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
   out_obj->need_writer = EINA_FALSE;
 
@@ -296,7 +296,7 @@ EOLIAN static void
 _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);
-  efl_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(efl_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 fddc898dca..ab8ad7ba62 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -33,9 +33,9 @@ static Eina_Bool _write_cb(void *data)
   Eo *eo_obj = data;
   Eo *in;
 
-  Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS);
-  Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Out_Sndfile_Data *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   ssize_t written, bread = 0;
   float buf[1024];
@@ -63,12 +63,12 @@ static Eina_Bool _write_cb(void *data)
 EOLIAN static Eina_Bool
 _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in)
 {
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
-  Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
   Eina_Bool ret2 = EINA_FALSE;
 
   if (!ESF_LOAD()) return EINA_FALSE;
-  ret2 = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in);
+  ret2 = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in);
   if (!ret2)
     return EINA_FALSE;
 
@@ -80,7 +80,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
   if (!obj->handle) {
     eina_stringshare_del(ea_obj->source);
     ea_obj->source = NULL;
-    ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in);
+    ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
     return EINA_FALSE;
   }
 
@@ -97,7 +97,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
 EOLIAN static Eina_Bool
 _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source)
 {
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ESF_LOAD()) return EINA_FALSE;
   if (obj->handle) {
@@ -118,14 +118,14 @@ _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
 EOLIAN static const char*
 _ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
 {
-  Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
   return obj->source;
 }
 
 EOLIAN static Eina_Bool
 _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format)
 {
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (ea_obj->source) {
       ERR("Input is already open - cannot change format");
@@ -157,16 +157,16 @@ _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
 EOLIAN static Ecore_Audio_Format
 _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
 {
-  Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
   return obj->format;
 }
 
 EOLIAN static Eo *
 _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);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
-  eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+  eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
   ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
 
@@ -178,7 +178,7 @@ _ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndf
 EOLIAN static void
 _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);
+  Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
 
   if (!ESF_LOAD()) return;
   if (obj->handle)
@@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfi
   if (out_obj->write_idler)
     ecore_idler_del(out_obj->write_idler);
 
-  efl_destructor(eo_super(eo_obj, MY_CLASS));
+  efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 #include "ecore_audio_out_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
index 4a629c8acf..e24a178871 100644
--- a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
+++ b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
@@ -16,7 +16,7 @@
 static sf_count_t _wrap_get_filelen(void *data)
 {
   Eo *eo_obj = data;
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ea_obj->vio->vio)
     goto error;
@@ -31,7 +31,7 @@ error:
 static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data)
 {
   Eo *eo_obj = data;
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ea_obj->vio->vio)
     goto error;
@@ -46,7 +46,7 @@ error:
 static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data)
 {
   Eo *eo_obj = data;
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ea_obj->vio->vio)
     goto error;
@@ -61,7 +61,7 @@ error:
 static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data)
 {
   Eo *eo_obj = data;
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ea_obj->vio->vio)
     goto error;
@@ -76,7 +76,7 @@ error:
 static sf_count_t _wrap_tell(void *data)
 {
   Eo *eo_obj = data;
-  Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
+  Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
 
   if (!ea_obj->vio->vio)
     goto error;
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index b1b87bf366..9d304ac4b9 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -123,7 +123,7 @@ int sd_fd_max = 0;
 void
 _ecore_con_client_kill(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (cl->delete_me)
      DBG("Multi kill request for client %p", cl);
    else
@@ -141,7 +141,7 @@ _ecore_con_client_kill(Ecore_Con_Client *obj)
 void
 _ecore_con_server_kill(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (svr->delete_me)
      DBG("Multi kill request for svr %p", svr);
    else
@@ -267,7 +267,7 @@ ecore_con_shutdown(void)
 
    EINA_LIST_FOREACH_SAFE(servers, l, l2, obj)
      {
-        Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
         Ecore_Con_Event_Server_Add *ev;
 
         if (!svr) continue;
@@ -305,7 +305,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n
    if (!name || !done_cb)
      return EINA_FALSE;
 
-   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, 1025));
+   obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, 1025));
 
    lk = malloc(sizeof (Ecore_Con_Lookup));
    if (!lk)
@@ -359,7 +359,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
 
    /* local  system socket: FILE:   /tmp/.ecore_service|[name]|[port] */
    /* remote system socket: TCP/IP: [name]:[port] */
-   obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, port));
+   obj = efl_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(efl_self, compl_type), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, port));
 
    ecore_con_server_data_set(obj, (void *) data);
 
@@ -369,7 +369,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
 EOLIAN static Eo *
 _efl_network_server_efl_object_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
 {
-   obj = efl_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   obj = efl_constructor(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->fd = -1;
    svr->reject_excess_clients = EINA_FALSE;
@@ -385,7 +385,7 @@ _efl_network_server_efl_object_finalize(Ecore_Con_Server *obj, Efl_Network_Serve
    Ecore_Con_Type compl_type = svr->type;
    Ecore_Con_Type type;
 
-   efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   efl_finalize(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->created = EINA_TRUE;
    svr->ppid = getpid();
@@ -455,7 +455,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
    /* local  user   socket: FILE:   ~/.ecore/[name]/[port] */
    /* local  system socket: FILE:   /tmp/.ecore_service|[name]|[port] */
    /* remote system socket: TCP/IP: [name]:[port] */
-   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, port));
+   obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_self, compl_type), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, port));
 
    ecore_con_server_data_set(obj, (void *) data);
 
@@ -465,13 +465,13 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
 EOLIAN static Eo *
 _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);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Type compl_type = svr->type;
    Ecore_Con_Type type;
 
    /* XXX: We intentionally put SERVER class here and not connector, as we'd
     * like to skip that one. */
-   efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   efl_finalize(efl_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;
@@ -568,7 +568,7 @@ EAPI void *
 ecore_con_server_del(Ecore_Con_Server *obj)
 {
    if (!obj) return NULL;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
 
    if (!svr || svr->delete_me)
      return NULL;
@@ -583,7 +583,7 @@ ecore_con_server_del(Ecore_Con_Server *obj)
 EAPI void *
 ecore_con_server_data_get(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr)
       return NULL;
 
@@ -594,7 +594,7 @@ EAPI void *
 ecore_con_server_data_set(Ecore_Con_Server *obj,
                           void *data)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    void *ret = NULL;
 
    if (!svr)
@@ -803,7 +803,7 @@ _efl_network_client_efl_network_send(Eo *obj EINA_UNUSED, Efl_Network_Client_Dat
      ecore_main_fd_handler_active_set(cl->fd_handler, ECORE_FD_READ | ECORE_FD_WRITE);
 
    if (cl->host_server)
-      host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_CLIENT_CLASS);
+      host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_CLIENT_CLASS);
 
 
    if (cl->host_server && ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP))
@@ -886,7 +886,7 @@ EAPI void *
 ecore_con_client_del(Ecore_Con_Client *obj)
 {
    if (!obj) return NULL;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl) return NULL;
 
 #ifdef _WIN32
@@ -901,7 +901,7 @@ EAPI void
 ecore_con_client_data_set(Ecore_Con_Client *obj,
                           const void *data)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
       return;
 
@@ -911,7 +911,7 @@ ecore_con_client_data_set(Ecore_Con_Client *obj,
 EAPI void *
 ecore_con_client_data_get(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
       return NULL;
 
@@ -936,7 +936,7 @@ ecore_con_client_ip_get(const Ecore_Con *obj)
 EOLIAN static int
 _efl_network_client_efl_network_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
 {
-   Efl_Network_Server_Data *sd = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *sd = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    if (sd->type != ECORE_CON_REMOTE_TCP &&
        sd->type != ECORE_CON_REMOTE_MCAST &&
@@ -1017,7 +1017,7 @@ ecore_con_client_fd_get(const Ecore_Con *obj)
 void
 ecore_con_event_proxy_bind(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Proxy_Bind *e;
    int ev = ECORE_CON_EVENT_PROXY_BIND;
 
@@ -1037,7 +1037,7 @@ ecore_con_event_proxy_bind(Ecore_Con_Server *obj)
 void
 ecore_con_event_server_add(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    /* we got our server! */
    Ecore_Con_Event_Server_Add *e;
    int ev = ECORE_CON_EVENT_SERVER_ADD;
@@ -1060,7 +1060,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
 void
 ecore_con_event_server_del(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Server_Del *e;
 
    svr->delete_me = EINA_TRUE;
@@ -1085,7 +1085,7 @@ ecore_con_event_server_del(Ecore_Con_Server *obj)
 void
 ecore_con_event_server_write(Ecore_Con_Server *obj, int num)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Server_Write *e;
 
    e = ecore_con_event_server_write_alloc();
@@ -1103,7 +1103,7 @@ ecore_con_event_server_write(Ecore_Con_Server *obj, int num)
 void
 ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num, Eina_Bool duplicate)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Server_Data *e;
 
    e = ecore_con_event_server_data_alloc();
@@ -1140,14 +1140,14 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
 void
 ecore_con_event_client_add(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Event_Client_Add *e;
    int ev = ECORE_CON_EVENT_CLIENT_ADD;
 
    e = ecore_con_event_client_add_alloc();
    EINA_SAFETY_ON_NULL_RETURN(e);
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    cl->event_count = eina_list_append(cl->event_count, e);
    host_server->event_count = eina_list_append(host_server->event_count, e);
@@ -1164,7 +1164,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
 void
 ecore_con_event_client_del(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Event_Client_Del *e;
 
    if (!cl) return;
@@ -1174,7 +1174,7 @@ ecore_con_event_client_del(Ecore_Con_Client *obj)
    EINA_SAFETY_ON_NULL_RETURN(e);
    cl->event_count = eina_list_append(cl->event_count, e);
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    host_server->event_count = eina_list_append(host_server->event_count, e);
    _ecore_con_cl_timer_update(obj);
@@ -1187,13 +1187,13 @@ ecore_con_event_client_del(Ecore_Con_Client *obj)
 void
 ecore_con_event_client_write(Ecore_Con_Client *obj, int num)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Event_Client_Write *e;
 
    e = ecore_con_event_client_write_alloc();
    EINA_SAFETY_ON_NULL_RETURN(e);
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    cl->event_count = eina_list_append(cl->event_count, e);
    host_server->event_count = eina_list_append(host_server->event_count, e);
@@ -1207,13 +1207,13 @@ ecore_con_event_client_write(Ecore_Con_Client *obj, int num)
 void
 ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, Eina_Bool duplicate)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Event_Client_Data *e;
 
    e = ecore_con_event_client_data_alloc();
    EINA_SAFETY_ON_NULL_RETURN(e);
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    cl->event_count = eina_list_append(cl->event_count, e);
    host_server->event_count = eina_list_append(host_server->event_count, e);
@@ -1247,14 +1247,14 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
 void
 ecore_con_server_infos_del(Ecore_Con_Server *obj, void *info)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    svr->infos = eina_list_remove(svr->infos, info);
 }
 
 void
 _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool duplicate)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Server_Error *e;
 
    e = ecore_con_event_server_error_alloc();
@@ -1272,13 +1272,13 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
 void
 ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Event_Client_Error *e;
 
    e = ecore_con_event_client_error_alloc();
    EINA_SAFETY_ON_NULL_RETURN(e);
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    e->client = obj;
    e->error = strdup(error);
@@ -1335,7 +1335,7 @@ _efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
 
    EINA_LIST_FREE(svr->clients, cl_obj)
      {
-        Efl_Network_Client_Data *cl = eo_data_scope_get(cl_obj, EFL_NETWORK_CLIENT_CLASS);
+        Efl_Network_Client_Data *cl = efl_data_scope_get(cl_obj, EFL_NETWORK_CLIENT_CLASS);
         Ecore_Con_Event_Server_Add *ev;
 
         /* some pointer hacks here to prevent double frees if people are being stupid */
@@ -1373,7 +1373,7 @@ _efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
    servers = eina_list_remove(servers, obj);
    svr->data = NULL;
 
-   efl_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
+   efl_destructor(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
 end:
    return;
 }
@@ -1405,7 +1405,7 @@ _efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
              break;
           }
      }
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    if (host_server)
      {
@@ -1439,13 +1439,13 @@ _efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
    eina_stringshare_del(cl->ip);
    cl->data = NULL;
 
-   efl_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
+   efl_destructor(efl_super(obj, EFL_NETWORK_CLIENT_CLASS));
 }
 
 static Eina_Bool
 _ecore_con_server_timer(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    ecore_con_server_del(obj);
 
    svr->until_deletion = NULL;
@@ -1455,7 +1455,7 @@ _ecore_con_server_timer(Ecore_Con_Server *obj)
 static void
 _ecore_con_server_timer_update(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (svr->disconnect_time)
      {
         if (svr->disconnect_time > 0)
@@ -1487,7 +1487,7 @@ _ecore_con_server_timer_update(Ecore_Con_Server *obj)
 static Eina_Bool
 _ecore_con_client_timer(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    ecore_con_client_del(obj);
 
    cl->until_deletion = NULL;
@@ -1497,7 +1497,7 @@ _ecore_con_client_timer(Ecore_Con_Client *obj)
 static void
 _ecore_con_cl_timer_update(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (cl->disconnect_time)
      {
         if (cl->disconnect_time > 0)
@@ -1518,7 +1518,7 @@ _ecore_con_cl_timer_update(Ecore_Con_Client *obj)
      }
    else
      {
-        Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
         if (host_server && host_server->client_disconnect_time > 0)
           {
@@ -1543,7 +1543,7 @@ _ecore_con_cb_tcp_listen(void *data,
                          Ecore_Con_Info *net_info)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    struct linger lin;
    const char *memerr = NULL;
 #ifdef _WIN32
@@ -1655,7 +1655,7 @@ _ecore_con_cb_udp_listen(void *data,
                          Ecore_Con_Info *net_info)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Type type;
    struct ip_mreq mreq;
 #ifdef HAVE_IPV6
@@ -1770,7 +1770,7 @@ _ecore_con_cb_tcp_connect(void *data,
                           Ecore_Con_Info *net_info)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int res;
    int curstate = 0;
    const char *memerr = NULL;
@@ -1877,7 +1877,7 @@ _ecore_con_cb_udp_connect(void *data,
    int curstate = 0;
    int broadcast = 1;
    const char *memerr = NULL;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
 #ifdef _WIN32
    u_long mode = 1;
 #endif
@@ -1940,7 +1940,7 @@ error:
 static Ecore_Con_State
 svr_try_connect_plain(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int res;
    int so_err = 0;
    socklen_t size = sizeof(int);
@@ -2045,7 +2045,7 @@ _ecore_con_svr_tcp_handler(void *data,
    unsigned char client_addr[256];
    unsigned int client_addr_len;
    const char *clerr = NULL;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS);
 #ifdef _WIN32
    u_long mode = 1;
 #endif
@@ -2059,8 +2059,8 @@ _ecore_con_svr_tcp_handler(void *data,
 
    /* a new client */
 
-   obj = eo_add(EFL_NETWORK_CLIENT_CLASS, NULL);
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   obj = efl_add(EFL_NETWORK_CLIENT_CLASS, NULL);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
      {
         ecore_con_event_server_error(svr_obj, "Memory allocation failure when attempting to add a new client");
@@ -2138,7 +2138,7 @@ error:
 static void
 _ecore_con_cl_read(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int num = 0;
    Eina_Bool lost_server = EINA_TRUE;
    unsigned char buf[READBUFSIZ];
@@ -2198,7 +2198,7 @@ _ecore_con_cl_handler(void *data,
 {
    Ecore_Con_Server *obj = data;
    Eina_Bool want_read, want_write;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
 
    if (svr->delete_me)
      return ECORE_CALLBACK_RENEW;
@@ -2260,7 +2260,7 @@ _ecore_con_cl_udp_handler(void *data,
    int num;
    Ecore_Con_Server *obj = data;
    Eina_Bool want_read, want_write;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
 
    want_read = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ);
    want_write = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE);
@@ -2302,7 +2302,7 @@ _ecore_con_svr_udp_handler(void *data,
    u_long mode = 1;
 #endif
 
-   Efl_Network_Server_Data *svr = eo_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS);
    if (svr->delete_me)
      return ECORE_CALLBACK_RENEW;
 
@@ -2334,8 +2334,8 @@ _ecore_con_svr_udp_handler(void *data,
      }
 
 /* Create a new client for use in the client data event */
-   obj = eo_add(EFL_NETWORK_CLIENT_CLASS, NULL);
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   obj = efl_add(EFL_NETWORK_CLIENT_CLASS, NULL);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    EINA_SAFETY_ON_NULL_RETURN_VAL(cl, ECORE_CALLBACK_RENEW);
 
    cl->host_server = svr_obj;
@@ -2361,7 +2361,7 @@ _ecore_con_svr_udp_handler(void *data,
 static void
 _ecore_con_svr_cl_read(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    int num = 0;
    Eina_Bool lost_client = EINA_TRUE;
    unsigned char buf[READBUFSIZ];
@@ -2379,7 +2379,7 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *obj)
         _ecore_con_cl_timer_update(obj);
      }
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade))
      {
         num = recv(cl->fd, (char *)buf, sizeof(buf), 0);
@@ -2409,7 +2409,7 @@ _ecore_con_svr_cl_handler(void *data,
                           Ecore_Fd_Handler *fd_handler)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
 
    if (cl->delete_me)
      return ECORE_CALLBACK_RENEW;
@@ -2437,7 +2437,7 @@ _ecore_con_svr_cl_handler(void *data,
 static void
 _ecore_con_server_flush(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int count;
    size_t num;
    size_t buf_len;
@@ -2575,7 +2575,7 @@ _ecore_con_server_flush(Ecore_Con_Server *obj)
 static void
 _ecore_con_client_flush(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    int count = 0;
    size_t num = 0;
 
@@ -2604,7 +2604,7 @@ _ecore_con_client_flush(Ecore_Con_Client *obj)
         if (!cl->buf) return;
         num = eina_binbuf_length_get(cl->buf) - cl->buf_offset;
         if (num <= 0) return;
-        Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
         if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade))
           count = send(cl->fd, (char *)eina_binbuf_string_get(cl->buf) + cl->buf_offset, num, 0);
         else
@@ -2630,7 +2630,7 @@ _ecore_con_client_flush(Ecore_Con_Client *obj)
         eina_binbuf_free(cl->buf);
         cl->buf = NULL;
 #ifdef TCP_CORK
-        Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
         if ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_CORK)
           {
              int state = 0;
@@ -2650,13 +2650,13 @@ static void
 _ecore_con_event_client_add_free(Ecore_Con_Server *obj,
                                  void *ev)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Client_Add *e;
 
    e = ev;
    if (e->client)
      {
-        Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
+        Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
         Eina_Bool svrfreed = EINA_FALSE;
 
         if ((svr) && (cl))
@@ -2664,7 +2664,7 @@ _ecore_con_event_client_add_free(Ecore_Con_Server *obj,
              cl->event_count = eina_list_remove(cl->event_count, e);
              if (cl->host_server)
                {
-                  Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+                  Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
                   if (host_server)
                     host_server->event_count = eina_list_remove(host_server->event_count, ev);
                   if ((!svr->event_count) && (svr->delete_me))
@@ -2691,13 +2691,13 @@ static void
 _ecore_con_event_client_del_free(Ecore_Con_Server *obj,
                                  void *ev)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Client_Del *e;
 
    e = ev;
    if (e->client)
      {
-        Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
+        Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
         Eina_Bool svrfreed = EINA_FALSE;
 
         if ((svr) && (cl))
@@ -2705,7 +2705,7 @@ _ecore_con_event_client_del_free(Ecore_Con_Server *obj,
              cl->event_count = eina_list_remove(cl->event_count, e);
              if (cl->host_server)
                {
-                  Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+                  Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
                   if (host_server)
                     host_server->event_count = eina_list_remove(host_server->event_count, ev);
                   if ((!svr->event_count) && (svr->delete_me))
@@ -2731,10 +2731,10 @@ static void
 _ecore_con_event_client_write_free(Ecore_Con_Server *obj,
                                    Ecore_Con_Event_Client_Write *e)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (e->client)
      {
-        Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
+        Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
         Eina_Bool svrfreed = EINA_FALSE;
 
         if ((svr) && (cl))
@@ -2742,7 +2742,7 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *obj,
              cl->event_count = eina_list_remove(cl->event_count, e);
              if (cl->host_server)
                {
-                  Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+                  Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
                   if (host_server)
                     host_server->event_count = eina_list_remove(host_server->event_count, e);
                   if ((!svr->event_count) && (svr->delete_me))
@@ -2753,7 +2753,7 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *obj,
                }
              if (!svrfreed)
                {
-                  Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+                  Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
                   if (((!cl->event_count) && (cl->delete_me)) ||
                       ((cl->host_server &&
                         ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP ||
@@ -2772,13 +2772,13 @@ static void
 _ecore_con_event_client_data_free(Ecore_Con_Server *obj,
                                   void *ev)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Con_Event_Client_Data *e;
 
    e = ev;
    if (e->client)
      {
-        Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
+        Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
         Eina_Bool svrfreed = EINA_FALSE;
 
         if ((svr) && (cl))
@@ -2786,7 +2786,7 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *obj,
              cl->event_count = eina_list_remove(cl->event_count, e);
              if (cl->host_server)
                {
-                  Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+                  Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
                   if (host_server)
                     host_server->event_count = eina_list_remove(host_server->event_count, ev);
                }
@@ -2797,7 +2797,7 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *obj,
                }
              if (!svrfreed)
                {
-                  Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+                  Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
                   if (((!cl->event_count) && (cl->delete_me)) ||
                       ((cl->host_server &&
                         ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP ||
@@ -2822,7 +2822,7 @@ _ecore_con_event_server_add_free(void *data EINA_UNUSED,
    e = ev;
    if (e->server)
      {
-        Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
         if (svr)
           {
              svr->event_count = eina_list_remove(svr->event_count, ev);
@@ -2845,7 +2845,7 @@ _ecore_con_event_server_del_free(void *data EINA_UNUSED,
    e = ev;
    if (e->server)
      {
-        Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
         if (svr)
           {
              svr->event_count = eina_list_remove(svr->event_count, ev);
@@ -2865,7 +2865,7 @@ _ecore_con_event_server_write_free(void *data EINA_UNUSED,
 {
    if (e->server)
      {
-        Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
         if (svr)
           {
              svr->event_count = eina_list_remove(svr->event_count, e);
@@ -2888,7 +2888,7 @@ _ecore_con_event_server_data_free(void *data EINA_UNUSED,
    e = ev;
    if (e->server)
      {
-        Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
         if (svr)
           {
              svr->event_count = eina_list_remove(svr->event_count, ev);
@@ -2909,7 +2909,7 @@ _ecore_con_event_server_error_free(void *data EINA_UNUSED, Ecore_Con_Event_Serve
 {
    if (e->server)
      {
-        Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
+        Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
         if (svr)
           {
              svr->event_count = eina_list_remove(svr->event_count, e);
@@ -2927,10 +2927,10 @@ _ecore_con_event_server_error_free(void *data EINA_UNUSED, Ecore_Con_Event_Serve
 static void
 _ecore_con_event_client_error_free(Ecore_Con_Server *obj, Ecore_Con_Event_Client_Error *e)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (e->client)
      {
-        Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
+        Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
         Eina_Bool svrfreed = EINA_FALSE;
 
         if ((svr) && (cl))
@@ -2966,7 +2966,7 @@ _ecore_con_lookup_done(void *data,
    Ecore_Con_Server *obj = data;
    Ecore_Con_Lookup *lk;
 
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return;
    lk = svr->data;
 
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index e1fec9b611..4bf3a48228 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -178,7 +178,7 @@ _ecore_con_eet_read_cb(const void *eet_data, size_t size, void *user_data)
    Ecore_Con_Reply *n = user_data;
    Ecore_Con_Eet_Protocol *protocol;
    Ecore_Con_Eet_Data *cb;
-   Ecore_Con_Eet_Base_Data *ece_data = eo_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Base_Data *ece_data = efl_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
 
    protocol = eet_data_descriptor_decode(ece_data->edd, eet_data, size);
    if (!protocol) return EINA_TRUE;
@@ -208,7 +208,7 @@ static Eina_Bool
 _ecore_con_eet_client_write_cb(const void *data, size_t size, void *user_data)
 {
    Ecore_Con_Reply *n = user_data;
-   Ecore_Con_Eet_Base_Data *ece_data = eo_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Base_Data *ece_data = efl_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
 
    if (ecore_con_server_send(ece_data->server, data, size) != (int)size)
      return EINA_FALSE;
@@ -223,8 +223,8 @@ _ecore_con_eet_server_connected(void *data, int type EINA_UNUSED, Ecore_Con_Even
    Eina_List *ll;
    Ecore_Con_Reply *n;
    Ecore_Con_Eet *ece_obj = data;
-   Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
-   Ecore_Con_Eet_Server_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS);
+   Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Server_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS);
 
    if (ecore_con_client_server_get(ev->client) != base_data->server)
      return EINA_TRUE;
@@ -254,8 +254,8 @@ static Eina_Bool
 _ecore_con_eet_server_disconnected(void *data, int type EINA_UNUSED, Ecore_Con_Event_Client_Del *ev)
 {
    Ecore_Con_Eet *ece_obj = data;
-   Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
-   Ecore_Con_Eet_Server_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS);
+   Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Server_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS);
    Ecore_Con_Reply *n;
    Eina_List *l;
 
@@ -326,7 +326,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
                   char *buffer = (char *)&tmp[4];
                   char *protocol;
                   char *section;
-                  Ecore_Con_Eet_Base_Data *eceb_data = eo_data_scope_get(n->ece,ECORE_CON_EET_BASE_CLASS);
+                  Ecore_Con_Eet_Base_Data *eceb_data = efl_data_scope_get(n->ece,ECORE_CON_EET_BASE_CLASS);
 
                   protocol = buffer;
                   section = buffer + protocol_length;
@@ -367,7 +367,7 @@ static Eina_Bool
 _ecore_con_eet_server_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Client_Data *ev)
 {
    Ecore_Con_Eet *ece_obj = data;
-   Ecore_Con_Eet_Base_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Base_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
    Ecore_Con_Reply *n;
 
    if (ecore_con_client_server_get(ev->client) != r->server)
@@ -375,9 +375,9 @@ _ecore_con_eet_server_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Cli
 
    n = ecore_con_client_data_get(ev->client);
 
-   eo_ref(ece_obj);
+   efl_ref(ece_obj);
    _ecore_con_eet_data(n, ev->data, ev->size);
-   eo_unref(ece_obj);
+   efl_unref(ece_obj);
 
    return EINA_TRUE;
 }
@@ -389,8 +389,8 @@ _ecore_con_eet_client_connected(void *data, int type EINA_UNUSED, Ecore_Con_Even
 {
    Ecore_Con_Eet_Server *eces;
    Ecore_Con_Eet *ece_obj = data;
-   Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
-   Ecore_Con_Eet_Client_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
    Ecore_Con_Reply *n;
    Eina_List *ll;
 
@@ -407,7 +407,7 @@ _ecore_con_eet_client_connected(void *data, int type EINA_UNUSED, Ecore_Con_Even
 
    EINA_LIST_FOREACH(r->server_connect_callbacks, ll, eces)
      {
-        Ecore_Con_Eet_Base_Data *temp = eo_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
+        Ecore_Con_Eet_Base_Data *temp = efl_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
         if (!eces->func((void *)eces->data, n, temp->server))
           {
              eet_connection_close(n->econn, NULL);
@@ -425,8 +425,8 @@ static Eina_Bool
 _ecore_con_eet_client_disconnected(void *data, int type EINA_UNUSED, Ecore_Con_Event_Server_Del *ev)
 {
    Ecore_Con_Eet *ece_obj = data;
-   Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
-   Ecore_Con_Eet_Client_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
    Ecore_Con_Eet_Server *eces;
    Eina_List *ll;
 
@@ -448,16 +448,16 @@ static Eina_Bool
 _ecore_con_eet_client_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Server_Data *ev)
 {
    Ecore_Con_Eet *ece_obj = data;
-   Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
-   Ecore_Con_Eet_Client_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
 
    if (base_data->server != ev->server) return EINA_TRUE;
    if (!r->r) return EINA_TRUE;
 
    /* Got some data */
-   eo_ref(ece_obj);
+   efl_ref(ece_obj);
    _ecore_con_eet_data(r->r, ev->data, ev->size);
-   eo_unref(ece_obj);
+   efl_unref(ece_obj);
 
    return EINA_TRUE;
 }
@@ -505,9 +505,9 @@ _ecore_con_eet_base_data_callback_del(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Da
 EOLIAN static void
 _ecore_con_eet_base_raw_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name)
 {
-   Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
 
-   if (eo_isa(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS) &&
+   if (efl_isa(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS) &&
        eced->r->buffer_handler &&
        !strcmp(eced->r->buffer_handler->name, name))
      {
@@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
 EOLIAN static Efl_Object *
 _ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
+   obj = efl_constructor(efl_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
 
    if (!obj) return NULL;
 
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Ob
    ecore_event_handler_del(pd->handler_del);
    ecore_event_handler_del(pd->handler_data);
 
-   efl_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
+   efl_destructor(efl_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
 }
 
 EOLIAN static Efl_Object *
 _ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
+   obj = efl_constructor(efl_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
 
    if (!obj) return NULL;
 
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Ob
    ecore_event_handler_del(pd->handler_del);
    ecore_event_handler_del(pd->handler_data);
 
-   efl_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
+   efl_destructor(efl_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
 }
 
 EOLIAN static Efl_Object *
 _ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
+   obj = efl_constructor(efl_super(obj, ECORE_CON_EET_BASE_CLASS));
 
    if (!obj) return NULL;
 
@@ -675,7 +675,7 @@ _ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 EOLIAN static void
 _ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
-   efl_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
+   efl_destructor(efl_super(obj, ECORE_CON_EET_BASE_CLASS));
 
    eet_data_descriptor_free(pd->edd);
    eet_data_descriptor_free(pd->matching);
@@ -699,7 +699,7 @@ _ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 EOLIAN static void
 _ecore_con_eet_base_server_set(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data)
 {
-   if (!eo_isa(data, EFL_NETWORK_SERVER_CLASS))
+   if (!efl_isa(data, EFL_NETWORK_SERVER_CLASS))
      return;
 
    pd->server = data;
@@ -722,7 +722,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
 
    if (!server) return NULL;
 
-   ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eo_self, server));
+   ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server));
 
    return ece_obj;
 }
@@ -734,7 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
 
    if (!server) return NULL;
 
-   ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eo_self, server));
+   ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server));
 
    return ece_obj;
 }
@@ -778,7 +778,7 @@ ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
 EAPI void
 ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Server_Obj_Data *eces = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
+   Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
    Ecore_Con_Eet_Client *c;
 
    if (!eces || !func) return;
@@ -795,7 +795,7 @@ ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
 EAPI void
 ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Server_Obj_Data *eces = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
+   Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
    Ecore_Con_Eet_Client *c;
    Eina_List *l;
 
@@ -813,7 +813,7 @@ ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
 EAPI void
 ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Server_Obj_Data *eces = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
+   Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
    Ecore_Con_Eet_Client *c;
 
    if (!eces || !func) return;
@@ -830,7 +830,7 @@ ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
 EAPI void
 ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Server_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
+   Ecore_Con_Eet_Server_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
    Ecore_Con_Eet_Client *c;
    Eina_List *l;
 
@@ -848,7 +848,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
 EAPI void
 ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
    Ecore_Con_Eet_Server *s;
 
    if (!eced || !func) return;
@@ -865,7 +865,7 @@ ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
 EAPI void
 ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
    Ecore_Con_Eet_Server *s;
    Eina_List *l;
 
@@ -883,7 +883,7 @@ ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
 EAPI void
 ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
    Ecore_Con_Eet_Server *s;
 
    if (!eced || !func) return;
@@ -900,7 +900,7 @@ ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
 EAPI void
 ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
 {
-   Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
+   Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
    Ecore_Con_Eet_Server *s;
    Eina_List *l;
 
diff --git a/src/lib/ecore_con/ecore_con_info.c b/src/lib/ecore_con/ecore_con_info.c
index 093ab024c5..5038817c61 100644
--- a/src/lib/ecore_con/ecore_con_info.c
+++ b/src/lib/ecore_con/ecore_con_info.c
@@ -164,7 +164,7 @@ ecore_con_info_get(Ecore_Con_Server *obj,
                    void *data,
                    struct addrinfo *hints)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    CB_Data *cbdata;
 
    if (!svr) return 0;
diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index 6d3e2a594e..243584b962 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -72,7 +72,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
 #ifndef HAVE_LOCAL_SOCKETS
    return 0;
 #else
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    char buf[4096];
    struct sockaddr_un socket_unix;
    int curstate = 0;
@@ -213,7 +213,7 @@ ecore_con_local_listen(
   EINA_UNUSED)
 {
 #ifdef HAVE_LOCAL_SOCKETS
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    char buf[4096];
    struct sockaddr_un socket_unix;
    struct linger lin;
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 4a5dbadc34..09aa566707 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -36,11 +36,11 @@ static Eina_Bool
 _ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    void *buf;
    DWORD n;
    Eina_Bool broken_pipe = EINA_FALSE;
-   Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    if (!ResetEvent(host_svr->event_read))
      return ECORE_CALLBACK_RENEW;
@@ -89,8 +89,8 @@ static Eina_Bool
 _ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
-   Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Server_Data *host_svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 #if 0
    char *msg;
 #endif
@@ -118,7 +118,7 @@ static Eina_Bool
 _ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
 #if 0
    char *msg;
 #endif
@@ -145,7 +145,7 @@ static Eina_Bool
 _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    void *buf;
    DWORD n;
    Eina_Bool broken_pipe = EINA_FALSE;
@@ -198,7 +198,7 @@ static unsigned int __stdcall
 _ecore_con_local_win32_client_read_server_thread(void *data)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    DWORD nbr_bytes = 0;
 
    svr->read_stopped = EINA_FALSE;
@@ -235,8 +235,8 @@ static unsigned int __stdcall
 _ecore_con_local_win32_server_read_client_thread(void *data)
 {
    Ecore_Con_Client *obj = data;
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
-   Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Server_Data *host_svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    DWORD nbr_bytes = 0;
 
    host_svr->read_stopped = EINA_FALSE;
@@ -272,7 +272,7 @@ static Eina_Bool
 _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    Ecore_Win32_Handler *handler_read;
    Ecore_Win32_Handler *handler_peek;
 
@@ -286,8 +286,8 @@ _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
        (svr->client_count >= (unsigned int)svr->client_limit))
      return ECORE_CALLBACK_CANCEL;
 
-   Ecore_Con_Client *cl_obj = eo_add(EFL_NETWORK_CLIENT_CLASS, NULL);
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Ecore_Con_Client *cl_obj = efl_add(EFL_NETWORK_CLIENT_CLASS, NULL);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
      {
         ERR("allocation failed");
@@ -365,7 +365,7 @@ static unsigned int __stdcall
 _ecore_con_local_win32_listening(void *data)
 {
    Ecore_Con_Server *obj = data;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    BOOL res;
 
    while (1)
@@ -389,7 +389,7 @@ _ecore_con_local_win32_listening(void *data)
 Eina_Bool
 ecore_con_local_listen(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    char buf[256];
    HANDLE thread_listening;
    Ecore_Win32_Handler *handler;
@@ -476,7 +476,7 @@ free_path:
 void
 ecore_con_local_win32_server_del(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
      return;
 
@@ -506,8 +506,8 @@ ecore_con_local_win32_server_del(Ecore_Con_Server *obj)
 void
 ecore_con_local_win32_client_del(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
-   Efl_Network_Server_Data *svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
      return;
@@ -539,7 +539,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
                                              Ecore_Fd_Handler *fd_handler))
 {
 #warning "I am pretty sure cb_done should be used."
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    char buf[256];
    Ecore_Win32_Handler *handler_read;
    Ecore_Win32_Handler *handler_peek;
@@ -659,7 +659,7 @@ close_pipe:
 Eina_Bool
 ecore_con_local_win32_server_flush(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    size_t num;
    BOOL res;
    DWORD written;
@@ -706,12 +706,12 @@ ecore_con_local_win32_server_flush(Ecore_Con_Server *obj)
 Eina_Bool
 ecore_con_local_win32_client_flush(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    Ecore_Con_Type type;
    size_t num;
    BOOL res;
    DWORD written;
-   Efl_Network_Server_Data *svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
 
    type = svr->type & ECORE_CON_TYPE;
 
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index 3bebffeed9..0b8425957f 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -136,7 +136,7 @@ _ecore_con_socks_free(Ecore_Con_Socks *ecs)
 static Eina_Bool
 _ecore_con_socks_svr_init_v4(Ecore_Con_Server *obj, Ecore_Con_Socks_v4 *v4)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    size_t addrlen, buflen, ulen = 1;
    unsigned char *sbuf;
 
@@ -176,7 +176,7 @@ _ecore_con_socks_svr_init_v4(Ecore_Con_Server *obj, Ecore_Con_Socks_v4 *v4)
 static Eina_Bool
 _ecore_con_socks_svr_init_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    size_t buflen;
    unsigned int x;
    unsigned char *sbuf;
@@ -230,7 +230,7 @@ _ecore_con_socks_svr_init_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5)
 static void
 _ecore_con_socks_read_v4(Ecore_Con_Server *obj, Ecore_Con_Socks_v4 *v4 EINA_UNUSED, const unsigned char *buf, unsigned int num)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    const unsigned char *data;
    DBG("SOCKS: %d bytes", num);
    ECORE_CON_SOCKS_READ(8);
@@ -289,7 +289,7 @@ error:
 static Eina_Bool
 _ecore_con_socks_auth_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    size_t size;
    unsigned char *data;
    switch (v5->method)
@@ -328,7 +328,7 @@ _ecore_con_socks_auth_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5)
 static void
 _ecore_con_socks_read_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5, const unsigned char *buf, unsigned int num)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    const unsigned char *data;
 
    DBG("SOCKS: %d bytes", num);
@@ -545,7 +545,7 @@ ecore_con_socks_shutdown(void)
 void
 ecore_con_socks_read(Ecore_Con_Server *obj, unsigned char *buf, int num)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    ECORE_CON_SOCKS_VERSION_CHECK(svr->ecs);
    ECORE_CON_SOCKS_CAST(svr->ecs);
 
@@ -558,7 +558,7 @@ ecore_con_socks_read(Ecore_Con_Server *obj, unsigned char *buf, int num)
 Eina_Bool
 ecore_con_socks_svr_init(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    ECORE_CON_SOCKS_VERSION_CHECK_RETURN(svr->ecs, EINA_FALSE);
    ECORE_CON_SOCKS_CAST(svr->ecs);
 
@@ -573,7 +573,7 @@ ecore_con_socks_svr_init(Ecore_Con_Server *obj)
 void
 ecore_con_socks_dns_cb(const char *canonname EINA_UNUSED, const char *ip, struct sockaddr *addr, int addrlen EINA_UNUSED, Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    svr->ip = eina_stringshare_add(ip);
    svr->ecs_state++;
    if (addr->sa_family == AF_INET)
diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c
index c3338b2fb9..891467da0d 100644
--- a/src/lib/ecore_con/ecore_con_ssl.c
+++ b/src/lib/ecore_con/ecore_con_ssl.c
@@ -513,7 +513,7 @@ ecore_con_ssl_server_prepare(Ecore_Con_Server *svr,
 Ecore_Con_Ssl_Error
 ecore_con_ssl_server_init(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr || !(svr->type & ECORE_CON_SSL))
      return ECORE_CON_SSL_ERROR_NONE;
    return SSL_SUFFIX(_ecore_con_ssl_server_init) (obj);
@@ -522,7 +522,7 @@ ecore_con_ssl_server_init(Ecore_Con_Server *obj)
 Ecore_Con_Ssl_Error
 ecore_con_ssl_server_shutdown(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr || !(svr->type & ECORE_CON_SSL))
      return ECORE_CON_SSL_ERROR_NONE;
    return SSL_SUFFIX(_ecore_con_ssl_server_shutdown) (obj);
@@ -547,10 +547,10 @@ ecore_con_ssl_server_write(Ecore_Con_Server *svr,
 Ecore_Con_Ssl_Error
 ecore_con_ssl_client_init(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
      return ECORE_CON_SSL_ERROR_NONE;
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    if (!host_server || !(host_server->type & ECORE_CON_SSL))
      return ECORE_CON_SSL_ERROR_NONE;
    return SSL_SUFFIX(_ecore_con_ssl_client_init) (obj);
@@ -559,10 +559,10 @@ ecore_con_ssl_client_init(Ecore_Con_Client *obj)
 Ecore_Con_Ssl_Error
 ecore_con_ssl_client_shutdown(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
      return ECORE_CON_SSL_ERROR_NONE;
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    if (!host_server || !(host_server->type & ECORE_CON_SSL))
      return ECORE_CON_SSL_ERROR_NONE;
    return SSL_SUFFIX(_ecore_con_ssl_client_shutdown) (obj);
@@ -593,7 +593,7 @@ ecore_con_ssl_available_get(void)
 EAPI void
 ecore_con_ssl_server_verify(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return;
 
    svr->verify = EINA_TRUE;
@@ -602,7 +602,7 @@ ecore_con_ssl_server_verify(Ecore_Con_Server *obj)
 EAPI void
 ecore_con_ssl_server_verify_basic(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return;
 
    svr->verify_basic = EINA_TRUE;
@@ -611,7 +611,7 @@ ecore_con_ssl_server_verify_basic(Ecore_Con_Server *obj)
 EAPI void
 ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *obj, const char *name)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return;
 
    eina_stringshare_replace(&svr->verify_name, name);
@@ -620,7 +620,7 @@ ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *obj, const char *name)
 EAPI const char *
 ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return NULL;
 
    return svr->verify_name ? : svr->name;
@@ -630,7 +630,7 @@ EAPI Eina_Bool
 ecore_con_ssl_server_cert_add(Ecore_Con_Server *obj,
                               const char *cert)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return EINA_FALSE;
 
    if (!svr->ssl_prepared)
@@ -648,7 +648,7 @@ EAPI Eina_Bool
 ecore_con_ssl_server_cafile_add(Ecore_Con_Server *obj,
                                 const char *ca_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return EINA_FALSE;
 
    if (!svr->ssl_prepared)
@@ -666,7 +666,7 @@ EAPI Eina_Bool
 ecore_con_ssl_server_privkey_add(Ecore_Con_Server *obj,
                                  const char *key_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return EINA_FALSE;
 
    if (!svr->ssl_prepared)
@@ -684,7 +684,7 @@ EAPI Eina_Bool
 ecore_con_ssl_server_crl_add(Ecore_Con_Server *obj,
                              const char *crl_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return EINA_FALSE;
 
    if (!svr->ssl_prepared)
@@ -701,7 +701,7 @@ ecore_con_ssl_server_crl_add(Ecore_Con_Server *obj,
 EAPI Eina_Bool
 ecore_con_ssl_server_upgrade(Ecore_Con_Server *obj, Ecore_Con_Type ssl_type)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!svr) return EINA_FALSE;
 #if _ECORE_CON_SSL_AVAILABLE == 0
    return EINA_FALSE;
@@ -723,7 +723,7 @@ ecore_con_ssl_server_upgrade(Ecore_Con_Server *obj, Ecore_Con_Type ssl_type)
 EAPI Eina_Bool
 ecore_con_ssl_client_upgrade(Ecore_Con_Client *obj, Ecore_Con_Type ssl_type)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (!cl)
      {
         return EINA_FALSE;
@@ -732,7 +732,7 @@ ecore_con_ssl_client_upgrade(Ecore_Con_Client *obj, Ecore_Con_Type ssl_type)
    return EINA_FALSE;
 #endif
 
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    if (!host_server->ssl_prepared)
      {
         if (ecore_con_ssl_server_prepare(cl->host_server, ssl_type))
@@ -761,7 +761,7 @@ static Ecore_Con_Ssl_Error
 _ecore_con_ssl_server_prepare_gnutls(Ecore_Con_Server *obj,
                                      int ssl_type)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int ret;
 
    switch (ssl_type)
@@ -814,7 +814,7 @@ error:
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    const gnutls_datum_t *cert_list;
    unsigned int iter, cert_list_size;
    gnutls_x509_crt_t cert = NULL;
@@ -951,7 +951,7 @@ static Eina_Bool
 _ecore_con_ssl_server_cafile_add_gnutls(Ecore_Con_Server *obj,
                                         const char *ca_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    struct stat st;
    Eina_Iterator *it;
    const char *file;
@@ -987,7 +987,7 @@ static Eina_Bool
 _ecore_con_ssl_server_crl_add_gnutls(Ecore_Con_Server *obj,
                                      const char *crl_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    SSL_ERROR_CHECK_GOTO_ERROR(gnutls_certificate_set_x509_crl_file(svr->cert, crl_file,
                                                                    GNUTLS_X509_FMT_PEM) < 1);
 
@@ -1001,7 +1001,7 @@ static Eina_Bool
 _ecore_con_ssl_server_privkey_add_gnutls(Ecore_Con_Server *obj,
                                          const char *key_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    SSL_ERROR_CHECK_GOTO_ERROR(gnutls_certificate_set_x509_key_file(svr->cert, svr->cert_file, key_file,
                                                                    GNUTLS_X509_FMT_PEM));
 
@@ -1015,7 +1015,7 @@ static Eina_Bool
 _ecore_con_ssl_server_cert_add_gnutls(Ecore_Con_Server *obj,
                                       const char *cert_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (!(svr->cert_file = strdup(cert_file)))
      return EINA_FALSE;
 
@@ -1025,7 +1025,7 @@ _ecore_con_ssl_server_cert_add_gnutls(Ecore_Con_Server *obj,
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_server_shutdown_gnutls(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (svr->session)
      {
         gnutls_bye(svr->session, GNUTLS_SHUT_RDWR);
@@ -1074,7 +1074,7 @@ _ecore_con_ssl_server_read_gnutls(Ecore_Con_Server *obj,
                                   unsigned char *buf,
                                   int size)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int num;
 
    if (svr->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING)
@@ -1110,7 +1110,7 @@ _ecore_con_ssl_server_write_gnutls(Ecore_Con_Server *obj,
                                    const unsigned char *buf,
                                    int size)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int num;
 
    if (svr->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING)
@@ -1144,8 +1144,8 @@ _ecore_con_ssl_server_write_gnutls(Ecore_Con_Server *obj,
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    const gnutls_datum_t *cert_list;
    unsigned int iter, cert_list_size;
    const char *priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT";
@@ -1286,7 +1286,7 @@ error:
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_client_shutdown_gnutls(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (cl->session)
      {
         gnutls_bye(cl->session, GNUTLS_SHUT_RDWR);
@@ -1305,7 +1305,7 @@ _ecore_con_ssl_client_read_gnutls(Ecore_Con_Client *obj,
                                   unsigned char *buf,
                                   int size)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    int num;
 
    if (cl->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING)
@@ -1341,7 +1341,7 @@ _ecore_con_ssl_client_write_gnutls(Ecore_Con_Client *obj,
                                    const unsigned char *buf,
                                    int size)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    int num;
 
    if (cl->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING)
@@ -1380,7 +1380,7 @@ static Ecore_Con_Ssl_Error
 _ecore_con_ssl_server_prepare_openssl(Ecore_Con_Server *obj,
                                       int ssl_type)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    long options;
    int dh = 0;
 
@@ -1446,7 +1446,7 @@ error:
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_server_init_openssl(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int ret = -1;
 
    switch (svr->ssl_state)
@@ -1541,7 +1541,7 @@ static Eina_Bool
 _ecore_con_ssl_server_cafile_add_openssl(Ecore_Con_Server *obj,
                                          const char *ca_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    struct stat st;
 
    if (stat(ca_file, &st)) return EINA_FALSE;
@@ -1560,7 +1560,7 @@ static Eina_Bool
 _ecore_con_ssl_server_crl_add_openssl(Ecore_Con_Server *obj,
                                       const char *crl_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    X509_STORE *st;
    X509_LOOKUP *lu;
    static Eina_Bool flag = EINA_FALSE;
@@ -1585,7 +1585,7 @@ static Eina_Bool
 _ecore_con_ssl_server_privkey_add_openssl(Ecore_Con_Server *obj,
                                           const char *key_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    FILE *fp = NULL;
    EVP_PKEY *privkey = NULL;
 
@@ -1612,7 +1612,7 @@ static Eina_Bool
 _ecore_con_ssl_server_cert_add_openssl(Ecore_Con_Server *obj,
                                        const char *cert_file)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    FILE *fp = NULL;
    X509 *cert = NULL;
 
@@ -1637,7 +1637,7 @@ error:
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_server_shutdown_openssl(Ecore_Con_Server *obj)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    if (svr->ssl)
      {
         if (!SSL_shutdown(svr->ssl))
@@ -1661,7 +1661,7 @@ _ecore_con_ssl_server_read_openssl(Ecore_Con_Server *obj,
                                    unsigned char *buf,
                                    int size)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int num;
 
    if (!svr->ssl) return -1;
@@ -1692,7 +1692,7 @@ _ecore_con_ssl_server_write_openssl(Ecore_Con_Server *obj,
                                     const unsigned char *buf,
                                     int size)
 {
-   Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
    int num;
 
    num = SSL_write(svr->ssl, buf, size);
@@ -1720,8 +1720,8 @@ _ecore_con_ssl_server_write_openssl(Ecore_Con_Server *obj,
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_client_init_openssl(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
-   Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
    int ret = -1;
    switch (cl->ssl_state)
      {
@@ -1788,7 +1788,7 @@ error:
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_client_shutdown_openssl(Ecore_Con_Client *obj)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    if (cl->ssl)
      {
         if (!SSL_shutdown(cl->ssl))
@@ -1808,7 +1808,7 @@ _ecore_con_ssl_client_read_openssl(Ecore_Con_Client *obj,
                                    unsigned char *buf,
                                    int size)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    int num;
 
    if (!cl->ssl) return -1;
@@ -1839,7 +1839,7 @@ _ecore_con_ssl_client_write_openssl(Ecore_Con_Client *obj,
                                     const unsigned char *buf,
                                     int size)
 {
-   Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
+   Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
    int num;
 
    num = SSL_write(cl->ssl, buf, size);
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 8e3b64f6a4..c47ee5f386 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -215,7 +215,7 @@ _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event
                    (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(efl_network_url_event_table_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(efl_network_url_event_table_callbacks,
   { EFL_NETWORK_URL_EVENT_DATA, _efl_network_url_event_data_cb },
   { EFL_NETWORK_URL_EVENT_PROGRESS, _efl_network_url_event_progress_cb },
   { EFL_NETWORK_URL_EVENT_COMPLETE, _efl_network_url_event_complete_cb }
@@ -225,7 +225,7 @@ EAPI Ecore_Con_Url *
 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));
+   url_obj = efl_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(efl_self, url));
 
    efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
 
@@ -235,7 +235,7 @@ ecore_con_url_new(const char *url)
 EOLIAN static Eo *
 _efl_network_url_efl_object_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
 {
-   url_obj = efl_constructor(eo_super(url_obj, MY_CLASS));
+   url_obj = efl_constructor(efl_super(url_obj, MY_CLASS));
 
    if (!_init_count || !_c_init())
      {
@@ -251,7 +251,7 @@ _efl_network_url_efl_object_constructor(Efl_Network_Url *url_obj, Efl_Network_Ur
         return NULL;
      }
 
-   eo_manual_free_set(url_obj, EINA_TRUE);
+   efl_manual_free_set(url_obj, EINA_TRUE);
 
    return url_obj;
 }
@@ -335,7 +335,7 @@ _efl_network_url_efl_object_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_D
     */
    _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
    _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
-   return efl_finalize(eo_super(url_obj, MY_CLASS));
+   return efl_finalize(efl_super(url_obj, MY_CLASS));
 }
 
 EAPI Ecore_Con_Url *
@@ -352,7 +352,7 @@ ecore_con_url_custom_new(const char *url,
    if (!custom_request) return NULL;
    url_obj = ecore_con_url_new(url);
    if (!url_obj) return NULL;
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
 
    ret = _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CUSTOMREQUEST,
                               custom_request);
@@ -369,7 +369,7 @@ ecore_con_url_custom_new(const char *url,
 EAPI void
 ecore_con_url_free(Ecore_Con_Url *url_obj)
 {
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
 
    efl_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
@@ -380,7 +380,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
 static void
 _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
 {
-   Efl_Network_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Efl_Network_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
    char *s;
 
    if (_c) _c->curl_slist_free_all(url_con->headers);
@@ -395,7 +395,7 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
 EOLIAN static void
 _efl_network_url_efl_object_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
 {
-   efl_destructor(eo_super(url_obj, MY_CLASS));
+   efl_destructor(efl_super(url_obj, MY_CLASS));
 
    if (!_c) return;
    if (url_con->curl_easy)
@@ -423,7 +423,7 @@ _efl_network_url_efl_object_destructor(Efl_Network_Url *url_obj, Efl_Network_Url
    url_con->dead = EINA_TRUE;
    if (url_con->event_count) return;
 
-   eo_manual_free_set(url_obj, EINA_FALSE);
+   efl_manual_free_set(url_obj, EINA_FALSE);
    _ecore_con_url_free_internal(url_obj);
 }
 
@@ -436,8 +436,8 @@ _efl_network_url_url_get(Efl_Network_Url *url_obj EINA_UNUSED, Efl_Network_Url_D
 EAPI int
 ecore_con_url_status_code_get(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return 0;
    if (url_con->status) return url_con->status;
    _ecore_con_url_status_get(url_obj);
@@ -461,8 +461,8 @@ _efl_network_url_url_set(Efl_Network_Url *url_obj EINA_UNUSED, Efl_Network_Url_D
 EAPI void
 ecore_con_url_data_set(Ecore_Con_Url *url_obj, void *data)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    url_con->data = data;
 }
@@ -470,8 +470,8 @@ ecore_con_url_data_set(Ecore_Con_Url *url_obj, void *data)
 EAPI void
 ecore_con_url_additional_header_add(Ecore_Con_Url *url_obj, const char *key, const char *value)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    char *tmp;
 
@@ -486,8 +486,8 @@ ecore_con_url_additional_header_add(Ecore_Con_Url *url_obj, const char *key, con
 EAPI void
 ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    char *s;
 
@@ -498,8 +498,8 @@ ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_obj)
 EAPI void *
 ecore_con_url_data_get(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return NULL;
    return url_con->data;
 }
@@ -507,8 +507,8 @@ ecore_con_url_data_get(Ecore_Con_Url *url_obj)
 EAPI void
 ecore_con_url_time(Ecore_Con_Url *url_obj, Ecore_Con_Url_Time condition, double timestamp)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (url_con->dead) return;
    url_con->time_condition = condition;
@@ -518,8 +518,8 @@ ecore_con_url_time(Ecore_Con_Url *url_obj, Ecore_Con_Url_Time condition, double
 EAPI void
 ecore_con_url_fd_set(Ecore_Con_Url *url_obj, int fd)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (url_con->dead) return;
    url_con->write_fd = fd;
@@ -528,8 +528,8 @@ ecore_con_url_fd_set(Ecore_Con_Url *url_obj, int fd)
 EAPI int
 ecore_con_url_received_bytes_get(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return -1;
    return url_con->received;
 }
@@ -537,8 +537,8 @@ ecore_con_url_received_bytes_get(Ecore_Con_Url *url_obj)
 EAPI const Eina_List *
 ecore_con_url_response_headers_get(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return NULL;
    return url_con->response_headers;
 }
@@ -546,8 +546,8 @@ ecore_con_url_response_headers_get(Ecore_Con_Url *url_obj)
 EAPI Eina_Bool
 ecore_con_url_httpauth_set(Ecore_Con_Url *url_obj, const char *username, const char *password, Eina_Bool safe)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    CURLcode ret;
    curl_version_info_data *vers = NULL;
@@ -594,8 +594,8 @@ static Eina_Bool
 _ecore_con_url_send(Ecore_Con_Url *url_obj, Ecore_Con_Url_Mode mode,
                     const void *data, long length, const char *content_type)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    Eina_List *l;
    const char *s;
@@ -700,8 +700,8 @@ ecore_con_url_post(Ecore_Con_Url *url_con, const void *data, long length, const
 EAPI Eina_Bool
 ecore_con_url_ftp_upload(Ecore_Con_Url *url_obj, const char *filename, const char *user, const char *pass, const char *upload_dir)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, MY_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, MY_CLASS))
       return EINA_FALSE;
    char url[4096];
    char userpwd[4096];
@@ -756,8 +756,8 @@ ecore_con_url_ftp_upload(Ecore_Con_Url *url_obj, const char *filename, const cha
 EAPI void
 ecore_con_url_cookies_init(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (url_con->dead) return;
@@ -767,8 +767,8 @@ ecore_con_url_cookies_init(Ecore_Con_Url *url_obj)
 EAPI void
 ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_obj, Eina_Bool ignore)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (url_con->dead) return;
@@ -778,8 +778,8 @@ ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_obj, Eina_Bool i
 EAPI void
 ecore_con_url_cookies_clear(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (url_con->dead) return;
@@ -789,8 +789,8 @@ ecore_con_url_cookies_clear(Ecore_Con_Url *url_obj)
 EAPI void
 ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (url_con->dead) return;
@@ -800,8 +800,8 @@ ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_obj)
 EAPI void
 ecore_con_url_cookies_file_add(Ecore_Con_Url *url_obj, const char *const file_name)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (url_con->dead) return;
@@ -811,8 +811,8 @@ ecore_con_url_cookies_file_add(Ecore_Con_Url *url_obj, const char *const file_na
 EAPI Eina_Bool
 ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_obj, const char *const cookiejar_file)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    CURLcode ret;
 
@@ -832,8 +832,8 @@ ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_obj, const char *const coo
 EAPI void
 ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
 
@@ -844,8 +844,8 @@ ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_obj)
 EAPI void
 ecore_con_url_verbose_set(Ecore_Con_Url *url_obj, Eina_Bool verbose)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (!url_con->url) return;
@@ -856,8 +856,8 @@ ecore_con_url_verbose_set(Ecore_Con_Url *url_obj, Eina_Bool verbose)
 EAPI void
 ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_obj, Eina_Bool use_epsv)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (!url_con->url) return;
@@ -881,8 +881,8 @@ ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_obj, Eina_Bool use_epsv)
 EAPI void
 ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_obj, Eina_Bool verify)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (!_c) return;
    if (!url_con->url) return;
@@ -912,8 +912,8 @@ ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_obj, Eina_Bool verify)
 EAPI int
 ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_obj, const char *ca_path)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return -1;
    int res = -1;
 
@@ -936,8 +936,8 @@ ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_obj, const char *ca_path)
 EAPI Eina_Bool
 ecore_con_url_http_version_set(Ecore_Con_Url *url_obj, Ecore_Con_Url_Http_Version version)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    int res = -1;
 
@@ -971,8 +971,8 @@ ecore_con_url_http_version_set(Ecore_Con_Url *url_obj, Ecore_Con_Url_Http_Versio
 EAPI Eina_Bool
 ecore_con_url_proxy_set(Ecore_Con_Url *url_obj, const char *proxy)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    int res = -1;
    curl_version_info_data *vers = NULL;
@@ -1023,8 +1023,8 @@ ecore_con_url_proxy_set(Ecore_Con_Url *url_obj, const char *proxy)
 EAPI void
 ecore_con_url_timeout_set(Ecore_Con_Url *url_obj, double timeout)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
    if (url_con->dead) return;
    if (!url_con->url || timeout < 0) return;
@@ -1036,8 +1036,8 @@ ecore_con_url_timeout_set(Ecore_Con_Url *url_obj, double timeout)
 EAPI Eina_Bool
 ecore_con_url_proxy_username_set(Ecore_Con_Url *url_obj, const char *username)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    int res = -1;
 
@@ -1064,8 +1064,8 @@ ecore_con_url_proxy_username_set(Ecore_Con_Url *url_obj, const char *username)
 EAPI Eina_Bool
 ecore_con_url_proxy_password_set(Ecore_Con_Url *url_obj, const char *password)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return EINA_FALSE;
    int res = -1;
 
@@ -1094,7 +1094,7 @@ ecore_con_url_proxy_password_set(Ecore_Con_Url *url_obj, const char *password)
 static void
 _ecore_con_url_status_get(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
    long status = 0;
 
    if (!_c) return;
@@ -1109,7 +1109,7 @@ _ecore_con_url_status_get(Ecore_Con_Url *url_obj)
 static void
 _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
 {
-   Efl_Network_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Efl_Network_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
    Efl_Network_Event_Url_Complete e;
    int status = url_con->status;
 
@@ -1146,7 +1146,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
 static void
 _ecore_con_url_multi_remove(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
    CURLMcode ret;
 
    if (!_c) return;
@@ -1159,7 +1159,7 @@ static Eina_Bool
 _ecore_con_url_timeout_cb(void *data)
 {
    Ecore_Con_Url *url_obj = data;
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
    CURLMsg timeout_msg;
 
    if (!_c) return ECORE_CALLBACK_CANCEL;
@@ -1189,8 +1189,8 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
    Efl_Network_Event_Url_Data e;
    size_t real_size = size * nitems;
 
-   Efl_Network_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Efl_Network_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return -1;
 
    url_con->received += real_size;
@@ -1233,8 +1233,8 @@ _ecore_con_url_header_cb(void *ptr, size_t size, size_t nitems, void *stream)
 {
    size_t real_size = size * nitems;
    Ecore_Con_Url *url_obj = stream;
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
-   if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
+   if (!efl_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return 0;
 
    char *header = malloc(sizeof(char) * (real_size + 1));
@@ -1252,7 +1252,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
    Efl_Network_Event_Url_Progress e;
    Efl_Network_Url *url_obj = clientp;
 
-   Efl_Network_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Efl_Network_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
 
    e.url_con = url_obj;
    e.down.total = dltotal;
@@ -1301,7 +1301,7 @@ _ecore_con_url_info_read(void)
           {
              EINA_LIST_FOREACH_SAFE(_url_con_list, l, ll, url_obj)
                {
-                  Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+                  Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
                   if (curlmsg->easy_handle == url_con->curl_easy)
                     _ecore_con_url_event_url_complete(url_obj, curlmsg);
                }
@@ -1456,7 +1456,7 @@ _ecore_con_url_timer(void *data EINA_UNUSED)
 static Eina_Bool
 _ecore_con_url_perform(Ecore_Con_Url *url_obj)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
    CURLMcode ret;
 
    if (!_c) return EINA_FALSE;
@@ -1476,14 +1476,14 @@ _ecore_con_url_perform(Ecore_Con_Url *url_obj)
 static void
 _ecore_con_event_url_free(Ecore_Con_Url *url_obj, void *ev)
 {
-   Ecore_Con_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+   Ecore_Con_Url_Data *url_con = efl_data_scope_get(url_obj, MY_CLASS);
 
    free(ev);
    url_con->event_count--;
    if (url_con->dead && (!url_con->event_count))
      {
         _ecore_con_url_free_internal(url_obj);
-        eo_manual_free(url_obj);
+        efl_manual_free(url_obj);
      }
 }
 
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 42007334c1..7d491cade1 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3227,7 +3227,7 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
      }
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(animator_watch,
+EFL_CALLBACKS_ARRAY_DEFINE(animator_watch,
                           { EFL_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
                           { EFL_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
 
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c
index 81c14d1e81..d96fdd517e 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.c
@@ -73,7 +73,7 @@ _ector_cairo_software_surface_ector_buffer_pixels_set(Eo *obj, Ector_Cairo_Softw
      cairo_surface_destroy(pd->surface);
    pd->surface = NULL;
 
-   ok = ector_buffer_pixels_set(eo_super(obj, MY_CLASS), pixels, width, height, stride, cspace, writable, l, r, t, b);
+   ok = ector_buffer_pixels_set(efl_super(obj, MY_CLASS), pixels, width, height, stride, cspace, writable, l, r, t, b);
 
    if (ok && pixels)
      {
@@ -102,11 +102,11 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw
 static Efl_Object *
 _ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    if (!obj) return NULL;
-   pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
-   pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
+   pd->base = efl_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
+   pd->base->generic = efl_data_ref(obj, ECTOR_BUFFER_MIXIN);
    pd->base->generic->eo = obj;
    return obj;
 }
@@ -114,8 +114,8 @@ _ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Softwa
 EOLIAN static void
 _ector_cairo_software_surface_efl_object_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
 {
-   eo_data_unref(obj, pd->base);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_data_unref(obj, pd->base);
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "ector_cairo_software_surface.eo.c"
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index a06706a90f..64bc1c570e 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -63,13 +63,13 @@ _ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
                                                                 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));
+     return efl_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
-     return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
+     return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
-     return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
+     return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
 
-   ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
+   ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
    return NULL;
 }
 
@@ -122,7 +122,7 @@ _ector_cairo_surface_efl_object_constructor(Eo *obj,
    USE(obj, cairo_image_surface_create, NULL);
    USE(obj, cairo_create, NULL);
 
-   obj = efl_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
    if (!obj) return NULL;
 
    _cairo_count++;
@@ -136,7 +136,7 @@ static void
 _ector_cairo_surface_efl_object_destructor(Eo *obj EINA_UNUSED,
                                         Ector_Cairo_Surface_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
+   efl_destructor(efl_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_renderer_cairo.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index 4f97d28777..59ec00594c 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -99,7 +99,7 @@ _ector_renderer_cairo_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Data
 {
    if (!pd->parent)
      {
-        pd->parent = eo_data_xref(pd->generic->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
+        pd->parent = efl_data_xref(pd->generic->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
      }
    if (pd->generic->m)
      {
@@ -182,10 +182,10 @@ _ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
 static Eo *
 _ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
    if (!obj) return NULL;
 
-   pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
+   pd->generic = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
    return obj;
 }
@@ -193,7 +193,7 @@ _ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data
 static Efl_Object *
 _ector_renderer_cairo_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
 {
-   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
+   obj = efl_finalize(efl_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
    if (!obj) return NULL;
 
    USE(pd->generic, cairo_matrix_init, NULL);
@@ -217,13 +217,13 @@ _ector_renderer_cairo_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Data *
 {
    Ector_Renderer_Data *base;
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-   eo_data_xunref(base->surface, pd->parent, obj);
-   eo_data_xunref(obj, pd->generic, obj);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   efl_data_xunref(base->surface, pd->parent, obj);
+   efl_data_xunref(obj, pd->generic, obj);
 
    free(pd->m);
 
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
 }
 
 #include "ector_renderer_cairo.eo.c"
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 bf8a05d428..ceccc57d53 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -48,14 +48,14 @@ static Eina_Bool
 _ector_renderer_cairo_gradient_linear_ector_renderer_prepare(Eo *obj,
                                                                           Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
 {
-   ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
+   ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
 
    if (!pd->parent)
      {
         Ector_Renderer_Data *base;
 
-        base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-        pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
+        base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+        pd->parent = efl_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
      }
 
    return EINA_FALSE;
@@ -71,14 +71,14 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_draw(Eo *obj,
    cairo_pattern_t *pat;
 
    // FIXME: don't ignore clipping !
-   gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
-   gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
+   gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
+   gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
    if (!gd || !gld) return EINA_FALSE;
 
    pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
    if (!pat) return EINA_FALSE;
 
-   ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
+   ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
 
    cairo_rectangle(pd->parent->cairo, gld->start.x, gld->start.y,
                    gld->end.x - gld->start.x,
@@ -99,8 +99,8 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
    Ector_Renderer_Gradient_Data *gd;
    cairo_pattern_t *pat;
 
-   gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
-   gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
+   gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
+   gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
    if (!gd || !gld) return EINA_FALSE;
 
    pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
@@ -120,8 +120,8 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
    Ector_Renderer_Gradient_Linear_Data *gld;
    Ector_Renderer_Cairo_Data *bd;
 
-   gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
-   bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
+   gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
+   bd = efl_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
    EINA_RECTANGLE_SET(r,
                       bd->generic->origin.x + gld->start.x,
                       bd->generic->origin.y + gld->start.y,
@@ -134,10 +134,10 @@ _ector_renderer_cairo_gradient_linear_efl_object_finalize(Eo *obj, Ector_Rendere
 {
    Ector_Renderer_Data *base;
 
-   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
+   obj = efl_finalize(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
    if (!obj) return NULL;
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
 
    USE(base, cairo_set_source, NULL);
    USE(base, cairo_pattern_destroy, NULL);
@@ -158,10 +158,10 @@ _ector_renderer_cairo_gradient_linear_efl_object_destructor(Eo *obj,
 {
    Ector_Renderer_Data *base;
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-   eo_data_xunref(base->surface, pd->parent, obj);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   efl_data_xunref(base->surface, pd->parent, obj);
 
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
 }
 
 static void
@@ -170,7 +170,7 @@ _ector_renderer_cairo_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj,
                                                                      const Efl_Gfx_Gradient_Stop *colors,
                                                                      unsigned int length)
 {
-   efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), colors, length);
+   efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), colors, length);
 }
 
 static unsigned int
@@ -180,10 +180,10 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Rend
    Ector_Renderer_Gradient_Data *gd;
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
 
-   gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
-   gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
+   gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
+   gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
    if (!gd || !gld) return crc;
 
    crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
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 7127dabfb5..94225b6590 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -34,14 +34,14 @@ struct _Ector_Renderer_Cairo_Gradient_Radial_Data
 static Eina_Bool
 _ector_renderer_cairo_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
 {
-   ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
+   ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
 
    if (!pd->parent)
      {
         Ector_Renderer_Data *base;
 
-        base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-        pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
+        base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+        pd->parent = efl_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
      }
 
    return EINA_FALSE;
@@ -75,14 +75,14 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Rendere
    cairo_pattern_t *pat;
 
    // FIXME: Handle clipping and generally make it work :-)
-   grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
-   gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
+   grd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
+   gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
    if (!grd || !gd) return EINA_FALSE;
 
    pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
    if (!pat) return EINA_FALSE;
 
-   ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
+   ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
 
    cairo_arc(pd->parent->cairo,
              grd->radial.x, grd->radial.y,
@@ -105,8 +105,8 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
    Ector_Renderer_Gradient_Data *gd;
    cairo_pattern_t *pat;
 
-   grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
-   gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
+   grd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
+   gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
    if (!grd || !gd) return EINA_FALSE;
 
    pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
@@ -126,8 +126,8 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNU
    Ector_Renderer_Gradient_Radial_Data *gld;
    Ector_Renderer_Cairo_Data *bd;
 
-   gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
-   bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
+   gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
+   bd = efl_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
    EINA_RECTANGLE_SET(r,
                       bd->generic->origin.x + gld->radial.x - gld->radius,
                       bd->generic->origin.y + gld->radial.y - gld->radius,
@@ -139,10 +139,10 @@ _ector_renderer_cairo_gradient_radial_efl_object_finalize(Eo *obj, Ector_Rendere
 {
    Ector_Renderer_Data *base;
 
-   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
+   obj = efl_finalize(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
    if (!obj) return NULL;
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
 
    USE(base, cairo_set_source, NULL);
    USE(base, cairo_pattern_destroy, NULL);
@@ -162,10 +162,10 @@ _ector_renderer_cairo_gradient_radial_efl_object_destructor(Eo *obj,
 {
    Ector_Renderer_Data *base;
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-   eo_data_xunref(base->surface, pd->parent, obj);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   efl_data_xunref(base->surface, pd->parent, obj);
 
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
 }
 
 static void
@@ -174,7 +174,7 @@ _ector_renderer_cairo_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj,
                                                                      const Efl_Gfx_Gradient_Stop *colors,
                                                                      unsigned int length)
 {
-   efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), colors, length);
+   efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), colors, length);
 }
 
 static unsigned int
@@ -184,10 +184,10 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rend
    Ector_Renderer_Gradient_Data *gd;
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
 
-   grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
-   gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
+   grd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
+   gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
    if (!grd || !gd) return crc;
 
    crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 9acc36ae25..de7376b76d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -90,7 +90,7 @@ _ector_renderer_cairo_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo
    const Efl_Gfx_Path_Command *cmds = NULL;
    const double *pts = NULL;
 
-   ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
 
    if (pd->shape->fill)
      ector_renderer_prepare(pd->shape->fill);
@@ -104,8 +104,8 @@ _ector_renderer_cairo_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo
      {
         Ector_Renderer_Data *base;
 
-        base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-        pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
+        base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+        pd->parent = efl_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
      }
 
    efl_gfx_shape_path_get(obj, &cmds, &pts);
@@ -161,7 +161,7 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
 
    cairo_save(pd->parent->cairo);
 
-   ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS), op, clips, mul_col);
+   ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS), op, clips, mul_col);
 
    cairo_new_path(pd->parent->cairo);
    cairo_append_path(pd->parent->cairo, pd->path);
@@ -240,7 +240,7 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
    // FIXME: It should be possible to actually ask cairo about that
    efl_gfx_shape_bounds_get(obj, r);
 
-   bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
+   bd = efl_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
    r->x += bd->generic->origin.x;
    r->y += bd->generic->origin.y;
 }
@@ -248,13 +248,13 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
 Eo *
 _ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_CAIRO_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);
+   pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
+   pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
+   pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
    efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
 
@@ -264,7 +264,7 @@ _ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo
 static Efl_Object *
 _ector_renderer_cairo_shape_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
 {
-   obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   obj = efl_finalize(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
    if (!obj) return NULL;
 
    USE(pd->base, cairo_path_destroy, NULL);
@@ -299,13 +299,13 @@ _ector_renderer_cairo_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_
    // call explicit API to free shape data.
    efl_gfx_shape_reset(obj);
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-   eo_data_xunref(base->surface, pd->parent, obj);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   efl_data_xunref(base->surface, pd->parent, obj);
 
-   eo_data_xunref(obj, pd->shape, obj);
-   eo_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->shape, obj);
+   efl_data_xunref(obj, pd->base, obj);
 
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
 
    if (pd->path) cairo_path_destroy(pd->path);
 }
@@ -316,7 +316,7 @@ _ector_renderer_cairo_shape_ector_renderer_crc_get(Eo *obj,
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
 
    crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
    crc = eina_crc((void*) &pd->public_shape->stroke.scale, sizeof (pd->public_shape->stroke.scale) * 3, crc, EINA_FALSE); // scale, width, centered
diff --git a/src/lib/ector/ector_main.c b/src/lib/ector/ector_main.c
index c7954eda3c..db65c44ea4 100644
--- a/src/lib/ector/ector_main.c
+++ b/src/lib/ector/ector_main.c
@@ -34,7 +34,7 @@ ector_init(void)
      return ++_ector_main_count;
 
    eina_init();
-   eo_init();
+   efl_object_init();
 
    _ector_log_dom_global = eina_log_domain_register("ector", ECTOR_DEFAULT_LOG_COLOR);
    if (_ector_log_dom_global < 0)
@@ -51,7 +51,7 @@ ector_init(void)
    return _ector_main_count;
 
  on_error:
-   eo_shutdown();
+   efl_object_shutdown();
    eina_shutdown();
 
    return 0;
@@ -239,7 +239,7 @@ ector_shutdown(void)
                    EINA_LOG_STATE_START,
                    EINA_LOG_STATE_SHUTDOWN);
 
-   eo_shutdown();
+   efl_object_shutdown();
 
    eina_log_domain_unregister(_ector_log_dom_global);
 
diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h
index 6bda277326..03d656454d 100644
--- a/src/lib/ector/ector_private.h
+++ b/src/lib/ector/ector_private.h
@@ -43,20 +43,20 @@ extern int _ector_log_dom_global;
 /* The following macro are internal to Ector only at this stage */
 
 static inline Eo *
-_eo_refplace(Eo **d, const Eo *s)
+_efl_refplace(Eo **d, const Eo *s)
 {
    Eo *tmp = *d;
-   *d = eo_ref(s);
-   if (tmp) eo_unref(tmp);
+   *d = efl_ref(s);
+   if (tmp) efl_unref(tmp);
    return *d;
 }
 
 static inline Eo *
-_eo_xrefplace(Eo **d, Eo *s, const Eo *ref_obj)
+_efl_xrefplace(Eo **d, Eo *s, const Eo *ref_obj)
 {
    Eo *tmp = *d;
-   *d = eo_xref(s, ref_obj);
-   if (tmp) eo_xunref(tmp, ref_obj);
+   *d = efl_xref(s, ref_obj);
+   if (tmp) efl_xunref(tmp, ref_obj);
    return *d;
 }
 
diff --git a/src/lib/ector/ector_renderer.c b/src/lib/ector/ector_renderer.c
index cfe0f017c4..f3b6c9499b 100644
--- a/src/lib/ector/ector_renderer.c
+++ b/src/lib/ector/ector_renderer.c
@@ -13,9 +13,9 @@ static void
 _ector_renderer_efl_object_destructor(Eo *obj, Ector_Renderer_Data *pd)
 {
    if (pd->m) free(pd->m);
-   eo_unref(pd->surface);
+   efl_unref(pd->surface);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Efl_Object *
@@ -27,7 +27,7 @@ _ector_renderer_efl_object_finalize(Eo *obj, Ector_Renderer_Data *pd)
         return NULL;
      }
    pd->finalized = EINA_TRUE;
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 static Ector_Surface *
@@ -44,7 +44,7 @@ _ector_renderer_surface_set(Eo *obj EINA_UNUSED, Ector_Renderer_Data *pd, Ector_
         CRI("surface_set can be called during object creation only!");
         return;
      }
-   pd->surface = eo_xref(s, obj);
+   pd->surface = efl_xref(s, obj);
 }
 
 static void
@@ -133,7 +133,7 @@ _ector_renderer_mask_set(Eo *obj EINA_UNUSED,
                                       Ector_Renderer_Data *pd,
                                       Ector_Renderer *r)
 {
-   _eo_refplace(&pd->mask, r);
+   _efl_refplace(&pd->mask, r);
 }
 
 static Ector_Renderer *
diff --git a/src/lib/ector/ector_renderer_buffer.c b/src/lib/ector/ector_renderer_buffer.c
index 4bb93a24c1..56bb6f13e1 100644
--- a/src/lib/ector/ector_renderer_buffer.c
+++ b/src/lib/ector/ector_renderer_buffer.c
@@ -33,7 +33,7 @@ _ector_renderer_buffer_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Ector_Renderer
 EOLIAN static void
 _ector_renderer_buffer_buffer_set(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd, Ector_Buffer *buf)
 {
-   _eo_xrefplace(&pd->eo_buffer, buf, obj);
+   _efl_xrefplace(&pd->eo_buffer, buf, obj);
 }
 
 EOLIAN static Ector_Buffer *
diff --git a/src/lib/ector/ector_renderer_shape.c b/src/lib/ector/ector_renderer_shape.c
index ffdd0158a4..3af47297f6 100644
--- a/src/lib/ector/ector_renderer_shape.c
+++ b/src/lib/ector/ector_renderer_shape.c
@@ -12,7 +12,7 @@ _ector_renderer_shape_fill_set(Eo *obj EINA_UNUSED,
                                        Ector_Renderer_Shape_Data *pd,
                                        const Ector_Renderer *r)
 {
-   _eo_refplace(&pd->fill, r);
+   _efl_refplace(&pd->fill, r);
 }
 
 static const Ector_Renderer *
@@ -27,7 +27,7 @@ _ector_renderer_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
                                               Ector_Renderer_Shape_Data *pd,
                                               const Ector_Renderer *r)
 {
-   _eo_refplace(&pd->stroke.fill, r);
+   _efl_refplace(&pd->stroke.fill, r);
 }
 
 static const Ector_Renderer *
@@ -42,7 +42,7 @@ _ector_renderer_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
                                                 Ector_Renderer_Shape_Data *pd,
                                                 const Ector_Renderer *r)
 {
-   _eo_refplace(&pd->stroke.marker, r);
+   _efl_refplace(&pd->stroke.marker, r);
 }
 
 static const Ector_Renderer *
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 7f49aec2e7..54bdb9f41c 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -45,13 +45,13 @@ _ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj,
                                                              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));
+     return efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
-     return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
+     return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
-     return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
+     return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
 
-   ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
+   ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
    return NULL;
 }
 
@@ -329,7 +329,7 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA
 static void
 _ector_gl_surface_efl_object_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_GL_SURFACE_CLASS));
 
    eina_hash_free(shader_cache);
    shader_cache = NULL;
@@ -342,7 +342,7 @@ _ector_gl_surface_efl_object_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA
 {
    Eina_Strbuf *file_path = NULL;
 
-   obj = efl_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_GL_SURFACE_CLASS));
    if (!obj) return NULL;
 
    if (shader_cache) return obj;
diff --git a/src/lib/ector/gl/ector_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c
index 655f94772b..b06792ac3e 100644
--- a/src/lib/ector/gl/ector_renderer_gl.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -39,17 +39,17 @@ _ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED,
 static Efl_Object *
 _ector_renderer_gl_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_CLASS));
    if (!obj) return NULL;
 
-   pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
+   pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
    return obj;
 }
 
 static void
 _ector_renderer_gl_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
 {
-   eo_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->base, obj);
 }
 
 #include "ector_renderer_gl.eo.c"
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 07a9490abb..69e1c6d378 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -31,7 +31,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_prepare(Eo *obj,
 static Eina_Bool
 _ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
 {
-   ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
+   ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
 
    // FIXME: draw something !
    (void) pd;
@@ -69,13 +69,13 @@ _ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Rendere
 static Efl_Object *
 _ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
 
    if (!obj) return NULL;
 
-   pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
-   pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
-   pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
+   pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
+   pd->linear = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
+   pd->gradient = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
 
    return obj;
 }
@@ -83,15 +83,15 @@ _ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Rendere
 static void
 _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);
-   eo_data_xunref(obj, pd->gradient, obj);
+   efl_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->linear, obj);
+   efl_data_xunref(obj, pd->gradient, obj);
 }
 
 static void
 _ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
-   efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length);
+   efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length);
 }
 
 static unsigned int
@@ -99,7 +99,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Rendere
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
 
    crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
    if (pd->gradient->colors_count)
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 77514f0387..8760bad429 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -30,7 +30,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Rendere
 static Eina_Bool
 _ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
 {
-   ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
+   ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
 
    // FIXME: draw something !
    (void) pd;
@@ -69,7 +69,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
 
    crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
    if (pd->gradient->colors_count)
@@ -82,13 +82,13 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
 static Efl_Object *
 _ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
 
    if (!obj) return NULL;
 
-   pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
-   pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
-   pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
+   pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
+   pd->radial = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
+   pd->gradient = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
 
    return obj;
 }
@@ -96,15 +96,15 @@ _ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Rendere
 static void
 _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);
-   eo_data_xunref(obj, pd->gradient, obj);
+   efl_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->radial, obj);
+   efl_data_xunref(obj, pd->gradient, obj);
 }
 
 static void
 _ector_renderer_gl_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
-   efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length);
+   efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length);
 }
 
 #include "ector_renderer_gl_gradient_radial.eo.c"
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 0615ed9bf6..1e9a7277ea 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -37,7 +37,7 @@ _ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape
 
    if (pd->vertex) return EINA_TRUE;
 
-   r = ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
+   r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
 
    ector_renderer_bounds_get(obj, &bounding_box);
 
@@ -72,7 +72,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
 {
    uint64_t flags = 0;
 
-   ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col);
+   ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col);
 
    // FIXME: adjust flags content correctly
    // FIXME: should not ignore clips (idea is that the geometry will be cliped here and the
@@ -118,7 +118,7 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
 
    // This code should be shared with other implementation
    crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
@@ -141,13 +141,13 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
 static Efl_Object *
 _ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_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);
+   pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
+   pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
+   pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
    efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
 
@@ -157,9 +157,9 @@ _ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape
 static void
 _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);
-   eo_data_xunref(obj, pd->public_shape, obj);
+   efl_data_xunref(obj, pd->shape, obj);
+   efl_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->public_shape, obj);
 }
 
 #include "ector_renderer_gl_shape.eo.c"
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.c b/src/lib/ector/software/ector_renderer_software_buffer.c
index 2b21e2d89b..9d524af72e 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.c
+++ b/src/lib/ector/software/ector_renderer_software_buffer.c
@@ -22,7 +22,7 @@ typedef struct
 EOLIAN static void
 _ector_renderer_software_buffer_buffer_set(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd, Ector_Buffer *buf)
 {
-   _eo_xrefplace(&pd->eo_buffer, buf, obj);
+   _efl_xrefplace(&pd->eo_buffer, buf, obj);
 }
 
 EOLIAN static Ector_Buffer *
@@ -34,7 +34,7 @@ _ector_renderer_software_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_S
 EOLIAN static Eina_Bool
 _ector_renderer_software_buffer_ector_renderer_software_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
 {
-   Ector_Software_Buffer *buffer = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
+   Ector_Software_Buffer *buffer = efl_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    ector_software_rasterizer_buffer_set(pd->surface, buffer);
    return EINA_TRUE;
 }
@@ -43,7 +43,7 @@ EOLIAN static Eina_Bool
 _ector_renderer_software_buffer_ector_renderer_prepare(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
 {
    if (!pd->surface)
-     pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
+     pd->surface = efl_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
 
    return EINA_TRUE;
 }
@@ -51,10 +51,10 @@ _ector_renderer_software_buffer_ector_renderer_prepare(Eo *obj, Ector_Renderer_S
 EOLIAN static unsigned int
 _ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
 {
-   Ector_Software_Buffer_Base_Data *buffer = eo_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
+   Ector_Software_Buffer_Base_Data *buffer = efl_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, MY_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, MY_CLASS));
    crc = eina_crc((const char *) buffer, sizeof(*buffer), crc, EINA_FALSE);
    if (pd->surface)
      crc = eina_crc((const char *) pd->surface, sizeof(*pd->surface), crc, EINA_FALSE);
@@ -65,8 +65,8 @@ _ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_S
 EOLIAN static void
 _ector_renderer_software_buffer_efl_object_destructor(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
 {
-   eo_data_xunref(pd->base->surface, pd->surface, obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_data_xunref(pd->base->surface, pd->surface, obj);
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "ector_renderer_software_buffer.eo.c"
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 8c922a1cec..69bf9e42d9 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -17,8 +17,8 @@ _ector_renderer_software_gradient_linear_ector_renderer_prepare(Eo *obj,
      {
         Ector_Renderer_Data *base;
 
-        base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-        pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
+        base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+        pd->surface = efl_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
      }
 
    update_color_table(pd);
@@ -66,11 +66,11 @@ static Eo *
 _ector_renderer_software_gradient_linear_efl_object_constructor(Eo *obj,
                                                              Ector_Renderer_Software_Gradient_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
    if (!obj) return NULL;
 
-   pd->gd  = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
-   pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
+   pd->gd  = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
+   pd->gld = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
 
    return obj;
 }
@@ -83,19 +83,19 @@ _ector_renderer_software_gradient_linear_efl_object_destructor(Eo *obj,
 
    destroy_color_table(pd);
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-   eo_data_xunref(base->surface, pd->surface, obj);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   efl_data_xunref(base->surface, pd->surface, obj);
 
-   eo_data_xunref(obj, pd->gd, obj);
-   eo_data_xunref(obj, pd->gld, obj);
+   efl_data_xunref(obj, pd->gd, obj);
+   efl_data_xunref(obj, pd->gld, obj);
 
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
 }
 
 void
 _ector_renderer_software_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
-   efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS), colors, length);
+   efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS), colors, length);
 
    destroy_color_table(pd);
 }
@@ -105,7 +105,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_R
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
 
    crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
    if (pd->gd->colors_count)
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 031778077b..439f193c0b 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -16,8 +16,8 @@ _ector_renderer_software_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_R
      {
         Ector_Renderer_Data *base;
 
-        base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-        pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
+        base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+        pd->surface = efl_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
      }
 
    update_color_table(pd);
@@ -76,9 +76,9 @@ Eo *
 _ector_renderer_software_gradient_radial_efl_object_constructor(Eo *obj,
                                                              Ector_Renderer_Software_Gradient_Data *pd)
 {
-   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);
+   obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
+   pd->gd  = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
+   pd->gld = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
 
    return obj;
 }
@@ -91,19 +91,19 @@ _ector_renderer_software_gradient_radial_efl_object_destructor(Eo *obj,
 
    destroy_color_table(pd);
 
-   base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
-   eo_data_xunref(base->surface, pd->surface, obj);
+   base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
+   efl_data_xunref(base->surface, pd->surface, obj);
 
-   eo_data_xunref(obj, pd->gd, obj);
-   eo_data_xunref(obj, pd->gld, obj);
+   efl_data_xunref(obj, pd->gd, obj);
+   efl_data_xunref(obj, pd->gld, obj);
 
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
 }
 
 void
 _ector_renderer_software_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
-   efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS), colors, length);
+   efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS), colors, length);
 
    destroy_color_table(pd);
 }
@@ -113,7 +113,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_R
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
 
    crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
    if (pd->gd->colors_count)
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index e9a6e8f5c4..35aedf0980 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -584,7 +584,7 @@ _ector_renderer_software_shape_ector_renderer_prepare(Eo *obj,
 
    // shouldn't that be moved to the software base object
    if (!pd->surface)
-     pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
+     pd->surface = efl_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
 
    return EINA_TRUE;
 }
@@ -675,7 +675,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj,
    pd->shape_data = NULL;
    pd->outline_data = NULL;
 
-   efl_gfx_shape_path_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS), op, points);
+   efl_gfx_shape_path_set(efl_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS), op, points);
 }
 
 
@@ -694,12 +694,12 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI
 static Eo *
 _ector_renderer_software_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
+   obj = efl_constructor(efl_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);
+   pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
+   pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
+   pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
    efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd);
 
    return obj;
@@ -715,10 +715,10 @@ _ector_renderer_software_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Sof
    if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data);
    if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data);
 
-   eo_data_xunref(pd->base->surface, pd->surface, obj);
-   eo_data_xunref(obj, pd->shape, obj);
-   eo_data_xunref(obj, pd->base, obj);
-   efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
+   efl_data_xunref(pd->base->surface, pd->surface, obj);
+   efl_data_xunref(obj, pd->shape, obj);
+   efl_data_xunref(obj, pd->base, obj);
+   efl_destructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
 }
 
 
@@ -728,7 +728,7 @@ _ector_renderer_software_shape_ector_renderer_crc_get(Eo *obj,
 {
    unsigned int crc;
 
-   crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
+   crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
 
    crc = eina_crc((void*) &pd->shape->stroke.marker,
                   sizeof (pd->shape->stroke.marker),
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index baf8d62015..499206309d 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -336,9 +336,9 @@ EOLIAN static Efl_Object *
 _ector_software_buffer_efl_object_constructor(Eo *obj, void *data EINA_UNUSED)
 {
    Ector_Software_Buffer_Base_Data *pd;
-   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);
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
+   pd = efl_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
+   pd->generic = efl_data_ref(obj, ECTOR_BUFFER_MIXIN);
    pd->generic->eo = obj;
    return obj;
 }
@@ -346,10 +346,10 @@ _ector_software_buffer_efl_object_constructor(Eo *obj, void *data EINA_UNUSED)
 EOLIAN static void
 _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_Data *pd = efl_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    _ector_software_buffer_base_pixels_clear(obj, pd);
-   eo_data_unref(obj, pd->generic);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_data_unref(obj, pd->generic);
+   efl_destructor(efl_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_rasterizer.c b/src/lib/ector/software/ector_software_rasterizer.c
index f3b31f5c72..cd59eb8735 100644
--- a/src/lib/ector/software/ector_software_rasterizer.c
+++ b/src/lib/ector/software/ector_software_rasterizer.c
@@ -559,7 +559,7 @@ void ector_software_rasterizer_radial_gradient_set(Software_Rasterizer *rasteriz
 void ector_software_rasterizer_buffer_set(Software_Rasterizer *rasterizer,
                                           Ector_Software_Buffer *buffer)
 {
-   rasterizer->fill_data.buffer = eo_data_scope_get(buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
+   rasterizer->fill_data.buffer = efl_data_scope_get(buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    rasterizer->fill_data.type = Image;
 }
 
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index 115170b865..ad504c4499 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -16,24 +16,24 @@ _ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
                                                                    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));
+     return efl_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
+     return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
+     return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
    else if (type == ECTOR_RENDERER_BUFFER_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
-   ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
+     return efl_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
+   ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
    return NULL;
 }
 
 static Eo *
 _ector_software_surface_efl_object_constructor(Eo *obj, Ector_Software_Surface_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
+   pd->rasterizer->fill_data.raster_buffer = efl_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
    return obj;
 }
 
@@ -41,10 +41,10 @@ static void
 _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);
+   efl_data_unref(obj, pd->rasterizer->fill_data.raster_buffer);
    free(pd->rasterizer);
    pd->rasterizer = NULL;
-   efl_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
+   efl_destructor(efl_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
 }
 
 static void
diff --git a/src/lib/edje/edje_box_layout.c b/src/lib/edje/edje_box_layout.c
index bca4fb3c31..8ba073c01f 100644
--- a/src/lib/edje/edje_box_layout.c
+++ b/src/lib/edje/edje_box_layout.c
@@ -177,7 +177,7 @@ _edje_box_recalc_apply(Edje *ed EINA_UNUSED, Edje_Real_Part *ep, Edje_Calc_Param
              ep->typedata.container->anim->end.align.x = param2_desc->box.align.x;
              ep->typedata.container->anim->end.align.y = param2_desc->box.align.y;
 
-             priv = eo_data_scope_get(ep->object, EVAS_BOX_CLASS);
+             priv = efl_data_scope_get(ep->object, EVAS_BOX_CLASS);
              if (priv == NULL)
                return;
 
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index a9d9204ad3..879bba7706 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3688,7 +3688,7 @@ _edje_map_prop_set(Evas_Map *map, const Edje_Calc_Params *pf,
 
    if (ep->part->type == EDJE_PART_TYPE_IMAGE ||
        ((ep->part->type == EDJE_PART_TYPE_SWALLOW) &&
-        (eo_isa(mo, EFL_CANVAS_IMAGE_INTERNAL_CLASS) &&
+        (efl_isa(mo, EFL_CANVAS_IMAGE_INTERNAL_CLASS) &&
          (!evas_object_image_source_get(mo))))
        )
      {
@@ -5015,7 +5015,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
                           case EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE:
                             {
                                Eo *primitive = NULL;
-                               primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, ed->base->evas);
+                               primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, ed->base->evas);
                                evas_canvas3d_primitive_form_set(primitive, pd_mesh_node->mesh_node.mesh.primitive);
 
                                _edje_calc_params_need_type_node(pf);
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 9363034e96..4dfa8d204e 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -55,7 +55,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
    Edje *ed;
    Edje_Real_Part *rp;
 
-   ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    ed = data;
    rp = evas_object_data_get(event->object, "real_part");
    if (rp)
@@ -74,7 +74,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
    Edje *ed;
    Edje_Real_Part *rp;
 
-   ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    ed = data;
    rp = evas_object_data_get(event->object, "real_part");
    if (rp)
@@ -95,7 +95,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
    char buf[256];
    int ignored;
 
-   ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    ed = data;
    rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return;
@@ -164,7 +164,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
    char buf[256];
    int ignored;
 
-   ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    ed = data;
    rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return;
@@ -236,7 +236,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
    Edje_Real_Part *rp;
    int ignored;
 
-   ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    ed = data;
    rp = evas_object_data_get(event->object, "real_part");
    if (!rp) return;
@@ -343,7 +343,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
    Edje_Real_Part *rp;
    char buf[256];
 
-   ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    ed = data;
    rp = evas_object_data_get(event->object, "real_part");
    if (rp)
@@ -429,7 +429,7 @@ _edje_pending_timer_cb(void *data)
    return ECORE_CALLBACK_CANCEL;
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
                           { EFL_EVENT_HOLD, _edje_hold_signal_cb },
                           { EFL_EVENT_POINTER_IN, _edje_mouse_in_signal_cb },
                           { EFL_EVENT_POINTER_OUT, _edje_mouse_out_signal_cb },
@@ -438,7 +438,7 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
                           { EFL_EVENT_POINTER_MOVE, _edje_mouse_move_signal_cb },
                           { EFL_EVENT_POINTER_WHEEL, _edje_mouse_wheel_signal_cb });
 
-EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
                           { EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
                           { EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb });
 
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index 592cd35fe0..ab90ddbd73 100644
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -38,7 +38,7 @@ struct _Part_Item_Iterator
    Eo            *object;
 };
 
-#define PROXY_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0)
+#define PROXY_REF(obj, pd) do { if (!(pd->temp++)) efl_ref(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)
@@ -66,7 +66,7 @@ type ## _del_cb(Eo *proxy) \
      } \
    if (efl_parent_get(proxy)) \
      { \
-        eo_ref(proxy); \
+        efl_ref(proxy); \
         efl_parent_set(proxy, NULL); \
      } \
    _ ## type ## _proxy = proxy; \
@@ -79,7 +79,7 @@ _edje_ ## type ## _internal_proxy_get(Edje_Object *obj EINA_UNUSED, Edje *ed, Ed
    Edje_Box_Data *pd; \
    Eo *proxy; \
    \
-   pd = eo_data_scope_get(_ ## type ## _proxy, TYPE ## _CLASS); \
+   pd = efl_data_scope_get(_ ## type ## _proxy, TYPE ## _CLASS); \
    if (!pd) \
      { \
         if (_ ## type ## _proxy) \
@@ -87,8 +87,8 @@ _edje_ ## type ## _internal_proxy_get(Edje_Object *obj EINA_UNUSED, Edje *ed, Ed
              ERR("Found invalid handle for efl_part. Reset."); \
              _ ## type ## _proxy = NULL; \
           } \
-        return eo_add(TYPE ## _CLASS, ed->obj, \
-                      _edje_real_part_set(eo_self, ed, rp, rp->part->name)); \
+        return efl_add(TYPE ## _CLASS, ed->obj, \
+                      _edje_real_part_set(efl_self, ed, rp, rp->part->name)); \
      } \
    \
    if (EINA_UNLIKELY(pd->temp)) \
@@ -120,7 +120,7 @@ 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 efl_finalize(eo_super(obj, TYPE ## _CLASS)); \
+   return efl_finalize(efl_super(obj, TYPE ## _CLASS)); \
 }
 
 static Eo *_box_proxy = NULL;
@@ -242,7 +242,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj, Edje_Box
    Eina_List *l;
    int k = 0;
 
-   priv = eo_data_scope_get(pd->rp->object, EVAS_BOX_CLASS);
+   priv = efl_data_scope_get(pd->rp->object, EVAS_BOX_CLASS);
    if (!priv) RETURN_VAL(-1);
    EINA_LIST_FOREACH(priv->children, l, opt)
      {
@@ -527,7 +527,7 @@ _efl_canvas_layout_internal_swallow_efl_container_content_unset(Eo *obj, Edje_Sw
 #ifdef DEGUG
 #define PART_BOX_GET(obj, part, ...) ({ \
    Eo *__box = efl_part(obj, part); \
-   if (!__box || !eo_isa(__box, EFL_CANVAS_LAYOUT_INTERNAL_BOX_CLASS)) \
+   if (!__box || !efl_isa(__box, EFL_CANVAS_LAYOUT_INTERNAL_BOX_CLASS)) \
      { \
         ERR("No such box part '%s' in layout %p", part, obj); \
         return __VA_ARGS__; \
@@ -604,7 +604,7 @@ edje_object_part_box_remove_all(Edje_Object *obj, const char *part, Eina_Bool cl
 #ifdef DEBUG
 #define PART_TABLE_GET(obj, part, ...) ({ \
    Eo *__table = efl_part(obj, part); \
-   if (!__table || !eo_isa(__table, EFL_CANVAS_LAYOUT_INTERNAL_TABLE_CLASS)) \
+   if (!__table || !efl_isa(__table, EFL_CANVAS_LAYOUT_INTERNAL_TABLE_CLASS)) \
      { \
         ERR("No such table part '%s' in layout %p", part, obj); \
         return __VA_ARGS__; \
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 0296df8b2c..7077e1d471 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -29,17 +29,17 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0;
 /* Get eed(Edje_Edit*) from obj(Evas_Object*) */
 #define GET_EED_OR_RETURN(RET)            \
   Edje_Edit *eed;                         \
-  if (!eo_isa(obj, MY_CLASS))             \
+  if (!efl_isa(obj, MY_CLASS))             \
     return RET;                           \
-  eed = eo_data_scope_get(obj, MY_CLASS); \
+  eed = efl_data_scope_get(obj, MY_CLASS); \
   if (!eed) return RET;
 
 /* Get ed(Edje*) from obj(Evas_Object*) */
 #define GET_ED_OR_RETURN(RET)          \
   Edje *ed;                            \
-  if (!eo_isa(obj, EDJE_OBJECT_CLASS)) \
+  if (!efl_isa(obj, EDJE_OBJECT_CLASS)) \
     return RET;                        \
-  ed = eo_data_scope_get(obj, EDJE_OBJECT_CLASS);
+  ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
 
 /* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */
 #define GET_RP_OR_RETURN(RET)         \
@@ -62,7 +62,7 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0;
 /* Get epr(Edje_Program*) from obj(Evas_Object*) and prog(char*)*/
 #define GET_EPR_OR_RETURN(RET)               \
   Edje_Program *epr;                         \
-  if (!eo_isa(obj, MY_CLASS))                \
+  if (!efl_isa(obj, MY_CLASS))                \
     return RET;                              \
   epr = _edje_program_get_byname(obj, prog); \
   if (!epr) return RET;
@@ -152,7 +152,7 @@ _edje_edit_efl_canvas_group_group_del(Eo *obj, Edje_Edit *eed)
 {
    _edje_edit_data_clean(eed);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -197,7 +197,7 @@ _edje_edit_efl_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const ch
    file = efl_vpath_file_result_get(file_obj);
 
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, group);
+   int_ret = efl_file_set(efl_super(obj, MY_CLASS), file, group);
    if (!int_ret)
      {
         efl_del(file_obj);
@@ -242,23 +242,23 @@ EAPI Evas_Object *
 edje_edit_object_add(Evas *evas)
 {
    Evas_Object *e;
-   e = eo_add(MY_CLASS, evas);
+   e = efl_add(MY_CLASS, evas);
    return e;
 }
 
 EOLIAN static Eo *
 _edje_edit_efl_object_constructor(Eo *obj, Edje_Edit *eed)
 {
-   eed->base = eo_data_ref(obj, EDJE_OBJECT_CLASS);
+   eed->base = efl_data_ref(obj, EDJE_OBJECT_CLASS);
 
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _edje_edit_efl_object_destructor(Eo *obj, Edje_Edit *class_data EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
-   eo_data_unref(obj, class_data);
+   efl_destructor(efl_super(obj, MY_CLASS));
+   efl_data_unref(obj, class_data);
 }
 
 /* End of Edje_Edit smart stuff */
@@ -1055,7 +1055,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, int action_type, Eet_Fi
           continue;
 
         eeo = edje_edit_object_add(ed->base->evas);
-        if (!eo_isa(eeo, EDJE_OBJECT_CLASS))
+        if (!efl_isa(eeo, EDJE_OBJECT_CLASS))
           return EINA_FALSE;
 
         if (!edje_object_file_set(eeo, ed->file->path, pce->entry))
@@ -1071,7 +1071,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, int action_type, Eet_Fi
              continue;
           }
 
-        eed = eo_data_scope_get(eeo, EDJE_OBJECT_CLASS);
+        eed = efl_data_scope_get(eeo, EDJE_OBJECT_CLASS);
         for (i = 0; i < eed->collection->patterns.table_programs_size; i++)
           {
              Edje_Program *program;
@@ -15356,7 +15356,7 @@ _edje_generate_source_of_group(Edje *ed, Edje_Part_Collection_Directory_Entry *p
         return EINA_FALSE;
      }
 
-   eed = eo_data_scope_get(obj, MY_CLASS);
+   eed = efl_data_scope_get(obj, MY_CLASS);
    pc = eed->base->collection;
    alias_list = edje_edit_group_aliases_get(obj, group);
 
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index cf6b1bf655..b671d86956 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -847,9 +847,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                           Evas_Canvas3D_Material *material = NULL;
                           Edje_Part_Description_Mesh_Node *pd_mesh_node;
 
-                          rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
+                          rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
-                          mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas);
+                          mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas);
                           evas_canvas3d_node_mesh_add(rp->node, mesh);
 
                           pd_mesh_node = (Edje_Part_Description_Mesh_Node*) rp->chosen_description;
@@ -863,13 +863,13 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                                evas_canvas3d_mesh_frame_add(mesh, 0);
                             }
 
-                          material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, ed->base->evas);
+                          material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, ed->base->evas);
                           evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
                           if (pd_mesh_node->mesh_node.texture.need_texture && pd_mesh_node->mesh_node.texture.textured)
                             {
                                Evas_Canvas3D_Texture *texture = NULL;
 
-                               texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, ed->base->evas);
+                               texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, ed->base->evas);
                                evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture);
                             }
                           rp->object = NULL;
@@ -880,8 +880,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                        {
                           Evas_Canvas3D_Light *light = NULL;
 
-                          rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
-                          light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas);
+                          rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+                          light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas);
                           evas_canvas3d_node_light_set(rp->node, light);
 
                           rp->object = NULL;
@@ -892,13 +892,13 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                        {
                           Evas_Canvas3D_Camera *camera = NULL;
 
-                          rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
-                          camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas);
+                          rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+                          camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas);
                           evas_canvas3d_node_camera_set(rp->node, camera);
 
                           rp->object = evas_object_image_filled_add(ed->base->evas);
 
-                          Eo* viewport = eo_add(EFL_CANVAS_SCENE3D_CLASS, ed->base->evas);
+                          Eo* viewport = efl_add(EFL_CANVAS_SCENE3D_CLASS, ed->base->evas);
                           evas_object_image_source_set(rp->object, viewport);
                           evas_object_show(viewport);
                           evas_object_event_callback_add(rp->object, EVAS_CALLBACK_DEL, _evas_object_viewport_del, viewport);
@@ -2368,13 +2368,13 @@ _apply_gradient_property(Svg_Style_Gradient *g)
 
    if (g->type == SVG_LINEAR_GRADIENT)
      {
-        grad_obj = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        grad_obj = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         evas_vg_gradient_linear_start_set(grad_obj, g->linear->x1, g->linear->y1);
         evas_vg_gradient_linear_end_set(grad_obj, g->linear->x2, g->linear->y2);
      }
    else if (g->type == SVG_RADIAL_GRADIENT)
      {
-        grad_obj = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL);
+        grad_obj = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL);
         evas_vg_gradient_radial_center_set(grad_obj, g->radial->cx, g->radial->cy);
         evas_vg_gradient_radial_radius_set(grad_obj, g->radial->r);
         evas_vg_gradient_radial_focal_set(grad_obj, g->radial->fx, g->radial->fy);
@@ -2619,7 +2619,7 @@ _apply_stroke_scale(Efl_VG *node, double scale)
    Efl_VG *child;
    Eina_Iterator *itr;
 
-   if (eo_isa(node, EFL_VG_CONTAINER_CLASS))
+   if (efl_isa(node, EFL_VG_CONTAINER_CLASS))
      {
         itr = efl_vg_container_children_get(node);
         EINA_ITERATOR_FOREACH(itr, child)
@@ -2698,11 +2698,11 @@ edje_3d_object_add(Evas_Object *obj, Eo **root_node, Eo *scene)
      }
 
    if (*root_node == NULL)
-     *root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas,
-                                 evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
+     *root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas,
+                                 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    if (scene == NULL)
-     scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, ed->base->evas);
+     scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, ed->base->evas);
 
    if ((*root_node == NULL) || (scene == NULL))
      {
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index aaec75ae1e..6af9c08146 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -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), efl_event_callback_add(eo_self, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+             in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(efl_self, snd_id_str), ecore_audio_obj_in_speed_set(efl_self, speed), ecore_audio_obj_vio_set(efl_self, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_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);
+                  out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
 #elif HAVE_PULSE
-                  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));
+                  out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
 #endif
                   if (out) outs++;
                }
@@ -266,7 +266,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
         tone = &ed->file->sound_dir->tones[i];
         if (!strcmp(tone->name, tone_name))
           {
-             in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+             in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
              ecore_audio_obj_name_set(in, "tone");
              efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value);
              ecore_audio_obj_in_length_set(in, duration);
@@ -275,9 +275,9 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
              if (!out)
                {
 #if HAVE_COREAUDIO
-                  out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
+                  out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
 #elif HAVE_PULSE
-                  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));
+                  out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
 #endif
                   if (out) outs++;
                }
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index eba7e3a9bb..77c31b60cc 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -20,7 +20,7 @@ edje_object_add(Evas *evas)
 {
    Evas_Object *e;
    EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL);
-   e = eo_add(MY_CLASS, evas);
+   e = efl_add(MY_CLASS, evas);
    return e;
 }
 
@@ -31,10 +31,10 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
    Evas *e;
    void *tmp;
 
-   ed->base = eo_data_ref(obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
+   ed->base = efl_data_ref(obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
    ed->duration_scale = 1.0;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    _edje_lib_ref();
 
@@ -55,26 +55,26 @@ _edje_object_efl_object_destructor(Eo *obj, Edje *class_data)
         efl_del(class_data->file_obj);
         class_data->file_obj = NULL;
      }
-   efl_destructor(eo_super(obj, MY_CLASS));
-   eo_data_unref(obj, class_data->base);
+   efl_destructor(efl_super(obj, MY_CLASS));
+   efl_data_unref(obj, class_data->base);
 }
 
 EOLIAN static void
 _edje_object_efl_object_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Efl_Dbg_Info *root) EINA_ARG_NONNULL(3)
 {
-   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_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    const char *file, *edje_group;
    efl_file_get(eo_obj, &file, &edje_group);
-   EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
-   EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
+   EFL_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
+   EFL_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
 
    Edje_Load_Error error = EDJE_LOAD_ERROR_NONE;
    error = edje_obj_load_error_get(eo_obj);
    if (error != EDJE_LOAD_ERROR_NONE)
      {
-        EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
+        EFL_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
                            edje_load_error_str(error));
      }
 }
@@ -115,7 +115,7 @@ _edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed)
 
    evas_event_freeze(tev);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    ed->is_rtl = EINA_FALSE;
    ed->have_objects = EINA_TRUE;
@@ -288,7 +288,7 @@ _edje_object_efl_canvas_group_group_show(Eo *obj, Edje *ed)
    Eina_List *l;
    Edje *edg;
 
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
    if (evas_object_visible_get(obj)) return;
    if (_edje_lua_script_only(ed))
      {
@@ -316,7 +316,7 @@ _edje_object_efl_canvas_group_group_hide(Eo *obj, Edje *ed)
    Eina_List *l;
    Edje *edg;
 
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
    if (!evas_object_visible_get(obj)) return;
    if (_edje_lua_script_only(ed))
      {
@@ -334,7 +334,7 @@ _edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool h
    Eina_List *l;
    Edje *edg;
 
-   efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide);
+   efl_canvas_group_no_render_set(efl_super(obj, MY_CLASS), hide);
    if (efl_canvas_object_no_render_get(obj) == hide) return;
 
    EINA_LIST_FOREACH(ed->groups, l, edg)
@@ -459,7 +459,7 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro
 EOLIAN static void
 _edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
 {
-   efl_canvas_object_paragraph_direction_set(eo_super(obj, MY_CLASS), dir);
+   efl_canvas_object_paragraph_direction_set(efl_super(obj, MY_CLASS), dir);
 
    /* Make it dirty to recalculate edje.
       It needs to move text objects according to new paragraph direction */
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 28df72ccfe..161dd4c685 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5263,7 +5263,7 @@ _edje_real_part_box_content_at(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, unsigne
    Evas_Object_Box_Option *opt;
    Evas_Object_Box_Data *priv;
 
-   priv = eo_data_scope_get(rp->object, EVAS_BOX_CLASS);
+   priv = efl_data_scope_get(rp->object, EVAS_BOX_CLASS);
    opt = eina_list_nth(priv->children, pos);
    if (!opt) return NULL;
    return opt->obj;
@@ -5286,7 +5286,7 @@ _edje_real_part_box_remove_at(Edje *ed, Edje_Real_Part *rp, unsigned int pos)
    Evas_Object_Box_Data *priv;
    Evas_Object *child_obj;
 
-   priv = eo_data_scope_get(rp->object, EVAS_BOX_CLASS);
+   priv = efl_data_scope_get(rp->object, EVAS_BOX_CLASS);
    opt = eina_list_nth(priv->children, pos);
    if (!opt) return NULL;
    child_obj = opt->obj;
@@ -5446,7 +5446,7 @@ _edje_perspective_obj_del(void *data, EINA_UNUSED Evas *e, EINA_UNUSED Evas_Obje
      {
         Edje *ed;
 
-        ed = eo_data_scope_get(o, EDJE_OBJECT_CLASS);
+        ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS);
         if (!ed) continue;
         ed->persp = NULL;
         ed->dirty = EINA_TRUE;
@@ -5499,7 +5499,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
      {
         Edje *ed;
 
-        ed = eo_data_scope_get(o, EDJE_OBJECT_CLASS);
+        ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS);
         if (!ed) continue;
         if (!ed->persp)
           {
@@ -6325,9 +6325,9 @@ _edje_fetch(const Evas_Object *obj)
 {
    Edje *ed;
 
-   if (!obj || !eo_isa(obj, EDJE_OBJECT_CLASS))
+   if (!obj || !efl_isa(obj, EDJE_OBJECT_CLASS))
      return NULL;
-   ed = eo_data_scope_get(obj, EDJE_OBJECT_CLASS);
+   ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
    if ((ed) && (ed->delete_me)) return NULL;
    return ed;
 }
@@ -6421,7 +6421,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
    rp->typedata.swallow->swallow_params.min.h = 0;
    rp->typedata.swallow->swallow_params.max.w = -1;
    rp->typedata.swallow->swallow_params.max.h = -1;
-   if (eo_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS))
+   if (efl_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS))
      {
         Evas_Coord w = 0, h = 0;
 
@@ -6434,9 +6434,9 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
         rp->typedata.swallow->swallow_params.max.w = w;
         rp->typedata.swallow->swallow_params.max.h = h;
      }
-   else if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_TEXT_CLASS) ||
-            eo_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_POLYGON_CLASS) ||
-            eo_isa(rp->typedata.swallow->swallowed_object, EVAS_LINE_CLASS))
+   else if (efl_isa(rp->typedata.swallow->swallowed_object, EVAS_TEXT_CLASS) ||
+            efl_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_POLYGON_CLASS) ||
+            efl_isa(rp->typedata.swallow->swallowed_object, EVAS_LINE_CLASS))
      {
         Evas_Coord w = 0, h = 0;
 
@@ -6591,7 +6591,7 @@ _edje_real_part_swallow(Edje *ed,
    evas_object_data_set(rp->typedata.swallow->swallowed_object, ".edje", ed);
 
    //If the map is enabled, uv should be updated when image size is changed.
-   if (eo_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+   if (efl_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
      evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_IMAGE_RESIZE,
                                     _edje_object_part_swallow_image_resize_cb,
                                     rp);
@@ -6635,7 +6635,7 @@ _edje_real_part_swallow_clear(Edje *ed, Edje_Real_Part *rp)
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                        _edje_object_part_swallow_changed_hints_cb,
                                        rp);
-   if (eo_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+   if (efl_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
      evas_object_event_callback_del_full(rp->typedata.swallow->swallowed_object,
                                          EVAS_CALLBACK_IMAGE_RESIZE,
                                          _edje_object_part_swallow_image_resize_cb,
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c
index bc6a284ca6..49f59af333 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -321,10 +321,10 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
    double *pts;
    unsigned int i, j;
 
-   from_pd = eo_data_scope_get(from, EFL_GFX_SHAPE_MIXIN);
-   to_pd = eo_data_scope_get(to, EFL_GFX_SHAPE_MIXIN);
-   if (!eo_isa(from, EFL_GFX_SHAPE_MIXIN) ||
-       !eo_isa(to, EFL_GFX_SHAPE_MIXIN))
+   from_pd = efl_data_scope_get(from, EFL_GFX_SHAPE_MIXIN);
+   to_pd = efl_data_scope_get(to, EFL_GFX_SHAPE_MIXIN);
+   if (!efl_isa(from, EFL_GFX_SHAPE_MIXIN) ||
+       !efl_isa(to, EFL_GFX_SHAPE_MIXIN))
      return EINA_FALSE;
    if (pd == from_pd || pd == to_pd)
      return EINA_FALSE;
@@ -428,7 +428,7 @@ _efl_gfx_shape_equal_commands(Eo *obj EINA_UNUSED,
 {
    Efl_Gfx_Shape_Data *with_pd;
 
-   with_pd = eo_data_scope_get(with, EFL_GFX_SHAPE_MIXIN);
+   with_pd = efl_data_scope_get(with, EFL_GFX_SHAPE_MIXIN);
    if (!with_pd) return EINA_FALSE;
 
    return _efl_gfx_shape_equal_commands_internal(with_pd, pd);
@@ -1804,7 +1804,7 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
    Efl_Gfx_Shape_Data *from;
 
    if (obj == dup_from) return ;
-   from = eo_data_scope_get(dup_from, EFL_GFX_SHAPE_MIXIN);
+   from = efl_data_scope_get(dup_from, EFL_GFX_SHAPE_MIXIN);
    if (!from) return ;
 
    pd->public.stroke.scale = from->public.stroke.scale;
diff --git a/src/lib/efl/interfaces/efl_input_device.c b/src/lib/efl/interfaces/efl_input_device.c
index cae988aee7..6e51972779 100644
--- a/src/lib/efl/interfaces/efl_input_device.c
+++ b/src/lib/efl/interfaces/efl_input_device.c
@@ -12,7 +12,7 @@
 EOLIAN static Efl_Object *
 _efl_input_device_efl_object_constructor(Eo *obj, Efl_Input_Device_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS));
+   obj = efl_constructor(efl_super(obj, EFL_INPUT_DEVICE_CLASS));
    pd->eo = obj;
    return obj;
 }
@@ -26,13 +26,13 @@ _efl_input_device_efl_object_destructor(Eo *obj, Efl_Input_Device_Data *pd)
    eina_stringshare_del(pd->desc);
    EINA_LIST_FREE(pd->children, eo_child)
      {
-        Efl_Input_Device_Data *child = eo_data_scope_get(eo_child, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *child = efl_data_scope_get(eo_child, EFL_INPUT_DEVICE_CLASS);
         child->parent = NULL;
-        eo_unref(eo_child);
+        efl_unref(eo_child);
      }
-   eo_unref(pd->source);
+   efl_unref(pd->source);
 
-   return efl_destructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS));
+   return efl_destructor(efl_super(obj, EFL_INPUT_DEVICE_CLASS));
 }
 
 EOLIAN static void
@@ -63,8 +63,8 @@ EOLIAN static void
 _efl_input_device_source_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Efl_Input_Device *src)
 {
    if (pd->source == src) return;
-   eo_unref(pd->source);
-   pd->source = eo_ref(src);
+   efl_unref(pd->source);
+   pd->source = efl_ref(src);
 }
 
 EOLIAN static Efl_Input_Device *
diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c
index b5225b7618..3b32205a79 100644
--- a/src/lib/efl/interfaces/efl_model_common.c
+++ b/src/lib/efl/interfaces/efl_model_common.c
@@ -72,7 +72,7 @@ efl_model_list_slice(Eina_List *list, unsigned start, unsigned count)
 
    EINA_LIST_FOREACH(ln, l, child)
      {
-        eo_ref(child);
+        efl_ref(child);
         lr = eina_list_append(lr, child);
         if (eina_list_count(lr) == count)
           break;
diff --git a/src/lib/efl/interfaces/efl_vpath_core.c b/src/lib/efl/interfaces/efl_vpath_core.c
index 79532da7d8..e3678ad776 100644
--- a/src/lib/efl/interfaces/efl_vpath_core.c
+++ b/src/lib/efl/interfaces/efl_vpath_core.c
@@ -31,7 +31,7 @@ _efl_vpath_core_efl_object_constructor(Eo *obj, Efl_Vpath_Core_Data *pd)
    const char *home, *s;
 
    if (vpath_core) return NULL;
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    pd->meta = eina_hash_string_superfast_new
      ((Eina_Free_Cb)eina_stringshare_del);
    eina_spinlock_new(&(pd->lock));
@@ -212,14 +212,14 @@ _efl_vpath_core_efl_object_destructor(Eo *obj, Efl_Vpath_Core_Data *pd)
    pd->meta = NULL;
    eina_spinlock_free(&(pd->lock));
    if (vpath_core == obj) vpath_core = NULL;
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Efl_Vpath_Core *
 _efl_vpath_core_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
 {
    // no locks here as we expect efl to init this early in main "thread"
-   if (!vpath_core) vpath_core = eo_add(EFL_VPATH_CORE_CLASS, NULL);
+   if (!vpath_core) vpath_core = efl_add(EFL_VPATH_CORE_CLASS, NULL);
    return vpath_core;
 }
 
@@ -250,7 +250,7 @@ _efl_vpath_core_efl_vpath_fetch(Eo *obj, Efl_Vpath_Core_Data *pd EINA_UNUSED, co
 {
    Efl_Vpath_File_Core *file;
 
-   file = eo_add(EFL_VPATH_FILE_CORE_CLASS, obj);
+   file = efl_add(EFL_VPATH_FILE_CORE_CLASS, obj);
    efl_vpath_file_path_set(file, path);
    // XXX: implement parse of path then look up in hash if not just create
    // object where path and result are the same and return that with
diff --git a/src/lib/efl/interfaces/efl_vpath_file_core.c b/src/lib/efl/interfaces/efl_vpath_file_core.c
index 23ce4101d8..e0328e7fb9 100644
--- a/src/lib/efl/interfaces/efl_vpath_file_core.c
+++ b/src/lib/efl/interfaces/efl_vpath_file_core.c
@@ -13,7 +13,7 @@ struct _Efl_Vpath_File_Core_Data
 EOLIAN static Efl_Object *
 _efl_vpath_file_core_efl_object_constructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    pd->dummy = 0;
    return obj;
 }
@@ -22,7 +22,7 @@ EOLIAN static void
 _efl_vpath_file_core_efl_object_destructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
 {
    pd->dummy = 0;
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -31,7 +31,7 @@ _efl_vpath_file_core_efl_vpath_file_do(Eo *obj, Efl_Vpath_File_Core_Data *pd)
    const char *path;
 
    if (efl_vpath_file_result_get(obj))
-     return efl_vpath_file_do(eo_super(obj, MY_CLASS));
+     return efl_vpath_file_do(efl_super(obj, MY_CLASS));
    // vpath core didn't find a match, so it'ss likely a protocol like
    // http:// etc. etc. so deal with that here
    path = efl_vpath_file_path_get(obj);
@@ -48,7 +48,7 @@ _efl_vpath_file_core_efl_vpath_file_do(Eo *obj, Efl_Vpath_File_Core_Data *pd)
 
    // not a magic path - just set result to path
    efl_vpath_file_result_set(obj, efl_vpath_file_path_get(obj));
-   return efl_vpath_file_do(eo_super(obj, MY_CLASS));
+   return efl_vpath_file_do(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -56,7 +56,7 @@ _efl_vpath_file_core_efl_vpath_file_wait(Eo *obj, Efl_Vpath_File_Core_Data *pd)
 {
    if (efl_vpath_file_result_get(obj))
      {
-        efl_vpath_file_do(eo_super(obj, MY_CLASS));
+        efl_vpath_file_do(efl_super(obj, MY_CLASS));
         return;
      }
    pd->dummy = 0;
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index df791d26b4..e79e25e1ef 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -34,7 +34,7 @@ _efl_vpath_manager_fetch(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const char *
         file = efl_vpath_fetch(entry->vpath, path);
         if (file) return file;
      }
-   file = eo_add(EFL_VPATH_FILE_CLASS, NULL);
+   file = efl_add(EFL_VPATH_FILE_CLASS, NULL);
    if (file)
      {
         efl_vpath_file_path_set(file, path);
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index a1f94d485e..181af8c567 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -65,7 +65,7 @@ _job_closure_create(Eo *obj, Efl_Io_Manager_Data *pdata, Eina_Promise_Owner *own
         return 0;
      }
 
-   closure->object = eo_ref(obj);
+   closure->object = efl_ref(obj);
    closure->pdata = pdata;
    closure->promise = owner;
    closure->file = NULL; // Will be set once the Eio operation is under way
@@ -86,7 +86,7 @@ _job_closure_del(Job_Closure *closure)
    if (pdata)
      pdata->operations = eina_list_remove(pdata->operations, closure);
 
-   eo_unref(closure->object);
+   efl_unref(closure->object);
 
    if (closure->delayed_arg)
      free(closure->delayed_arg);
@@ -582,7 +582,7 @@ _efl_io_manager_file_close(Eo *obj,
 static Efl_Object*
 _efl_io_manager_efl_object_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
+   obj = efl_constructor(efl_super(obj, EFL_IO_MANAGER_CLASS));
 
    pd->object = obj;
    pd->operations = NULL;
@@ -593,7 +593,7 @@ _efl_io_manager_efl_object_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNU
 static void
 _efl_io_manager_efl_object_destructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
+   efl_destructor(efl_super(obj, EFL_IO_MANAGER_CLASS));
 
    // FIXME: cancel all pending promise
 }
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 4f5ca4667a..4716ea63f4 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -319,7 +319,7 @@ eio_init(void)
 
    efreet_mime_init();
 
-   io_manager = eo_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+   io_manager = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
    efl_loop_register(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
 
    eina_log_timing(_eio_log_dom_global,
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 00b83c72eb..a7ab9495a6 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -87,7 +87,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
    Eio_Model_Data *priv = data;
    Eina_Array *properties;
 
-   EINA_SAFETY_ON_FALSE_RETURN(eo_ref_get(priv->obj));
+   EINA_SAFETY_ON_FALSE_RETURN(efl_ref_get(priv->obj));
    properties = eina_array_new(20);
 
    memset(&evt, 0, sizeof(Efl_Model_Property_Event));
@@ -161,7 +161,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event)
 
         for (i = 0; cur; ++i, cur = cur->next)
           {
-             Eio_Model_Data *cur_priv = eo_data_scope_get(cur->data, MY_CLASS);
+             Eio_Model_Data *cur_priv = efl_data_scope_get(cur->data, MY_CLASS);
              if(cur_priv->path == spath)
                {
                    eina_stringshare_del(spath);
@@ -171,7 +171,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event)
         eina_stringshare_del(spath);
      }
 
-   cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(eo_self, evt->filename));
+   cevt.child = efl_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_self, evt->filename));
    priv->children_list = eina_list_append(priv->children_list, cevt.child);
    cevt.index = eina_list_count(priv->children_list);
 
@@ -202,7 +202,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event)
 
         for (i = 0; cur; ++i, cur = cur->next)
           {
-             Eio_Model_Data *cur_priv = eo_data_scope_get(cur->data, MY_CLASS);
+             Eio_Model_Data *cur_priv = efl_data_scope_get(cur->data, MY_CLASS);
              if(cur_priv->path == spath)
                break;
           }
@@ -216,7 +216,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event)
              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);
+             efl_unref(cevt.child);
           }
 
         eina_stringshare_del(spath);
@@ -258,7 +258,7 @@ _eio_done_unlink_cb(void *data, Eio_File *handler EINA_UNUSED)
    EINA_SAFETY_ON_NULL_RETURN(priv);
    EINA_SAFETY_ON_NULL_RETURN(priv->obj);
 
-   eo_unref(priv->obj);
+   efl_unref(priv->obj);
 }
 
 static void
@@ -268,7 +268,7 @@ _eio_error_unlink_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int
 
    ERR("%d: %s.", error, strerror(error));
 
-   eo_unref(priv->obj);
+   efl_unref(priv->obj);
 }
 
 
@@ -497,7 +497,7 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina
    Eio_Model_Data *priv = data;
    EINA_SAFETY_ON_NULL_RETURN(priv);
 
-   child = eo_add_ref(MY_CLASS, priv->obj, eio_model_path_set(eo_self, info->path));
+   child = efl_add_ref(MY_CLASS, priv->obj, eio_model_path_set(efl_self, info->path));
    eina_spinlock_take(&priv->filter_lock);
    if (priv->filter_cb)
      eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata);
@@ -541,7 +541,7 @@ _eio_error_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, int error
    WRN("%d: %s.", error, strerror(error));
 
    EINA_LIST_FREE(priv->children_list, child)
-     eo_unref(child);
+     efl_unref(child);
 }
 
 static void
@@ -561,14 +561,14 @@ _eio_model_children_filter_set(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eio_Fi
 static Eo *
 _eio_model_efl_model_child_add(Eo *obj EINA_UNUSED, Eio_Model_Data *priv EINA_UNUSED)
 {
-   return eo_add(EIO_MODEL_CLASS, obj);
+   return efl_add(EIO_MODEL_CLASS, obj);
 }
 
 static void
 _eio_model_efl_model_child_del_stat(void* data, Eio_File* handler EINA_UNUSED, const Eina_Stat* stat)
 {
    Eo* child = data;
-   Eio_Model_Data *child_priv = eo_data_scope_get(child, MY_CLASS);
+   Eio_Model_Data *child_priv = efl_data_scope_get(child, MY_CLASS);
 
    if(eio_file_is_dir(stat))
      eio_dir_unlink(child_priv->path,
@@ -590,14 +590,14 @@ _eio_model_efl_model_child_del(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eo *ch
    Eio_Model_Data *child_priv;
    EINA_SAFETY_ON_NULL_RETURN(child);
 
-   child_priv = eo_data_scope_get(child, MY_CLASS);
+   child_priv = efl_data_scope_get(child, MY_CLASS);
    EINA_SAFETY_ON_NULL_RETURN(child_priv);
 
    priv->del_file = eio_file_direct_stat(child_priv->path,
                                          &_eio_model_efl_model_child_del_stat,
                                          &_eio_error_unlink_cb,
                                          child);
-   eo_ref(child);
+   efl_ref(child);
 }
 
 /**
@@ -651,7 +651,7 @@ _eio_model_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *pri
 static Eo *
 _eio_model_efl_object_constructor(Eo *obj, Eio_Model_Data *priv)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    unsigned int i;
    priv->obj = obj;
    priv->is_listed = priv->is_listing = EINA_FALSE;
@@ -687,24 +687,24 @@ _eio_model_efl_object_destructor(Eo *obj , Eio_Model_Data *priv)
      eina_array_free(priv->properties_name);
 
    EINA_LIST_FREE(priv->children_list, child)
-     eo_unref(child);
+     efl_unref(child);
 
    eina_stringshare_del(priv->path);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
 static Eo *
 _eio_model_efl_object_parent_get(Eo *obj , Eio_Model_Data *priv)
 {
-   Eo *model = efl_parent_get(eo_super(obj, MY_CLASS));
+   Eo *model = efl_parent_get(efl_super(obj, MY_CLASS));
 
-   if (model == NULL || !eo_isa(model, EFL_MODEL_INTERFACE))
+   if (model == NULL || !efl_isa(model, EFL_MODEL_INTERFACE))
      {
         char *path = ecore_file_dir_get(priv->path);
         if (path != NULL && strcmp(priv->path, "/") != 0)
           {
-             model = eo_add(MY_CLASS, NULL, eio_model_path_set(eo_self, path));
+             model = efl_add(MY_CLASS, NULL, eio_model_path_set(efl_self, path));
           }
         else
           model = NULL;
diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c
index cc3f9429fe..c21b0c2052 100644
--- a/src/lib/eio/eio_sentry.c
+++ b/src/lib/eio/eio_sentry.c
@@ -147,7 +147,7 @@ _eio_sentry_del(Eo *obj EINA_UNUSED, Eio_Sentry_Data *pd, const char *path)
 
 Efl_Object * _eio_sentry_efl_object_constructor(Eo *obj, Eio_Sentry_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, EIO_SENTRY_CLASS));
+   obj = efl_constructor(efl_super(obj, EIO_SENTRY_CLASS));
 
    pd->object = obj;
    pd->targets = eina_hash_string_small_new((Eina_Free_Cb)&eio_monitor_del);
@@ -160,7 +160,7 @@ void _eio_sentry_efl_object_destructor(Eo *obj, Eio_Sentry_Data *pd)
 {
    eina_hash_free(pd->targets);
 
-   efl_destructor(eo_super(obj, EIO_SENTRY_CLASS));
+   efl_destructor(efl_super(obj, EIO_SENTRY_CLASS));
 }
 
 #include "eio_sentry.eo.c"
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 69c0c00c15..f9f7f51c47 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -30,7 +30,7 @@ _eldbus_model_arguments_hash_free(Eina_Value *value)
 static Efl_Object*
 _eldbus_model_arguments_efl_object_constructor(Eo *obj, Eldbus_Model_Arguments_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->properties_array = NULL;
@@ -67,7 +67,7 @@ _eldbus_model_arguments_efl_object_destructor(Eo *obj, Eldbus_Model_Arguments_Da
    eina_stringshare_del(pd->name);
    eldbus_proxy_unref(pd->proxy);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index ab3df81544..465673ad33 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -20,7 +20,7 @@ static void _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *);
 static Efl_Object*
 _eldbus_model_connection_efl_object_constructor(Eo *obj, Eldbus_Model_Connection_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->is_listed = EINA_FALSE;
@@ -55,7 +55,7 @@ _eldbus_model_connection_efl_object_destructor(Eo *obj, Eldbus_Model_Connection_
 
    _eldbus_model_connection_clear(pd);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
@@ -287,7 +287,7 @@ _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *pd)
    pd->unique_name = NULL;
 
    EINA_LIST_FREE(pd->children_list, child)
-     eo_unref(child);
+     efl_unref(child);
 
    EINA_LIST_FREE(pd->pending_list, pending)
      eldbus_pending_cancel(pending);
@@ -333,7 +333,7 @@ _eldbus_model_connection_names_list_cb(void *data,
      {
         DBG("(%p): bus = %s", pd->obj, bus);
 
-        Eo *child = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(eo_self, pd->connection, bus, "/"));
+        Eo *child = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(efl_self, pd->connection, bus, "/"));
 
         pd->children_list = eina_list_append(pd->children_list, child);
      }
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index 18ba147a62..e36f941a0d 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -19,7 +19,7 @@ static void _eldbus_model_method_call_cb(void *, const Eldbus_Message *, Eldbus_
 static Efl_Object*
 _eldbus_model_method_efl_object_constructor(Eo *obj, Eldbus_Model_Method_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->method = NULL;
@@ -35,7 +35,7 @@ _eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
    EINA_SAFETY_ON_NULL_RETURN(proxy);
    EINA_SAFETY_ON_NULL_RETURN(method);
 
-   eldbus_model_arguments_constructor(eo_super(obj, MY_CLASS), proxy, method->name, method->arguments);
+   eldbus_model_arguments_constructor(efl_super(obj, MY_CLASS), proxy, method->name, method->arguments);
 
    pd->method = method;
 }
@@ -43,7 +43,7 @@ _eldbus_model_method_constructor(Eo *obj EINA_UNUSED,
 static void
 _eldbus_model_method_call(Eo *obj EINA_UNUSED, Eldbus_Model_Method_Data *pd EINA_UNUSED)
 {
-   Eldbus_Model_Arguments_Data *data = eo_data_scope_get(obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
+   Eldbus_Model_Arguments_Data *data = efl_data_scope_get(obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
    Eldbus_Message *msg = eldbus_proxy_method_call_new(data->proxy, data->name);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(msg);
    const Eldbus_Introspection_Argument *argument;
@@ -92,7 +92,7 @@ static void
 _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
 {
    Eldbus_Model_Method_Data *pd = (Eldbus_Model_Method_Data*)data;
-   Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
+   Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
 
    if (eldbus_model_arguments_process_arguments(args_data, msg, pending))
      efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index e45ae5d6c0..4de2400df1 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -25,7 +25,7 @@ static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eld
 static Efl_Object*
 _eldbus_model_object_efl_object_constructor(Eo *obj, Eldbus_Model_Object_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->is_listed = EINA_FALSE;
@@ -89,7 +89,7 @@ _eldbus_model_object_efl_object_destructor(Eo *obj, Eldbus_Model_Object_Data *pd
 
    _eldbus_model_object_clear(pd);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
@@ -333,7 +333,7 @@ _eldbus_model_object_clear(Eldbus_Model_Object_Data *pd)
    pd->unique_name = NULL;
 
    EINA_LIST_FREE(pd->children_list, child)
-     eo_unref(child);
+     efl_unref(child);
 
    EINA_LIST_FREE(pd->pending_list, pending)
      eldbus_pending_cancel(pending);
@@ -517,7 +517,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object
         WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
 
         // TODO: increment reference to keep 'interface' in memory
-        child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(eo_self, object, interface));
+        child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(efl_self, object, interface));
 
         pd->children_list = eina_list_append(pd->children_list, child);
      }
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 24ab831b99..54eb6c667a 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -49,7 +49,7 @@ _eldbus_model_proxy_hash_free(Eina_Value *value)
 static Efl_Object*
 _eldbus_model_proxy_efl_object_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->object = NULL;
@@ -91,7 +91,7 @@ _eldbus_model_proxy_efl_object_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
    eina_stringshare_del(pd->name);
    eldbus_object_unref(pd->object);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Array const *
@@ -296,7 +296,7 @@ _eldbus_model_proxy_create_methods_children(Eldbus_Model_Proxy_Data *pd)
         INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s",
                        pd->obj, bus, path, interface_name, method_name);
 
-        child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(eo_self, pd->proxy, method));
+        child = efl_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(efl_self, pd->proxy, method));
 
         pd->children_list = eina_list_append(pd->children_list, child);
      }
@@ -331,7 +331,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd)
         DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s",
                        pd->obj, bus, path, interface_name, signal_name);
 
-        child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(eo_self, pd->proxy, signal));
+        child = efl_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(efl_self, pd->proxy, signal));
 
         pd->children_list = eina_list_append(pd->children_list, child);
      }
@@ -390,7 +390,7 @@ _eldbus_model_proxy_unload(Eldbus_Model_Proxy_Data *pd)
    EINA_SAFETY_ON_NULL_RETURN(pd);
 
    EINA_LIST_FREE(pd->children_list, child)
-     eo_unref(child);
+     efl_unref(child);
 
    EINA_LIST_FREE(pd->pending_list, pending)
    {
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index 251d6266a8..12681cd3b7 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -19,7 +19,7 @@ static void _eldbus_model_signal_callback_del(Eldbus_Model_Signal_Data *);
 static Efl_Object*
 _eldbus_model_signal_efl_object_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd)
 {
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
 
    pd->obj = obj;
    pd->handler = NULL;
@@ -36,7 +36,7 @@ _eldbus_model_signal_constructor(Eo *obj EINA_UNUSED,
    EINA_SAFETY_ON_NULL_RETURN(proxy);
    EINA_SAFETY_ON_NULL_RETURN(signal);
 
-   eldbus_model_arguments_constructor(eo_super(obj, MY_CLASS), proxy, signal->name, signal->arguments);
+   eldbus_model_arguments_constructor(efl_super(obj, MY_CLASS), proxy, signal->name, signal->arguments);
 
    pd->signal = signal;
    _eldbus_model_signal_callback_add(pd);
@@ -47,7 +47,7 @@ _eldbus_model_signal_efl_object_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd
 {
    _eldbus_model_signal_callback_del(pd);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
@@ -57,7 +57,7 @@ _eldbus_model_signal_callback_add(Eldbus_Model_Signal_Data *pd)
    EINA_SAFETY_ON_NULL_RETURN(pd);
    EINA_SAFETY_ON_FALSE_RETURN(NULL == pd->handler);
 
-   Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
+   Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
    EINA_SAFETY_ON_NULL_RETURN(args_data);
 
    pd->handler = eldbus_proxy_signal_handler_add(args_data->proxy, pd->signal->name, _eldbus_model_signal_handler_cb, pd);
@@ -80,7 +80,7 @@ _eldbus_model_signal_handler_cb(void *data, const Eldbus_Message *msg)
 {
    Eldbus_Model_Signal_Data *pd = (Eldbus_Model_Signal_Data*)data;
 
-   Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
+   Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
 
    eldbus_model_arguments_process_arguments(args_data, msg, NULL);
 }
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index fd8309b441..068811939a 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -130,7 +130,7 @@ _on_size_hints_changed(void *data, Evas *e EINA_UNUSED,
                        Evas_Object *resizeobj, void *event_info EINA_UNUSED)
 {
    Efl_Ui_Box *obj = data;
-   Efl_Ui_Box_Data *pd = eo_data_scope_get(obj, EFL_UI_BOX_CLASS);
+   Efl_Ui_Box_Data *pd = efl_data_scope_get(obj, EFL_UI_BOX_CLASS);
 
    if (obj == resizeobj)
      efl_pack_layout_request(obj);
@@ -170,7 +170,7 @@ EOLIAN static void
 _efl_ui_box_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Box_Data *pd,
                                               const Efl_Class *klass, const void *data)
 {
-   pd->layout_engine = klass ? klass : eo_class_get(obj);
+   pd->layout_engine = klass ? klass : efl_class_get(obj);
    pd->layout_data = data;
    efl_pack_layout_request(obj);
    _sizing_eval(obj, pd);
@@ -208,7 +208,7 @@ _efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
    evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
@@ -246,20 +246,20 @@ _efl_ui_box_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Box_Data *sd)
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eo *
 _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 = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
    pd->orient = EFL_ORIENT_RIGHT;
-   pd->layout_engine = eo_class_get(obj);
+   pd->layout_engine = efl_class_get(obj);
    pd->align.h = 0.5;
    pd->align.v = 0.5;
 
@@ -499,7 +499,7 @@ _efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
 
 end:
    ERR("object %p (%s) is not a child of %p (%s)",
-       subobj, eo_class_name_get(subobj), obj, eo_class_name_get(obj));
+       subobj, efl_class_name_get(subobj), obj, efl_class_name_get(obj));
    return -1;
 }
 
diff --git a/src/lib/elementary/efl_ui_box_flow.c b/src/lib/elementary/efl_ui_box_flow.c
index 99042b7a8a..c1f72b40ad 100644
--- a/src/lib/elementary/efl_ui_box_flow.c
+++ b/src/lib/elementary/efl_ui_box_flow.c
@@ -12,7 +12,7 @@ struct _Efl_Ui_Box_Flow_Data
 EOLIAN static Eo *
 _efl_ui_box_flow_efl_object_constructor(Eo *obj, Efl_Ui_Box_Flow_Data *pd)
 {
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
    efl_pack_layout_engine_set(obj, MY_CLASS, &pd->params);
    return obj;
 }
@@ -52,10 +52,10 @@ _efl_ui_box_flow_efl_pack_layout_layout_do(Efl_Class *klass EINA_UNUSED,
    Efl_Ui_Box_Data *pd;
    Eina_Bool homo = EINA_FALSE, maxsize = EINA_FALSE;
 
-   EINA_SAFETY_ON_FALSE_RETURN(eo_isa(obj, EFL_UI_BOX_CLASS));
+   EINA_SAFETY_ON_FALSE_RETURN(efl_isa(obj, EFL_UI_BOX_CLASS));
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   bd = eo_data_scope_get(wd->resize_obj, EVAS_BOX_CLASS);
-   pd = eo_data_scope_get(obj, EFL_UI_BOX_CLASS);
+   bd = efl_data_scope_get(wd->resize_obj, EVAS_BOX_CLASS);
+   pd = efl_data_scope_get(obj, EFL_UI_BOX_CLASS);
 
    if (params)
      {
diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c
index 9ad89c3383..6556654747 100644
--- a/src/lib/elementary/efl_ui_box_layout.c
+++ b/src/lib/elementary/efl_ui_box_layout.c
@@ -21,7 +21,7 @@ struct _Item_Calc
 void
 _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
 {
-   Efl_Ui_Box_Data *pd = eo_data_scope_get(ui_box, EFL_UI_BOX_CLASS);
+   Efl_Ui_Box_Data *pd = efl_data_scope_get(ui_box, EFL_UI_BOX_CLASS);
    Evas_Object_Box_Option *opt;
    Evas_Object *o;
    Eina_List *li;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index f06d9c5399..5dc8214f07 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -101,7 +101,7 @@ EOLIAN static Elm_Theme_Apply
 _efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _sizing_eval(obj);
@@ -175,7 +175,7 @@ _efl_ui_flip_elm_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSE
    if (evas_object_data_get(sobj, "elm-parent") == obj)
      return EINA_TRUE;
 
-   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    evas_object_data_set(sobj, "_elm_leaveme", sobj);
@@ -193,7 +193,7 @@ _efl_ui_flip_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Objec
    Eina_Bool int_ret = EINA_FALSE;
 
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->front.content)
@@ -511,7 +511,7 @@ _slice_obj_vert_color_merge(Slice *s1,
 static int
 _state_update(Evas_Object *obj)
 {
-   Efl_Ui_Flip_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Flip_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Slice *sl;
    Vertex3 *tvo, *tvol;
    Evas_Object *front, *back;
@@ -940,7 +940,7 @@ _map_uv_set(Evas_Object *obj, Evas_Map *map)
    Evas_Coord x, y, w, h;
 
    // FIXME: only handles filled obj
-   if (eo_isa(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS) &&
+   if (efl_isa(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS) &&
        !evas_object_image_source_get(obj))
      {
         int iw, ih;
@@ -1532,7 +1532,7 @@ _update_job(void *data)
 {
    Elm_Flip_Mode m = ELM_FLIP_ROTATE_X_CENTER_AXIS;
    Evas_Object *obj = data;
-   Efl_Ui_Flip_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Flip_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    int rev = 0;
    double p;
 
@@ -1811,7 +1811,7 @@ _efl_ui_flip_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *_pd EINA_UNUSE
 EOLIAN static void
 _efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -1857,21 +1857,21 @@ _efl_ui_flip_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Flip_Data *sd)
    ecore_animator_del(sd->animator);
    _state_slices_clear(sd);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_flip_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index a8de44cbe5..3b19afec8f 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -159,7 +159,7 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    edje_object_signal_callback_add
@@ -193,14 +193,14 @@ EAPI Evas_Object *
 elm_frame_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 1fd7aa78ff..639395d8f9 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -17,7 +17,7 @@ struct _Custom_Table_Data
    Efl_Ui_Grid_Data *gd;
 };
 
-EO_CALLBACKS_ARRAY_DEFINE(subobj_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(subobj_callbacks,
                           { EFL_EVENT_DEL, _subobj_del_cb });
 
 EOLIAN static Eina_Bool
@@ -116,7 +116,7 @@ EOLIAN static Elm_Theme_Apply
 _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -157,7 +157,7 @@ _table_size_hints_changed(void *data, Evas *e EINA_UNUSED,
                           Evas_Object *table EINA_UNUSED,
                           void *event_info EINA_UNUSED)
 {
-   Efl_Ui_Grid_Data *pd = eo_data_scope_get(data, MY_CLASS);
+   Efl_Ui_Grid_Data *pd = efl_data_scope_get(data, MY_CLASS);
 
    _sizing_eval(data, pd);
 }
@@ -166,16 +166,16 @@ _table_size_hints_changed(void *data, Evas *e EINA_UNUSED,
 static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd);
 
 static const Efl_Op_Description custom_table_op_desc[] = {
-   EO_OP_CLASS_FUNC_OVERRIDE(efl_canvas_group_calculate, _custom_table_calc),
+   EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(efl_canvas_group_calculate, _custom_table_calc),
 };
 
 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,
+   EO_VERSION, "Efl.Ui.Grid.Internal", EFL_CLASS_TYPE_REGULAR,
+   EFL_CLASS_DESCRIPTION_OPS(custom_table_op_desc), NULL,
    sizeof(Custom_Table_Data), NULL, NULL
 };
 
-EO_DEFINE_CLASS(_efl_ui_grid_custom_table_class_get, &custom_table_class_desc,
+EFL_DEFINE_CLASS(_efl_ui_grid_custom_table_class_get, &custom_table_class_desc,
                 EVAS_TABLE_CLASS, NULL)
 
 #define CUSTOM_TABLE_CLASS _efl_ui_grid_custom_table_class_get()
@@ -196,7 +196,7 @@ _custom_table_calc(Eo *obj, Custom_Table_Data *pd)
 EOLIAN static void
 _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_engine = engine ? engine : efl_class_get(obj);
    pd->layout_data = data;
    efl_pack_layout_request(obj);
 }
@@ -222,7 +222,7 @@ _efl_ui_grid_efl_pack_layout_layout_do(Eo *klass EINA_UNUSED,
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_calculate(eo_super(wd->resize_obj, CUSTOM_TABLE_CLASS));
+   efl_canvas_group_calculate(efl_super(wd->resize_obj, CUSTOM_TABLE_CLASS));
 }
 
 EOLIAN void
@@ -243,8 +243,8 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
 
    elm_widget_sub_object_parent_add(obj);
 
-   table = eo_add(CUSTOM_TABLE_CLASS, obj);
-   custom = eo_data_scope_get(table, CUSTOM_TABLE_CLASS);
+   table = efl_add(CUSTOM_TABLE_CLASS, obj);
+   custom = efl_data_scope_get(table, CUSTOM_TABLE_CLASS);
    custom->gd = pd;
    custom->parent = obj;
 
@@ -254,7 +254,7 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
    evas_object_event_callback_add
          (table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _table_size_hints_changed, obj);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
    elm_widget_highlight_ignore_set(obj, EINA_FALSE);
@@ -286,13 +286,13 @@ _efl_ui_grid_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSE
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eo *
 _efl_ui_grid_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
@@ -341,7 +341,7 @@ static void
 _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);
+   Efl_Ui_Grid_Data *pd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
 
    efl_event_callback_array_del(event->object, subobj_callbacks(), data);
    _item_remove(obj, pd, event->object);
diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c
index 94f7bf9773..06b4759f71 100644
--- a/src/lib/elementary/efl_ui_grid_static.c
+++ b/src/lib/elementary/efl_ui_grid_static.c
@@ -9,11 +9,11 @@ _efl_ui_grid_static_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
 {
    Efl_Ui_Grid_Data *gd;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
-   gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
+   gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
    gd->layout_engine = MY_CLASS;
    gd->req_cols = 100;
    gd->req_rows = 100;
@@ -33,7 +33,7 @@ _efl_ui_grid_static_efl_pack_layout_layout_do(Efl_Class *klass EINA_UNUSED,
    long long xl, yl, wl, hl, vwl, vhl;
    Eina_Bool mirror;
 
-   gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
+   gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
    if (!gd->items) return;
 
    e = evas_object_evas_get(obj);
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 15bf16a73c..a392b6eab4 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -126,7 +126,7 @@ _efl_ui_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Efl_Ui_Image_Da
 {
    if (!sd->img) return;
 
-   if (eo_isa(sd->img, EDJE_OBJECT_CLASS))
+   if (efl_isa(sd->img, EDJE_OBJECT_CLASS))
      {
         evas_object_move(sd->img, sd->img_x, sd->img_y);
         evas_object_resize(sd->img, sd->img_w, sd->img_h);
@@ -575,7 +575,7 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj,
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -626,7 +626,7 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
           {
              ERR("Async open thread timed out during cancellation.");
              // skipping all other data free to avoid crashes (this leaks)
-             efl_canvas_group_del(eo_super(obj, MY_CLASS));
+             efl_canvas_group_del(efl_super(obj, MY_CLASS));
              return;
           }
         sd->async.th = NULL;
@@ -637,13 +637,13 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
    eina_stringshare_del(sd->async.file);
    eina_stringshare_del(sd->async.key);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    if ((sd->img_x == x) && (sd->img_y == y)) return;
    sd->img_x = x;
@@ -656,7 +656,7 @@ _efl_ui_image_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_C
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    if ((sd->img_w == w) && (sd->img_h == h)) return;
 
@@ -673,7 +673,7 @@ _efl_ui_image_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Image_Data *sd)
    sd->show = EINA_TRUE;
    if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
 
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    evas_object_show(sd->img);
 
@@ -683,7 +683,7 @@ _efl_ui_image_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Image_Data *sd)
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Image_Data *sd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    sd->show = EINA_FALSE;
    evas_object_hide(sd->img);
@@ -694,7 +694,7 @@ _efl_ui_image_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Image_Data *sd)
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -703,7 +703,7 @@ _efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd,
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
 {
-   efl_canvas_group_color_set(eo_super(obj, MY_CLASS), r, g, b, a);
+   efl_canvas_group_color_set(efl_super(obj, MY_CLASS), r, g, b, a);
 
    evas_object_color_set(sd->hit_rect, 0, 0, 0, 0);
    evas_object_color_set(sd->img, r, g, b, a);
@@ -713,7 +713,7 @@ _efl_ui_image_efl_canvas_group_group_color_set(Eo *obj, Efl_Ui_Image_Data *sd, i
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
 {
-   efl_canvas_group_clip_set(eo_super(obj, MY_CLASS), clip);
+   efl_canvas_group_clip_set(efl_super(obj, MY_CLASS), clip);
 
    evas_object_clip_set(sd->img, clip);
    if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
@@ -722,7 +722,7 @@ _efl_ui_image_efl_canvas_group_group_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Ev
 EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd)
 {
-   efl_canvas_group_clip_unset(eo_super(obj, MY_CLASS));
+   efl_canvas_group_clip_unset(efl_super(obj, MY_CLASS));
 
    evas_object_clip_unset(sd->img);
    if (sd->prev_img) evas_object_clip_unset(sd->prev_img);
@@ -736,7 +736,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
    if (sd->stdicon)
      _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _efl_ui_image_sizing_eval(obj);
@@ -869,14 +869,14 @@ EAPI Evas_Object *
 elm_image_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -956,7 +956,7 @@ static void
 _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download)
 {
    Eo *obj = data;
-   Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Eina_File *f;
    size_t length;
    Eina_Bool ret = EINA_FALSE;
@@ -997,7 +997,7 @@ static void
 _efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
 {
    Eo *obj = data;
-   Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Efl_Ui_Image_Error err = { error, EINA_FALSE };
 
    efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
@@ -1158,7 +1158,7 @@ _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data
    if (w) *w = 0;
    if (h) *h = 0;
 
-   if (eo_isa(sd->img, EDJE_OBJECT_CLASS))
+   if (efl_isa(sd->img, EDJE_OBJECT_CLASS))
      edje_object_size_min_get(sd->img, &tw, &th);
    else
      evas_object_image_size_get(sd->img, &tw, &th);
@@ -1336,7 +1336,7 @@ _efl_ui_image_animated_get_internal(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data
 EAPI void
 elm_image_animated_set(Evas_Object *obj, Eina_Bool anim)
 {
-   Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    if (!sd) return;
    _efl_ui_image_animated_set_internal(obj, sd, anim);
 }
@@ -1344,7 +1344,7 @@ elm_image_animated_set(Evas_Object *obj, Eina_Bool anim)
 EAPI Eina_Bool
 elm_image_animated_get(const Evas_Object *obj)
 {
-   Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    if (!sd) return EINA_FALSE;
    return _efl_ui_image_animated_get_internal(obj, sd);
 }
@@ -1382,7 +1382,7 @@ _efl_ui_image_animated_play_get_internal(const Eo *obj EINA_UNUSED, Efl_Ui_Image
 EAPI void
 elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play)
 {
-   Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    if (!sd) return;
    _efl_ui_image_animated_play_set_internal(obj, sd, play);
 }
@@ -1390,7 +1390,7 @@ elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play)
 EAPI Eina_Bool
 elm_image_animated_play_get(const Elm_Image *obj)
 {
-   Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    if (!sd) return EINA_FALSE;
    return _efl_ui_image_animated_play_get_internal(obj, sd);
 }
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index abecff9690..6a98319260 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -105,7 +105,7 @@ static void
 _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    char *commit_str = event_info;
 
    if (en->have_selection)
@@ -179,7 +179,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
 {
    Efl_Canvas_Text *obj = data;
    Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    int cursor_pos;
    int preedit_start_pos, preedit_end_pos;
    char *preedit_string;
@@ -332,7 +332,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
 {
    Efl_Canvas_Text *obj = data;
    Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
    Evas_Textblock_Cursor *del_start, *del_end;
    Efl_Ui_Text_Interactive_Change_Info info = { NULL, 0, 0, 0, 0 };
@@ -375,7 +375,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
 {
    Efl_Canvas_Text *obj = data;
    Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Ecore_IMF_Event_Selection *ev = event_info;
 
    if (ev->start == ev->end)
@@ -397,7 +397,7 @@ static Eina_Bool
 _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    const char *selection_text = NULL;
 
    if (en->have_selection)
@@ -460,7 +460,7 @@ static void
 _focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
 #ifdef HAVE_ECORE_IMF
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    if (!en->imf_context) return;
 
    ecore_imf_context_focus_in(en->imf_context);
@@ -485,7 +485,7 @@ static void
 _focus_out_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
 #ifdef HAVE_ECORE_IMF
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    if (!en->imf_context) return;
 
    ecore_imf_context_reset(en->imf_context);
@@ -709,7 +709,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
    if (!ev->key) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
 
    /* FIXME: Maybe allow selctions to happen even when not editable. */
    if (!en->editable) return;
@@ -1071,7 +1071,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
 {
    Evas_Coord cx, cy;
    Evas_Event_Mouse_Down *ev = event_info;
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
    Evas_Textblock_Cursor *tc = NULL;
    Eina_Bool dosel = EINA_FALSE;
@@ -1182,7 +1182,7 @@ static void
 _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
 {
    Evas_Coord cx, cy;
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
    Evas_Event_Mouse_Up *ev = event_info;
 
@@ -1223,7 +1223,7 @@ static void
 _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
 {
    Evas_Coord cx, cy;
-   Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
    Evas_Event_Mouse_Move *ev = event_info;
    Evas_Coord x, y, w, h;
@@ -1278,7 +1278,7 @@ _efl_ui_internal_text_interactive_efl_object_constructor(Eo *obj, Efl_Ui_Interna
    en->select_allow = EINA_TRUE;
    en->multiline = EINA_TRUE;
    en->editable = EINA_TRUE;
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Efl_Object *
@@ -1363,7 +1363,7 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
 #endif
 
 done:
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index c8fd3a174a..254b25238b 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -34,7 +34,7 @@ static const Elm_Action key_actions[] = {
 EOLIAN static Efl_Object *
 _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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
@@ -75,7 +75,7 @@ _efl_ui_nstate_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    pd->state = 0;
@@ -92,7 +92,7 @@ _efl_ui_nstate_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
 EOLIAN static void
 _efl_ui_nstate_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
 {
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static int
@@ -139,7 +139,7 @@ _efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _state_active(obj, pd);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 5dcc078c4c..b0c17a0566 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -147,7 +147,7 @@ struct _Item_Obj
 };
 
 #define EFL_UI_TEXT_DATA_GET(o, sd) \
-  Efl_Ui_Text_Data * sd = eo_data_scope_get(o, EFL_UI_TEXT_CLASS)
+  Efl_Ui_Text_Data * sd = efl_data_scope_get(o, EFL_UI_TEXT_CLASS)
 
 #define EFL_UI_TEXT_DATA_GET_OR_RETURN(o, ptr)         \
   EFL_UI_TEXT_DATA_GET(o, ptr);                        \
@@ -168,7 +168,7 @@ struct _Item_Obj
     }
 
 #define EFL_UI_TEXT_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_TEXT_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_TEXT_CLASS))) \
     return
 
 struct _Efl_Ui_Text_Rectangle
@@ -523,7 +523,7 @@ _viewport_region_get(Evas_Object *obj)
    parent = elm_widget_parent_get(obj);
    while (parent)
      {
-        if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
+        if (efl_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
           {
              Eina_Rectangle r;
              EINA_RECTANGLE_SET(&r, 0, 0, 0, 0);
@@ -906,7 +906,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    evas_event_freeze(evas_object_evas_get(obj));
@@ -1110,7 +1110,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item
    if (!sd->editable) return EINA_FALSE;
 
    top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      top_is_win = EINA_TRUE;
 
    if (elm_widget_focus_get(obj))
@@ -1213,7 +1213,7 @@ _efl_ui_text_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSE
         elm_layout_signal_emit(obj, "elm,action,hide,end", "elm");
      }
 
-   ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!ret) return EINA_FALSE;
 
    return EINA_TRUE;
@@ -1740,7 +1740,7 @@ _magnifier_move(void *data)
 
    // keep magnifier inside window
    top = elm_widget_top_get(data);
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      {
         Evas_Coord wh, ww;
         evas_object_geometry_get(top, NULL, NULL, &ww, &wh);
@@ -1938,7 +1938,7 @@ _mouse_up_cb(void *data,
              top = elm_widget_top_get(data);
              if (top)
                {
-                  if (eo_isa(top, EFL_UI_WIN_CLASS))
+                  if (efl_isa(top, EFL_UI_WIN_CLASS))
                     top_is_win = EINA_TRUE;
 
                   if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&
@@ -2655,14 +2655,14 @@ _efl_ui_text_elm_layout_signal_callback_add (Eo *obj, Efl_Ui_Text_Data *sd, cons
    wd->resize_obj = sd->entry_edje;
 
    elm_obj_layout_signal_callback_add
-     (eo_super(obj, MY_CLASS), emission, source, func_cb, data);
+     (efl_super(obj, MY_CLASS), emission, source, func_cb, data);
 
    if (sd->scr_edje)
      {
         wd->resize_obj = sd->scr_edje;
 
         elm_obj_layout_signal_callback_add
-              (eo_super(obj, MY_CLASS), emission, source, func_cb, data);
+              (efl_super(obj, MY_CLASS), emission, source, func_cb, data);
      }
 
    wd->resize_obj = ro;
@@ -2681,14 +2681,14 @@ _efl_ui_text_elm_layout_signal_callback_del(Eo *obj, Efl_Ui_Text_Data *sd, const
    wd->resize_obj = sd->entry_edje;
 
    data = elm_obj_layout_signal_callback_del
-         (eo_super(obj, MY_CLASS), emission, source, func_cb);
+         (efl_super(obj, MY_CLASS), emission, source, func_cb);
 
    if (sd->scr_edje)
      {
         wd->resize_obj = sd->scr_edje;
 
         data = elm_obj_layout_signal_callback_del
-              (eo_super(obj, MY_CLASS), emission, source, func_cb);
+              (efl_super(obj, MY_CLASS), emission, source, func_cb);
      }
 
    wd->resize_obj = ro;
@@ -2700,7 +2700,7 @@ static Eina_Bool
 _efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+   int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
    if (!int_ret) return EINA_FALSE;
 
    /* too bad entry does not follow the pattern
@@ -2719,7 +2719,7 @@ static Evas_Object*
 _efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *part)
 {
    Evas_Object *ret = NULL;
-   ret = efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part));
+   ret = efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
    if (!ret) return NULL;
 
    /* too bad entry does not follow the pattern
@@ -3204,10 +3204,10 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
    /* XXX: needs to be before efl_canvas_group_add, since the latter will
     * 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);
+   text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
    efl_composite_attach(obj, text_obj);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->test_bit = EINA_TRUE;
@@ -3491,13 +3491,13 @@ _efl_ui_text_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Text_Data *sd)
    evas_object_event_callback_del_full(sd->entry_edje, EVAS_CALLBACK_MOVE,
          _efl_ui_text_move_cb, obj);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 
@@ -3509,7 +3509,7 @@ _efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coo
 EOLIAN static void
 _efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
    _update_selection_handler(obj);
@@ -3518,7 +3518,7 @@ _efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_C
 EOLIAN static void
 _efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    _update_selection_handler(obj);
 }
@@ -3526,7 +3526,7 @@ _efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUS
 EOLIAN static void
 _efl_ui_text_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Text_Data *sd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    if (sd->have_selection)
      _hide_selection_handler(obj);
@@ -3535,7 +3535,7 @@ _efl_ui_text_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Text_Data *sd)
 EOLIAN static void
 _efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -3578,7 +3578,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 EOLIAN static Eo *
 _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -3593,7 +3593,7 @@ EOLIAN static void
 _efl_ui_text_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd)
 {
    ecore_job_del(pd->deferred_decoration_job);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -3689,7 +3689,7 @@ _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
 EOLIAN static void
 _efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool editable)
 {
-   efl_ui_text_interactive_editable_set(eo_super(obj, MY_CLASS), editable);
+   efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable);
    if (sd->editable == editable) return;
    sd->editable = editable;
    elm_obj_widget_theme_apply(obj);
@@ -4022,7 +4022,7 @@ _efl_ui_text_elm_interface_scrollable_policy_set(Eo *obj, Efl_Ui_Text_Data *sd,
 {
    sd->policy_h = h;
    sd->policy_v = v;
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), sd->policy_h, sd->policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), sd->policy_h, sd->policy_v);
 }
 
 EOLIAN static void
@@ -4030,7 +4030,7 @@ _efl_ui_text_elm_interface_scrollable_bounce_allow_set(Eo *obj, Efl_Ui_Text_Data
 {
    sd->h_bounce = h_bounce;
    sd->v_bounce = v_bounce;
-   elm_interface_scrollable_bounce_allow_set(eo_super(obj, MY_CLASS), h_bounce, v_bounce);
+   elm_interface_scrollable_bounce_allow_set(efl_super(obj, MY_CLASS), h_bounce, v_bounce);
 }
 
 EOLIAN static void
@@ -4862,7 +4862,7 @@ EOLIAN static Elm_Atspi_State_Set
 _efl_ui_text_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, EFL_UI_TEXT_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
 
    if (efl_ui_text_interactive_editable_get(obj))
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE);
@@ -4874,7 +4874,7 @@ EOLIAN static char*
 _efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *sd)
 {
    char *name;
-   name = elm_interface_atspi_accessible_name_get(eo_super(obj, EFL_UI_TEXT_CLASS));
+   name = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_TEXT_CLASS));
    if (name && strncmp("", name, 1)) return name;
    const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide");
    return ret ? strdup(ret) : NULL;
@@ -4884,8 +4884,8 @@ EOLIAN static Efl_Canvas_Text_Cursor *
 _efl_ui_text_cursor_new(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED)
 {
    Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
-   return eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj,
-         efl_canvas_text_cursor_text_object_set(eo_self, text_obj));
+   return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj,
+         efl_canvas_text_cursor_text_object_set(efl_self, text_obj));
 }
 
 static void
@@ -4900,7 +4900,7 @@ static inline Eo *
 _decoration_create(Efl_Ui_Text_Data *sd, const char *file,
       const char *source, Eina_Bool above)
 {
-   Eo *ret = eo_add(EDJE_OBJECT_CLASS, sd->entry_edje);
+   Eo *ret = efl_add(EDJE_OBJECT_CLASS, sd->entry_edje);
    Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
    edje_object_file_set(ret, file, source);
    evas_object_smart_member_add(ret, sd->entry_edje);
@@ -5245,10 +5245,10 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd)
    Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
    _anchors_clear(obj, sd);
 
-   start =  eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
-         efl_canvas_text_cursor_text_object_set(eo_self, text_obj));
-   end =  eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
-         efl_canvas_text_cursor_text_object_set(eo_self, text_obj));
+   start =  efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
+         efl_canvas_text_cursor_text_object_set(efl_self, text_obj));
+   end =  efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
+         efl_canvas_text_cursor_text_object_set(efl_self, text_obj));
 
    /* Retrieve all annotations in the text. */
    efl_canvas_text_cursor_paragraph_first(start);
@@ -5470,7 +5470,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
 EOLIAN static Eo *
 _efl_ui_text_editable_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_ui_text_interactive_editable_set(obj, EINA_TRUE);
 
    return obj;
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 1112114928..5acfb949de 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -49,7 +49,7 @@ static const Elm_Action key_actions[] = {
    {NULL, NULL}
 };
 
-EO_CALLBACKS_ARRAY_DEFINE(_video_cb,
+EFL_CALLBACKS_ARRAY_DEFINE(_video_cb,
    { EMOTION_OBJECT_EVENT_OPEN_DONE, _on_open_done },
    { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _on_playback_started },
    { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _on_playback_finished },
@@ -240,7 +240,7 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv)
 {
    _elm_emotion_init();
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -268,21 +268,21 @@ _efl_ui_video_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Video_Data *sd)
    ecore_timer_del(sd->timer);
    if (sd->remember) emotion_object_last_position_save(sd->emotion);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
-elm_video_add(Evas_Object *parent)
+elm_videfl_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/efl_ui_video_legacy.h b/src/lib/elementary/efl_ui_video_legacy.h
index 0cc087b02b..e56e6209ab 100644
--- a/src/lib/elementary/efl_ui_video_legacy.h
+++ b/src/lib/elementary/efl_ui_video_legacy.h
@@ -24,7 +24,7 @@ EAPI Evas_Object         *elm_player_add(Evas_Object *parent);
  *
  * @ingroup Elm_Video
  */
-EAPI Evas_Object         *elm_video_add(Evas_Object *parent);
+EAPI Evas_Object         *elm_videfl_add(Evas_Object *parent);
 
 /**
  *
@@ -35,7 +35,7 @@ EAPI Evas_Object         *elm_video_add(Evas_Object *parent);
  * This function will explicitly define a file or URI as a source
  * for the video of the Elm_Video object.
  *
- * @see elm_video_add()
+ * @see elm_videfl_add()
  * @see elm_player_add()
  *
  * @ingroup Elm_Video
diff --git a/src/lib/elementary/efl_ui_video_private.h b/src/lib/elementary/efl_ui_video_private.h
index 2d33ebe722..c38ddb7bf9 100644
--- a/src/lib/elementary/efl_ui_video_private.h
+++ b/src/lib/elementary/efl_ui_video_private.h
@@ -38,7 +38,7 @@ struct _Efl_Ui_Video_Data
  */
 
 #define EFL_UI_VIDEO_DATA_GET(o, sd) \
-  Efl_Ui_Video_Data * sd = eo_data_scope_get(o, EFL_UI_VIDEO_CLASS)
+  Efl_Ui_Video_Data * sd = efl_data_scope_get(o, EFL_UI_VIDEO_CLASS)
 
 #define EFL_UI_VIDEO_DATA_GET_OR_RETURN(o, ptr)         \
   EFL_UI_VIDEO_DATA_GET(o, ptr);                        \
@@ -59,7 +59,7 @@ struct _Efl_Ui_Video_Data
     }
 
 #define EFL_UI_VIDEO_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_VIDEO_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_VIDEO_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/efl_ui_widget_flip.h b/src/lib/elementary/efl_ui_widget_flip.h
index 616214fe08..012580f964 100644
--- a/src/lib/elementary/efl_ui_widget_flip.h
+++ b/src/lib/elementary/efl_ui_widget_flip.h
@@ -84,7 +84,7 @@ struct _Vertex3
  */
 
 #define EFL_UI_FLIP_DATA_GET(o, sd) \
-  Efl_Ui_Flip_Data * sd = eo_data_scope_get(o, EFL_UI_FLIP_CLASS)
+  Efl_Ui_Flip_Data * sd = efl_data_scope_get(o, EFL_UI_FLIP_CLASS)
 
 #define EFL_UI_FLIP_DATA_GET_OR_RETURN(o, ptr)          \
   EFL_UI_FLIP_DATA_GET(o, ptr);                         \
@@ -105,7 +105,7 @@ struct _Vertex3
     }
 
 #define ELM_FLIP_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_FLIP_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_FLIP_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/efl_ui_widget_frame.h b/src/lib/elementary/efl_ui_widget_frame.h
index 30c3a796a4..ddd7f70789 100644
--- a/src/lib/elementary/efl_ui_widget_frame.h
+++ b/src/lib/elementary/efl_ui_widget_frame.h
@@ -36,7 +36,7 @@ struct _Efl_Ui_Frame_Data
  */
 
 #define EFL_UI_FRAME_DATA_GET(o, sd) \
-  Efl_Ui_Frame_Data * sd = eo_data_scope_get(o, EFL_UI_FRAME_CLASS)
+  Efl_Ui_Frame_Data * sd = efl_data_scope_get(o, EFL_UI_FRAME_CLASS)
 
 #define EFL_UI_FRAME_DATA_GET_OR_RETURN(o, ptr)         \
   EFL_UI_FRAME_DATA_GET(o, ptr);                        \
@@ -57,7 +57,7 @@ struct _Efl_Ui_Frame_Data
     }
 
 #define EFL_UI_FRAME_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_FRAME_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_FRAME_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index 64f7b9715c..a0da68a083 100644
--- a/src/lib/elementary/efl_ui_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -105,7 +105,7 @@ struct _Efl_Ui_Image_Data
  */
 
 #define EFL_UI_IMAGE_DATA_GET(o, sd) \
-  Efl_Ui_Image_Data * sd = eo_data_scope_get(o, EFL_UI_IMAGE_CLASS)
+  Efl_Ui_Image_Data * sd = efl_data_scope_get(o, EFL_UI_IMAGE_CLASS)
 
 #define EFL_UI_IMAGE_DATA_GET_OR_RETURN(o, ptr)         \
   EFL_UI_IMAGE_DATA_GET(o, ptr);                        \
@@ -126,7 +126,7 @@ struct _Efl_Ui_Image_Data
     }
 
 #define EFL_UI_IMAGE_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_IMAGE_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_IMAGE_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 11d018a64c..00b6ab16ad 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -38,19 +38,19 @@ static const Elm_Win_Trap *trap = NULL;
   while (0)
 
 #define ELM_WIN_DATA_GET(o, sd) \
-  Efl_Ui_Win_Data * sd = eo_data_scope_get(o, MY_CLASS)
+  Efl_Ui_Win_Data * sd = efl_data_scope_get(o, MY_CLASS)
 
 #define ELM_WIN_DATA_GET_OR_RETURN(o, ptr, ...)      \
   ELM_WIN_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
        CRI("No widget data for object %p (%s)",      \
-            o, eo_class_name_get(o));                \
+            o, efl_class_name_get(o));                \
        return __VA_ARGS__;                           \
     }
 
 #define ELM_WIN_CHECK(obj)                                             \
-  if (!obj || !eo_isa(obj, MY_CLASS)) \
+  if (!obj || !efl_isa(obj, MY_CLASS)) \
     return
 
 #define DECREMENT_MODALITY()                                    \
@@ -1604,7 +1604,7 @@ EOLIAN static Eina_Bool
 _efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_TRUE;
 
    if (sd->img_obj)
@@ -1667,7 +1667,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
    Eo *evt = ev->info;
    Efl_Event_Key_Data *evdata;
 
-   evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+   evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
    if (!evdata || evdata->win_fed)
      return;
 
@@ -1685,7 +1685,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
    Eo *evt = ev->info;
    Efl_Event_Pointer_Data *evdata;
 
-   evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+   evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
    if (!evdata || evdata->win_fed)
      return;
 
@@ -1703,7 +1703,7 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
    if (!efl_event_fake_get(evt))
      return;
 
-   evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+   evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
    if (!evdata || evdata->win_fed)
      return;
    evdata->win_fed = EINA_TRUE;
@@ -1723,7 +1723,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
    if (!efl_event_fake_get(evt))
      return;
 
-   evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+   evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
    if (!evdata || evdata->win_fed)
      return;
    evdata->win_fed = EINA_TRUE;
@@ -1733,7 +1733,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
    evdata->evas_done = EINA_FALSE;
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
 { EFL_EVENT_POINTER_MOVE, _evas_event_pointer_feed_fake_cb },
 { EFL_EVENT_POINTER_DOWN, _evas_event_pointer_feed_fake_cb },
 { EFL_EVENT_POINTER_UP, _evas_event_pointer_feed_fake_cb },
@@ -2062,7 +2062,7 @@ _efl_ui_win_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Win_Data *sd)
    Eina_Bool do_eval = EINA_FALSE;
 
    if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE;
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    if ((sd->modal) && (!evas_object_visible_get(obj)))
      {
@@ -2105,7 +2105,7 @@ _efl_ui_win_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Win_Data *sd)
 
    if (evas_object_visible_get(obj))
      _elm_win_state_eval_queue();
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    if ((sd->modal) && (evas_object_visible_get(obj)))
      {
@@ -2542,7 +2542,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
    ecore_evas_callback_state_change_set(sd->ee, NULL);
    ecore_evas_callback_pre_render_set(sd->ee, NULL);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 
    if (_elm_win_policy_quit_triggered(obj))
      {
@@ -2601,7 +2601,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
         if (!ecore_evas_override_get(sd->ee))  return;
      }
 
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    if (ecore_evas_override_get(sd->ee))
      {
@@ -2630,7 +2630,7 @@ _efl_ui_win_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coo
 {
    if (sd->img_obj)
      {
-        efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+        efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
         if (sd->constrain)
           {
              int sw, sh;
@@ -3823,7 +3823,7 @@ _elm_win_on_icon_del(void *data,
 EOLIAN static void
 _efl_ui_win_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -3848,14 +3848,14 @@ elm_win_add(Evas_Object *parent,
             const char *name,
             Elm_Win_Type type)
 {
-   Evas_Object *obj = eo_add(MY_CLASS, parent, efl_ui_win_name_set(eo_self, name), efl_ui_win_type_set(eo_self, type));
+   Evas_Object *obj = efl_add(MY_CLASS, parent, efl_ui_win_name_set(efl_self, name), efl_ui_win_type_set(efl_self, type));
    return obj;
 }
 
 EAPI Evas_Object *
 elm_win_fake_add(Ecore_Evas *ee)
 {
-   return eo_add(MY_CLASS, NULL, elm_win_fake_canvas_set(eo_self, ee), efl_ui_win_name_set(eo_self, NULL), efl_ui_win_type_set(eo_self, ELM_WIN_FAKE));
+   return efl_add(MY_CLASS, NULL, elm_win_fake_canvas_set(efl_self, ee), efl_ui_win_name_set(efl_self, NULL), efl_ui_win_type_set(efl_self, ELM_WIN_FAKE));
 }
 
 static void
@@ -4324,7 +4324,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
 
    efl_parent_set(obj, ecore_evas_get(tmp_sd.ee));
 
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
@@ -4598,7 +4598,7 @@ _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 = efl_finalize(eo_super(obj, MY_CLASS));
+        obj = efl_finalize(efl_super(obj, MY_CLASS));
      }
    return obj;
 }
@@ -4781,7 +4781,7 @@ _efl_ui_win_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd
 {
    Evas_Object_Box_Data *bd;
 
-   bd = eo_data_scope_get(sd->box, EVAS_BOX_CLASS);
+   bd = efl_data_scope_get(sd->box, EVAS_BOX_CLASS);
    if (!bd) return 0;
 
    return eina_list_count(bd->children);
@@ -5641,7 +5641,7 @@ EOLIAN static Elm_Theme_Apply
 _efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    sd->focus_highlight.theme_changed = EINA_TRUE;
@@ -5862,7 +5862,7 @@ EOLIAN static Elm_Atspi_State_Set
 _efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS));
 
    if (elm_win_focus_get(obj))
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE);
@@ -5874,7 +5874,7 @@ EOLIAN static char*
 _efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    char *ret;
-   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, EFL_UI_WIN_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
    if (ret) return ret;
    const char *name = elm_win_title_get(obj);
    return name ? strdup(name) : NULL;
diff --git a/src/lib/elementary/efl_ui_win_standard.c b/src/lib/elementary/efl_ui_win_standard.c
index ed9b01da03..5189233427 100644
--- a/src/lib/elementary/efl_ui_win_standard.c
+++ b/src/lib/elementary/efl_ui_win_standard.c
@@ -15,11 +15,11 @@
 EOLIAN static Eo *
 _efl_ui_win_standard_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
 {
-   obj = efl_finalize(eo_super(obj, MY_CLASS));
+   obj = efl_finalize(efl_super(obj, MY_CLASS));
    if (!obj)
      return NULL;
 
-   Evas_Object *bg = eo_add(ELM_BG_CLASS, obj);
+   Evas_Object *bg = efl_add(ELM_BG_CLASS, obj);
    if (!bg)
      {
         ERR("Cannot create background.");
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 0554c072f7..c545193268 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -44,7 +44,7 @@ static const Elm_Action key_actions[] = {
 EOLIAN static Eina_Bool
 _elm_combobox_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd)
 {
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
    elm_obj_widget_translate(sd->genlist);
    elm_obj_widget_translate(sd->entry);
 
@@ -71,7 +71,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
    /* combobox's style has no extra bit for orientation but could have... */
    eina_stringshare_replace(&(wd->style), buf);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    eina_stringshare_replace(&(wd->style), style);
@@ -266,7 +266,7 @@ _on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
 EOLIAN static void
 _elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
@@ -281,20 +281,20 @@ EOLIAN static void
 _elm_combobox_efl_canvas_group_group_del(Eo *obj, Elm_Combobox_Data *sd)
 {
    sd->hover_parent = NULL;
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_combobox_efl_canvas_group_group_show(Eo *obj, Elm_Combobox_Data *sd)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
    if (sd->expanded) evas_object_show(sd->hover);
 }
 
 EOLIAN static void
 _elm_combobox_efl_canvas_group_group_hide(Eo *obj, Elm_Combobox_Data *sd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
    if (sd->hover) evas_object_hide(sd->hover);
 }
 
@@ -309,7 +309,7 @@ EAPI Evas_Object *
 elm_combobox_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -320,7 +320,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
    Evas_Object *entry;
    char buf[128];
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    sd->first_filter = EINA_TRUE;
 
@@ -332,7 +332,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
    sd->hover_parent = elm_object_parent_widget_get(obj);
 
    //hover
-   sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent);
+   sd->hover = efl_add(ELM_HOVER_CLASS, sd->hover_parent);
    elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
    elm_hover_target_set(sd->hover, obj);
    elm_widget_sub_object_add(obj, sd->hover);
@@ -358,7 +358,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
    elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1);
 
    // This is the genlist object that will take over the genlist call
-   sd->genlist = gl = eo_add(ELM_GENLIST_CLASS, obj);
+   sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj);
    elm_genlist_filter_set(gl, NULL);
    elm_widget_mirrored_automatic_set(gl, EINA_FALSE);
    elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj));
@@ -373,7 +373,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
    elm_object_style_set(gl, buf);
 
    // This is the entry object that will take over the entry call
-   sd->entry = entry = eo_add(ELM_ENTRY_CLASS, obj);
+   sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj);
    elm_widget_mirrored_automatic_set(entry, EINA_FALSE);
    elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj));
    elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
@@ -529,7 +529,7 @@ EOLIAN static void
 _elm_combobox_efl_canvas_group_group_resize(Eo *obj, Elm_Combobox_Data *pd,
                                        Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
    if (pd->count > 0) _table_resize(obj);
 }
 #include "elm_combobox.eo.c"
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 495527062a..6fcebde16d 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -60,7 +60,7 @@ _elm_ctxpopup_elm_widget_translate(Eo *obj, Elm_Ctxpopup_Data *sd)
    EINA_LIST_FOREACH(sd->items, l, it)
      elm_wdg_item_translate(it);
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -228,7 +228,7 @@ _base_geometry_calc(Evas_Object *obj,
    evas_object_geometry_get
      (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w,
      &hover_area.h);
-   if (sd->parent && eo_isa(sd->parent, EFL_UI_WIN_CLASS))
+   if (sd->parent && efl_isa(sd->parent, EFL_UI_WIN_CLASS))
      hover_area.x = hover_area.y = 0;
 
    evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
@@ -750,7 +750,7 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    elm_widget_theme_object_set
@@ -780,7 +780,7 @@ _elm_ctxpopup_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part, Evas
 {
    if ((part) && (strcmp(part, "default")))
      {
-        return efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+        return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
      }
 
    if (!content) return EINA_FALSE;
@@ -810,7 +810,7 @@ static Evas_Object*
 _elm_ctxpopup_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
 {
    if ((part) && (strcmp(part, "default")))
-     return efl_content_get(efl_part(eo_super(obj, MY_CLASS), part));
+     return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
 
    return sd->content;
 }
@@ -821,7 +821,7 @@ _elm_ctxpopup_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
    Evas_Object *content = NULL;
 
    if ((part) && (strcmp(part, "default")))
-     return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part));
+     return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
 
    content = sd->content;
    if (!content) return content;
@@ -1049,7 +1049,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
    list = elm_object_item_widget_get(ctxpopup_it->list_item);
 
    if (ctxpopup_it->list_item)
-      eo_unref(ctxpopup_it->list_item);
+      efl_unref(ctxpopup_it->list_item);
    sd->items = eina_list_remove(sd->items, eo_ctxpopup_it);
    if (list && eina_list_count(elm_list_items_get(list)) < 2)
      {
@@ -1060,7 +1060,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
         if (sd->list_visible) elm_layout_sizing_eval(WIDGET(ctxpopup_it));
      }
 
-   efl_destructor(eo_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
+   efl_destructor(efl_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -1068,7 +1068,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
    if (sd->list)
      elm_object_disabled_set(sd->list, elm_widget_disabled_get(obj));
@@ -1083,7 +1083,7 @@ _elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1124,7 +1124,7 @@ _elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
      (priv->box, EVAS_CALLBACK_RESIZE, _on_content_resized, obj);
 
    /* box will be our content placeholder, thus the parent's version call */
-   efl_content_set(efl_part(eo_super(obj, MY_CLASS), "elm.swallow.content"), priv->box);
+   efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.content"), priv->box);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _on_show, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _on_hide, NULL);
@@ -1149,7 +1149,7 @@ _elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd)
    EINA_LIST_FREE(sd->items, it)
      efl_del(it);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -1163,7 +1163,7 @@ EAPI Evas_Object *
 elm_ctxpopup_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
 
    /* access: parent could be any object such as elm_list which does
       not know elc_ctxpopup as its child object in the focus_next(); */
@@ -1176,7 +1176,7 @@ elm_ctxpopup_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1204,7 +1204,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare
 
    //Update Background
    evas_object_geometry_get(parent, &x, &y, &w, &h);
-   if (parent && eo_isa(parent, EFL_UI_WIN_CLASS))
+   if (parent && efl_isa(parent, EFL_UI_WIN_CLASS))
      x = y = 0;
    evas_object_move(sd->bg, x, y);
    evas_object_resize(sd->bg, w, h);
@@ -1250,8 +1250,8 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
 EOLIAN static Eo *
 _elm_ctxpopup_item_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
 {
-   obj = efl_constructor(eo_super(obj, ELM_CTXPOPUP_ITEM_CLASS));
-   it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+   obj = efl_constructor(efl_super(obj, ELM_CTXPOPUP_ITEM_CLASS));
+   it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
 }
@@ -1261,14 +1261,14 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data));
+   eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data));
    if (!eo_item) return NULL;
 
    ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
 
    item->list_item =
      elm_list_item_append(sd->list, label, icon, NULL, _item_wrap_cb, item);
-   eo_ref(item->list_item);
+   efl_ref(item->list_item);
    sd->items = eina_list_append(sd->items, eo_item);
 
    if (sd->visible) elm_layout_sizing_eval(obj);
@@ -1354,14 +1354,14 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data));
+   eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data));
    if (!eo_item) return NULL;
 
    ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
 
    item->list_item =
      elm_list_item_prepend(sd->list, label, icon, NULL, _item_wrap_cb, item);
-   eo_ref(item->list_item);
+   efl_ref(item->list_item);
    sd->items = eina_list_prepend(sd->items, eo_item);
 
    if (sd->visible) elm_layout_sizing_eval(obj);
@@ -1407,7 +1407,7 @@ _elm_ctxpopup_item_init(Eo *eo_item,
 {
    Eo *obj;
    obj = efl_parent_get(eo_item);
-   Elm_Ctxpopup_Data *sd = eo_data_scope_get(obj, ELM_CTXPOPUP_CLASS);
+   Elm_Ctxpopup_Data *sd = efl_data_scope_get(obj, ELM_CTXPOPUP_CLASS);
    if (!sd->list)
      {
         sd->list = elm_list_add(obj);
@@ -1468,7 +1468,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL);
 
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 512ac619d7..eaa2aeb644 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -66,7 +66,7 @@ static void _resource_created(void *, const Eo_Event *);
 static void _resource_deleted(void *, const Eo_Event *);
 static void _listing_request_cleanup(Listing_Request *);
 
-EO_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks,
                           { EFL_MODEL_EVENT_CHILD_ADDED, _resource_created },
                           { EFL_MODEL_EVENT_CHILD_REMOVED, _resource_deleted });
 
@@ -74,7 +74,7 @@ static void
 _model_free_eo_cb(void *data)
 {
    Eo *eo = data;
-   eo_unref(eo);
+   efl_unref(eo);
 }
 
 static void
@@ -97,12 +97,12 @@ _elm_fileselector_replace_model(Elm_Fileselector *fs, Elm_Fileselector_Data *sd,
    if (sd->model)
      {
         _monitoring_stop(fs, sd, sd->model);
-        eo_unref(sd->model);
+        efl_unref(sd->model);
      }
 
    if (model && path)
      {
-        sd->model = eo_ref(model);
+        sd->model = efl_ref(model);
         eina_stringshare_replace(&sd->path, path);
         _monitoring_start(fs, sd, sd->model);
         /* TODO: sub directory should be monitored for expand mode */
@@ -120,11 +120,11 @@ _elm_fileselector_smart_del_do(Elm_Fileselector *fs, Elm_Fileselector_Data *sd)
 {
    _elm_fileselector_replace_model(fs, sd, NULL, NULL);
    if (sd->prev_model)
-     eo_unref(sd->prev_model);
+     efl_unref(sd->prev_model);
    free(ecore_idler_del(sd->populate_idler));
    ecore_idler_del(sd->path_entry_idler);
 
-   efl_canvas_group_del(eo_super(sd->obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(sd->obj, MY_CLASS));
 }
 
 static void
@@ -171,7 +171,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
    char buf[1024];
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    style = elm_widget_style_get(obj);
@@ -231,7 +231,7 @@ _key_action_backspace(Evas_Object *obj, const char *params EINA_UNUSED)
    if (sd->prev_model)
      {
         _populate(obj, sd->prev_model, NULL, NULL);
-        eo_unref(sd->prev_model);
+        efl_unref(sd->prev_model);
         sd->prev_model = NULL;
      }
    else
@@ -362,11 +362,11 @@ _itc_del(void *data,
          Evas_Object *obj EINA_UNUSED)
 {
    Elm_Fileselector_Item_Data *it_data = data;
-   eo_unref(it_data->model);
+   efl_unref(it_data->model);
    eina_stringshare_del(it_data->path);
    eina_stringshare_del(it_data->filename);
    eina_stringshare_del(it_data->mime_type);
-   eo_unref(it_data->parent_model);
+   efl_unref(it_data->parent_model);
    eina_stringshare_del(it_data->parent_path);
    free(it_data);
 }
@@ -694,7 +694,7 @@ _process_child(Elm_Fileselector_Item_Data *it_data, Eina_Iterator *value_itt)
    it_data->size = size;
    it_data->mtime = mtime;
    it_data->mime_type = eina_stringshare_add(mime_type);
-   it_data->parent_model = eo_ref(lreq->model);
+   it_data->parent_model = efl_ref(lreq->model);
    it_data->parent_path = eina_stringshare_add(lreq->path);
    it_data->is_dir = dir;
 
@@ -746,7 +746,7 @@ _process_child_cb(void *data, void *values)
    if (!lreq->valid ||
        !_process_child(it_data, value_itt))
      {
-        eo_unref(it_data->model);
+        efl_unref(it_data->model);
         free(it_data);
      }
 
@@ -769,7 +769,7 @@ _process_child_error_cb(void *data, Eina_Error err EINA_UNUSED)
    Elm_Fileselector_Item_Data *it_data = data;
    Listing_Request *lreq = it_data->user_data;
 
-   eo_unref(it_data->model);
+   efl_unref(it_data->model);
    free(it_data);
 
    WRN("could not get data from child Efl.Model");
@@ -791,11 +791,11 @@ static void
 _listing_request_cleanup(Listing_Request *lreq)
 {
    if (lreq->parent_it)
-     eo_unref(lreq->parent_it);
-   eo_unref(lreq->obj);
-   eo_unref(lreq->model);
+     efl_unref(lreq->parent_it);
+   efl_unref(lreq->obj);
+   efl_unref(lreq->model);
    if (lreq->selected)
-     eo_unref(lreq->selected);
+     efl_unref(lreq->selected);
    eina_stringshare_del(lreq->path);
    eina_stringshare_del(lreq->selected_path);
    free(lreq);
@@ -850,7 +850,7 @@ _process_children_cb(void *data, void *values)
                        break;
                     }
 
-                  it_data->model = eo_ref(child);
+                  it_data->model = efl_ref(child);
                   it_data->user_data = lreq;
 
                   promises[0] = efl_model_property_get(child, "path");
@@ -926,10 +926,10 @@ _populate(Evas_Object *obj,
    if (!lreq) return;
 
    lreq->sd = sd;
-   lreq->parent_it = (parent_it ? eo_ref(parent_it) : NULL);
-   lreq->obj = eo_ref(obj);
-   lreq->model = eo_ref(model);
-   lreq->selected = (selected ? eo_ref(selected) : NULL);
+   lreq->parent_it = (parent_it ? efl_ref(parent_it) : NULL);
+   lreq->obj = efl_ref(obj);
+   lreq->model = efl_ref(model);
+   lreq->selected = (selected ? efl_ref(selected) : NULL);
    lreq->path = NULL;
    lreq->selected_path = NULL;
    lreq->item_total = 0;
@@ -997,9 +997,9 @@ _populate_do(void *data)
    ELM_FILESELECTOR_DATA_GET(sdata->fs, sd);
    _populate(sdata->fs, sdata->model, NULL, sdata->selected);
    if (sdata->model)
-     eo_unref(sdata->model);
+     efl_unref(sdata->model);
    if (sdata->selected)
-     eo_unref(sdata->selected);
+     efl_unref(sdata->selected);
 
    sd->populate_idler = NULL;
 
@@ -1021,17 +1021,17 @@ _schedule_populate(Evas_Object *fs,
    sdata->model = model;
    sdata->selected = selected;
 
-   if (model) eo_ref(model);
-   if (selected) eo_ref(selected);
+   if (model) efl_ref(model);
+   if (selected) efl_ref(selected);
 
    if (sd->populate_idler)
      {
         struct sel_data *old_sdata;
         old_sdata = ecore_idler_del(sd->populate_idler);
         if (old_sdata->model)
-          eo_unref(old_sdata->model);
+          efl_unref(old_sdata->model);
         if (old_sdata->selected)
-          eo_unref(old_sdata->selected);
+          efl_unref(old_sdata->selected);
         free(old_sdata);
      }
    sd->populate_idler = ecore_idler_add(_populate_do, sdata);
@@ -1247,12 +1247,12 @@ _home(void *data, const Eo_Event *event EINA_UNUSED)
    ELM_FILESELECTOR_DATA_GET(fs, sd);
 
    // FIXME: maybe use vpath
-   if (!sd->model || eo_isa(sd->model, EIO_MODEL_CLASS))
+   if (!sd->model || efl_isa(sd->model, EIO_MODEL_CLASS))
      {
-        Eio_Model *model = eo_add(EIO_MODEL_CLASS, NULL,
-                                  eio_model_path_set(eo_self, eina_environment_home_get()));
+        Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL,
+                                  eio_model_path_set(efl_self, eina_environment_home_get()));
         _populate(fs, model, NULL, NULL);
-        eo_unref(model);
+        efl_unref(model);
      }
 }
 
@@ -1297,7 +1297,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
         else
           selection = eina_stringshare_printf("%s/%s", sd->path, name);
 
-        selected_model = eo_add(eo_class_get(sd->model), NULL);
+        selected_model = efl_add(efl_class_get(sd->model), NULL);
         _model_str_property_set(selected_model, "path", selection, NULL);
 
         // EVENTS: should not call legacy
@@ -1305,7 +1305,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
         //  (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model);
         evas_object_smart_callback_call(fs, "done", (void *) selection);
 
-        eo_unref(selected_model);
+        efl_unref(selected_model);
         eina_stringshare_del(selection);
      }
    else
@@ -1342,7 +1342,7 @@ _text_activated_free_fs_data(Elm_Fileselector *fs)
    eina_stringshare_del(str);
    efl_key_data_set(fs, _text_activated_path_key, NULL);
    efl_key_ref_set(fs, _text_activated_model_key, NULL);
-   eo_unref(fs);
+   efl_unref(fs);
 }
 
 static void
@@ -1360,8 +1360,8 @@ _text_activated_is_dir_then(void *data, void *value)
      {
         // keep previous path for backspace key action
         if (sd->prev_model)
-          eo_unref(sd->prev_model);
-        sd->prev_model = eo_ref(sd->model);
+          efl_unref(sd->prev_model);
+        sd->prev_model = efl_ref(sd->model);
 
         _populate(fs, model, NULL, NULL);
 
@@ -1452,7 +1452,7 @@ _on_text_activated(void *data, const Eo_Event *event)
      return;
 
    path = elm_widget_part_text_get(event->object, NULL);
-   model = eo_add(eo_class_get(sd->model), NULL);
+   model = efl_add(efl_class_get(sd->model), NULL);
    if (!model)
      return;
 
@@ -1460,13 +1460,13 @@ _on_text_activated(void *data, const Eo_Event *event)
 
    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);
+   efl_ref(fs);
    eina_promise_then(promise,
                      _on_text_activated_set_path_then,
                      _on_text_activated_set_path_then_error,
                      fs);
 
-   eo_unref(model);
+   efl_unref(model);
    elm_object_focus_set(event->object, EINA_FALSE);
 }
 
@@ -1511,13 +1511,13 @@ _anchor_clicked(void *data, const Eo_Event *event)
    if (!sd->model)
      return;
 
-   model = eo_add(eo_class_get(sd->model), NULL);
+   model = efl_add(efl_class_get(sd->model), NULL);
    if (!model)
      return;
    _model_str_property_set(model, "path", info->name, NULL);
 
    _populate(fs, model, NULL, NULL);
-   eo_unref(model);
+   efl_unref(model);
    /* After anchor was clicked, entry will be focused, and will be editable.
     * It's wrong. So remove focus. */
    elm_object_focus_set(event->object, EINA_FALSE);
@@ -1626,8 +1626,8 @@ _resource_then_error(void *data, Eina_Error err EINA_UNUSED)
 {
    Elm_Fileselector_Item_Data *it_data = data;
    WRN("could not get information from Efl.Model");
-   eo_unref(it_data->user_data);
-   eo_unref(it_data->model);
+   efl_unref(it_data->user_data);
+   efl_unref(it_data->model);
    free(it_data);
 }
 
@@ -1693,13 +1693,13 @@ _resource_created_then(void *data, void *values)
                                     it_data,
                                     _file_grid_cmp, NULL, NULL);
 
-   eo_unref(obj);
+   efl_unref(obj);
    return;
 
 cancel:
-   eo_unref(obj);
-   eo_unref(it_data->model);
-   eo_unref(it_data->parent_model);
+   efl_unref(obj);
+   efl_unref(it_data->model);
+   efl_unref(it_data->parent_model);
    eina_stringshare_del(it_data->parent_path);
    free(it_data);
 }
@@ -1723,9 +1723,9 @@ _resource_created(void *data, const Eo_Event *event)
    if (!it_data)
      return;
 
-   it_data->model = eo_ref(child);
-   it_data->user_data = eo_ref(fs);
-   it_data->parent_model = eo_ref(sd->model);
+   it_data->model = efl_ref(child);
+   it_data->user_data = efl_ref(fs);
+   it_data->parent_model = efl_ref(sd->model);
    it_data->parent_path = eina_stringshare_add(sd->path);
 
    promises[0] = efl_model_property_get(child, "path");
@@ -1844,7 +1844,7 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
    const char *data;
    char buf[1024];
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -2011,14 +2011,14 @@ EAPI Evas_Object *
 elm_fileselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -2171,7 +2171,7 @@ elm_fileselector_path_set(Evas_Object *obj,
                           const char *_path)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   const Efl_Class *cls = eo_class_get(obj);
+   const Efl_Class *cls = efl_class_get(obj);
    if (cls == ELM_FILESELECTOR_CLASS)
      _elm_fileselector_path_set_internal(obj, _path);
    else if (cls == ELM_FILESELECTOR_ENTRY_CLASS)
@@ -2185,14 +2185,14 @@ elm_fileselector_path_set(Evas_Object *obj,
 void
 _elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path)
 {
-   Eio_Model *model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, _path));
+   Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, _path));
    if (!model)
      {
         ERR("Efl.Model allocation error");
         return;
      }
    elm_interface_fileselector_model_set(obj, model);
-   eo_unref(model);
+   efl_unref(model);
 }
 
 EOLIAN static void
@@ -2205,7 +2205,7 @@ EAPI const char *
 elm_fileselector_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
-   const Efl_Class *cls = eo_class_get(obj);
+   const Efl_Class *cls = efl_class_get(obj);
    if (cls == ELM_FILESELECTOR_CLASS)
      return _elm_fileselector_path_get_internal(obj);
    else if (cls == ELM_FILESELECTOR_ENTRY_CLASS)
@@ -2405,7 +2405,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
 
    if (ecore_file_is_dir(path))
      {
-         model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
+         model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
          if (!model)
            {
               ERR("Efl.Model allocation error");
@@ -2413,7 +2413,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
            }
 
         _schedule_populate(obj, sd, model, NULL);
-        eo_unref(model);
+        efl_unref(model);
         ret = EINA_TRUE;
      }
    else
@@ -2423,7 +2423,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
              goto clean_up;
           }
 
-        model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
+        model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
         if (!model)
           {
              ERR("Efl.Model allocation error");
@@ -2431,15 +2431,15 @@ elm_fileselector_selected_set(Evas_Object *obj,
           }
 
         dir = ecore_file_dir_get(path);
-        parent = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dir));
+        parent = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dir));
         if (parent)
           {
              _schedule_populate(obj, sd, parent, model);
-             eo_unref(parent);
+             efl_unref(parent);
              ret = EINA_TRUE;
           }
         free(dir);
-        eo_unref(model);
+        efl_unref(model);
      }
 
 clean_up:
@@ -2453,7 +2453,7 @@ _selected_model_set_free_fs_data(Elm_Fileselector *fs)
 {
    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);
+   efl_unref(fs);
 }
 
 static void
@@ -2480,7 +2480,7 @@ _selected_model_set_is_dir_then(void *data, void *value)
         _schedule_populate(fs, sd, model, NULL);
         if (promise_owner)
           {
-             eo_ref(model);
+             efl_ref(model);
              eina_promise_owner_value_set(promise_owner, model, _model_free_eo_cb);
           }
      }
@@ -2493,7 +2493,7 @@ _selected_model_set_is_dir_then(void *data, void *value)
 
              if (promise_owner)
                {
-                  eo_ref(model);
+                  efl_ref(model);
                   eina_promise_owner_value_set(promise_owner, model, _model_free_eo_cb);
                }
           }
@@ -2522,7 +2522,7 @@ _elm_fileselector_elm_interface_fileselector_selected_model_set(Eo *obj, Elm_Fil
    if (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));
+   eina_promise_then(promise, _selected_model_set_is_dir_then, _selected_model_set_then_error, efl_ref(obj));
 }
 
 EAPI const Eina_List *
@@ -2962,7 +2962,7 @@ _elm_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data
    else
      {
         Eina_Bool int_ret = EINA_FALSE;
-        int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
+        int_ret = elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
         return int_ret;
      }
 
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 19b251ad2a..9507ad3cdd 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -37,7 +37,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
 static void
 _model_free_eo_cb(void *eo)
 {
-   eo_unref(eo);
+   efl_unref(eo);
 }
 
 EOLIAN static Elm_Theme_Apply
@@ -57,7 +57,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
    /* file selector button's style has an extra bit */
    eina_stringshare_replace(&(wd->style), buf);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    eina_stringshare_replace(&(wd->style), style);
@@ -95,8 +95,8 @@ _selection_done(void *data, const Eo_Event *event)
      {
         Eina_Promise *promise = NULL;
         if (sd->fsd.model)
-          eo_unref(sd->fsd.model);
-        sd->fsd.model = eo_ref(model);
+          efl_unref(sd->fsd.model);
+        sd->fsd.model = efl_ref(model);
         promise = efl_model_property_get(model, "path");
         eina_promise_then(promise, _replace_path_then, _replace_path_then_error, sd);
      }
@@ -123,7 +123,7 @@ _selection_done_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
    // EVENTS: code above should not be needed
    Eo_Event e = { NULL, NULL, NULL };
    if (path)
-      e.info = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
+      e.info = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
    _selection_done(data, &e);
 }
 
@@ -150,7 +150,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
 static Evas_Object *
 _parent_win_get(Evas_Object *obj)
 {
-   while (!eo_isa(obj, EFL_UI_WIN_CLASS))
+   while (!efl_isa(obj, EFL_UI_WIN_CLASS))
      obj = elm_object_parent_widget_get(obj);
 
    return obj;
@@ -218,7 +218,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
 {
    const char *path;
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
@@ -226,7 +226,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
    if (path) priv->fsd.path = eina_stringshare_add(path);
    else priv->fsd.path = eina_stringshare_add("/");
 
-   priv->fsd.model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, priv->fsd.path));
+   priv->fsd.model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, priv->fsd.path));
 
    priv->fsd.expandable = _elm_config->fileselector_expand_enable;
    priv->inwin_mode = _elm_config->inwin_dialogs_enable;
@@ -245,14 +245,14 @@ EOLIAN static void
 _elm_fileselector_button_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
 {
    if (sd->fsd.model)
-     eo_unref(sd->fsd.model);
+     efl_unref(sd->fsd.model);
    eina_stringshare_del(sd->window_title);
    eina_stringshare_del(sd->fsd.path);
    if (sd->fsd.selection)
-     eo_unref(sd->fsd.selection);
+     efl_unref(sd->fsd.selection);
    evas_object_del(sd->fsw);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -265,14 +265,14 @@ EAPI Evas_Object *
 elm_fileselector_button_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -325,7 +325,7 @@ _elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path)
 {
    ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd);
 
-   Efl_Model *model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
+   Efl_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
    if (!model)
      {
         ERR("Efl.Model allocation error");
@@ -333,8 +333,8 @@ _elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path)
      }
 
    if (sd->fsd.model)
-     eo_unref(sd->fsd.model);
-   sd->fsd.model = eo_ref(model);
+     efl_unref(sd->fsd.model);
+   sd->fsd.model = efl_ref(model);
 
    eina_stringshare_replace(&sd->fsd.path, path);
 
@@ -352,12 +352,12 @@ EOLIAN static void
 _elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model)
 {
    if (sd->fsd.model)
-     eo_unref(sd->fsd.model);
+     efl_unref(sd->fsd.model);
 
    if (model)
      {
         Eina_Promise *promise = NULL;
-        sd->fsd.model = eo_ref(model);
+        sd->fsd.model = efl_ref(model);
         promise = efl_model_property_get(model, "path");
         eina_promise_then(promise, _replace_path_then, _replace_path_then_error, sd);
      }
@@ -545,7 +545,7 @@ static void
 _selected_model_then(void *data, void *v)
 {
    Eina_Promise_Owner *owner = data;
-   eina_promise_owner_value_set(owner, eo_ref(v), _model_free_eo_cb);
+   eina_promise_owner_value_set(owner, efl_ref(v), _model_free_eo_cb);
 }
 
 static void
@@ -566,8 +566,8 @@ _elm_fileselector_button_elm_interface_fileselector_selected_model_set(Eo *obj E
      }
 
    if (sd->fsd.selection)
-     eo_unref(sd->fsd.selection);
-   sd->fsd.selection = model ? eo_ref(model) : NULL;
+     efl_unref(sd->fsd.selection);
+   sd->fsd.selection = model ? efl_ref(model) : NULL;
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 02c95ffe59..8af305e653 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -106,7 +106,7 @@ _FILE_CHOSEN_fwd_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
 
    Eo_Event e = { NULL, NULL, NULL };
    if (path)
-     e.info = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
+     e.info = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
    _FILE_CHOSEN_fwd(data, &e);
 }
 
@@ -124,7 +124,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
    bmodel = elm_interface_fileselector_model_get(sd->button);
    if (bmodel)
      {
-         model = eo_add(eo_class_get(bmodel), NULL);
+         model = efl_add(efl_class_get(bmodel), NULL);
          eina_value_setup(&path, EINA_VALUE_TYPE_STRING);
          eina_value_set(&path, file);
          efl_model_property_set(model, "path", &path, NULL);
@@ -139,7 +139,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
 static void
 _model_free_eo_cb(void *eo)
 {
-   eo_unref(eo);
+   efl_unref(eo);
 }
 
 EOLIAN static void
@@ -211,7 +211,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    style = elm_widget_style_get(obj);
@@ -239,7 +239,7 @@ _elm_fileselector_entry_elm_widget_disable(Eo *obj, Elm_Fileselector_Entry_Data
    Eina_Bool val;
 
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    val = elm_widget_disabled_get(obj);
@@ -255,7 +255,7 @@ _elm_fileselector_entry_elm_layout_text_set(Eo *obj, Elm_Fileselector_Entry_Data
 {
    if (part && strcmp(part, "default"))
      {
-        return elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
+        return elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
      }
 
    elm_object_text_set(sd->button, label);
@@ -268,7 +268,7 @@ _elm_fileselector_entry_elm_layout_text_get(Eo *obj, Elm_Fileselector_Entry_Data
    if (part && strcmp(part, "default"))
      {
         const char *text = NULL;
-        text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part);
+        text = elm_obj_layout_text_get(efl_super(obj, MY_CLASS), part);
         return text;
      }
 
@@ -280,7 +280,7 @@ _elm_fileselector_entry_content_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, co
 {
    if (part && strcmp(part, "button icon"))
      {
-        return efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+        return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
      }
 
    elm_layout_content_set(sd->button, NULL, content);
@@ -293,7 +293,7 @@ _elm_fileselector_entry_content_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, co
 {
    if (part && strcmp(part, "button icon"))
      {
-        return efl_content_get(efl_part(eo_super(obj, MY_CLASS), part));
+        return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
      }
 
    return elm_layout_content_get(sd->button, NULL);
@@ -304,7 +304,7 @@ _elm_fileselector_entry_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd,
 {
    if (part && strcmp(part, "button icon"))
      {
-        return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part));
+        return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
      }
 
    return elm_layout_content_unset(sd->button, NULL);
@@ -313,7 +313,7 @@ _elm_fileselector_entry_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd,
 EOLIAN static void
 _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->button = elm_fileselector_button_add(obj);
@@ -375,20 +375,20 @@ _elm_fileselector_entry_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Ent
 {
    free(sd->path);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_fileselector_entry_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   return eo_add(MY_CLASS, parent);
+   return efl_add(MY_CLASS, parent);
 }
 
 EOLIAN static Eo *
 _elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -411,7 +411,7 @@ _elm_fileselector_entry_elm_interface_fileselector_selected_model_set(Eo *obj EI
                                                                       Eina_Promise_Owner *promise_owner)
 {
    elm_interface_fileselector_model_set(sd->button, model);
-   eina_promise_owner_value_set(promise_owner, eo_ref(model), _model_free_eo_cb);
+   eina_promise_owner_value_set(promise_owner, efl_ref(model), _model_free_eo_cb);
 }
 
 EINA_DEPRECATED EAPI const char *
@@ -541,7 +541,7 @@ _elm_fileselector_entry_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED
         return NULL;
      }
 
-   ret = eo_add(eo_class_get(bmodel), NULL);
+   ret = efl_add(efl_class_get(bmodel), NULL);
    free(sd->path);
    sd->path = elm_entry_markup_to_utf8(elm_object_text_get(sd->entry));
    eina_value_setup(&path, EINA_VALUE_TYPE_STRING);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 0ca7139501..fc9ed810f5 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -54,7 +54,7 @@ _elm_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
    EINA_LIST_FOREACH(sd->items, l, it)
      elm_wdg_item_translate(it);
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -81,7 +81,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
    /* hoversel's style has an extra bit: orientation */
    eina_stringshare_replace(&(wd->style), buf);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    eina_stringshare_replace(&(wd->style), style);
@@ -264,7 +264,7 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
      }
 
    evas_object_geometry_get(sd->hover_parent, &x, &y, &w, &h);
-   if (eo_isa(sd->hover_parent, EFL_UI_WIN_CLASS))
+   if (efl_isa(sd->hover_parent, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;
@@ -525,7 +525,7 @@ _elm_hoversel_item_efl_object_destructor(Eo *eo_item, Elm_Hoversel_Item_Data *it
    eina_stringshare_del(item->icon_file);
    eina_stringshare_del(item->icon_group);
 
-   efl_destructor(eo_super(eo_item, ELM_HOVERSEL_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_HOVERSEL_ITEM_CLASS));
 }
 
 static void
@@ -550,7 +550,7 @@ _on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED)
 EOLIAN static void
 _elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
@@ -575,20 +575,20 @@ _elm_hoversel_efl_canvas_group_group_del(Eo *obj, Elm_Hoversel_Data *sd)
      }
    elm_hoversel_hover_parent_set(obj, NULL);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_hoversel_efl_canvas_group_group_show(Eo *obj, Elm_Hoversel_Data *sd)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
    evas_object_show(sd->hover);
 }
 
 EOLIAN static void
 _elm_hoversel_efl_canvas_group_group_hide(Eo *obj, Elm_Hoversel_Data *sd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
    evas_object_hide(sd->hover);
 }
 
@@ -608,14 +608,14 @@ EAPI Evas_Object *
 elm_hoversel_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -627,10 +627,10 @@ EOLIAN static void
 _elm_hoversel_efl_object_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
    elm_obj_hoversel_clear(obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(_on_parent,
+EFL_CALLBACKS_ARRAY_DEFINE(_on_parent,
                           { EFL_EVENT_DEL, _on_parent_del },
                           { EFL_GFX_EVENT_RESIZE, _on_parent_resize });
 
@@ -739,8 +739,8 @@ _elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
 EOLIAN static Eo *
 _elm_hoversel_item_efl_object_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
 {
-   obj = efl_constructor(eo_super(obj, ELM_HOVERSEL_ITEM_CLASS));
-   it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+   obj = efl_constructor(efl_super(obj, ELM_HOVERSEL_ITEM_CLASS));
+   it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
 }
@@ -751,7 +751,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
    Evas_Object *bt, *ic;
    char buf[4096];
 
-   Eo *eo_item = eo_add(ELM_HOVERSEL_ITEM_CLASS, obj);
+   Eo *eo_item = efl_add(ELM_HOVERSEL_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_HOVERSEL_ITEM_DATA_GET(eo_item, item);
@@ -923,7 +923,7 @@ _elm_hoversel_elm_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src,
    Eina_Bool int_ret = EINA_FALSE;
    Evas_Event_Key_Down *ev = event_info;
 
-   int_ret = elm_obj_widget_event(eo_super(obj, MY_CLASS), src, type, event_info);
+   int_ret = elm_obj_widget_event(efl_super(obj, MY_CLASS), src, type, event_info);
    if (int_ret) return EINA_FALSE;
 
    if (!sd || !sd->hover) return EINA_FALSE;
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 6c4ecb1e34..dd1a9e4270 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -50,7 +50,7 @@ static void _entry_focus_in_cb(void *data, const Eo_Event *event);
 static void _entry_focus_out_cb(void *data, const Eo_Event *event);
 static void _entry_clicked_cb(void *data, const Eo_Event *event);
 
-EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
+EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
    { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
    { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
    { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
@@ -66,7 +66,7 @@ _elm_multibuttonentry_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Multibuttone
    EINA_LIST_FOREACH(sd->items, l, it)
      elm_wdg_item_translate(it);
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -90,7 +90,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
    double pad_scale;
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    str = elm_layout_data_get(obj, "horizontal_pad");
@@ -656,7 +656,7 @@ _elm_multibuttonentry_item_efl_object_destructor(Eo *eo_it,
      elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it);
    _item_del(it);
 
-   efl_destructor(eo_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
+   efl_destructor(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
 }
 
 static void
@@ -709,8 +709,8 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
 EOLIAN static Eo *
 _elm_multibuttonentry_item_efl_object_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
 {
-   eo_item = efl_constructor(eo_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
-   item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+   eo_item = efl_constructor(efl_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
+   item->base = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
 }
@@ -719,15 +719,15 @@ static Elm_Object_Item *
 _item_new(Elm_Multibuttonentry_Data *sd,
                  const char *str,
                  Multibuttonentry_Pos pos,
-                 Elm_Object_Item *eo_reference,
+                 Elm_Object_Item *efl_reference,
                  Evas_Smart_Cb func,
                  void *data)
 {
    Eina_List *l;
    Eo *eo_item;
    Elm_Multibuttonentry_Item_Filter *item_filter;
-   Elm_Multibuttonentry_Item_Data *reference = eo_reference?
-      eo_data_scope_get(eo_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS):
+   Elm_Multibuttonentry_Item_Data *reference = efl_reference?
+      efl_data_scope_get(efl_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS):
       NULL;
    Evas_Object *obj;
    int minw, minh, boxw;
@@ -742,7 +742,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
           return NULL;
      }
 
-   eo_item = eo_add(ELM_MULTIBUTTONENTRY_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_MULTIBUTTONENTRY_ITEM_CLASS, obj);
    if (!eo_item)
      return NULL;
    WIDGET_ITEM_DATA_SET(eo_item, data);
@@ -857,8 +857,8 @@ _item_new(Elm_Multibuttonentry_Data *sd,
         break;
 
       case MULTIBUTTONENTRY_POS_BEFORE:
-        if (eo_reference)
-          sd->items = eina_list_prepend_relative(sd->items, eo_item, eo_reference);
+        if (efl_reference)
+          sd->items = eina_list_prepend_relative(sd->items, eo_item, efl_reference);
         else
           sd->items = eina_list_append(sd->items, eo_item);
         if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
@@ -869,7 +869,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
           }
         else
           {
-             if (eo_reference)
+             if (efl_reference)
                elm_box_pack_before(sd->box, VIEW(item), reference->button);
              else
                {
@@ -886,8 +886,8 @@ _item_new(Elm_Multibuttonentry_Data *sd,
         break;
 
       case MULTIBUTTONENTRY_POS_AFTER:
-        if (eo_reference)
-          sd->items = eina_list_append_relative(sd->items, eo_item, eo_reference);
+        if (efl_reference)
+          sd->items = eina_list_append_relative(sd->items, eo_item, efl_reference);
         else
           sd->items = eina_list_append(sd->items, eo_item);
         if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
@@ -897,7 +897,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
           }
         else
           {
-             if (eo_reference)
+             if (efl_reference)
                elm_box_pack_after(sd->box, VIEW(item), reference->button);
              else
                {
@@ -1389,7 +1389,7 @@ _box_layout_cb(Evas_Object *o,
         if (linew > w)
           {
              opt = eina_list_data_get(l_next);
-             if (opt && opt->obj && eo_isa(opt->obj, ELM_ENTRY_CLASS))
+             if (opt && opt->obj && efl_isa(opt->obj, ELM_ENTRY_CLASS))
                {
                   xx = x;
                   yy += hh;
@@ -1482,7 +1482,7 @@ _elm_multibuttonentry_elm_layout_text_set(Eo *obj, Elm_Multibuttonentry_Data *sd
         int_ret = EINA_TRUE;
      }
    else
-     int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
+     int_ret = elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
 
    return int_ret;
 }
@@ -1501,7 +1501,7 @@ _elm_multibuttonentry_elm_layout_text_get(Eo *obj, Elm_Multibuttonentry_Data *sd
         text = sd->guide_text_str;
      }
    else
-     text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part);
+     text = elm_obj_layout_text_get(efl_super(obj, MY_CLASS), part);
 
    return text;
 }
@@ -1550,7 +1550,7 @@ _elm_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Elm_Multibuttonentry_D
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1599,7 +1599,7 @@ _elm_multibuttonentry_efl_canvas_group_group_del(Eo *obj, Elm_Multibuttonentry_D
    EINA_LIST_FREE(sd->filter_list, _item_filter)
      _filter_free(_item_filter);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_multibuttonentry_smart_focus_next_enable = EINA_FALSE;
@@ -1694,14 +1694,14 @@ EAPI Evas_Object *
 elm_multibuttonentry_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1998,7 +1998,7 @@ EOLIAN static Eina_List*
 _elm_multibuttonentry_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd)
 {
    Eina_List *ret;
-   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
+   ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
    return eina_list_merge(eina_list_clone(sd->items), ret);
 }
 
@@ -2006,7 +2006,7 @@ EOLIAN static char*
 _elm_multibuttonentry_item_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Multibuttonentry_Item_Data *item)
 {
    char *ret;
-   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
    if (ret) return ret;
 
    const char *txt = elm_object_part_text_get(VIEW(item), "elm.btn.text");
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 98695c9a1d..a4a54b10a7 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -87,7 +87,7 @@ _elm_naviframe_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd)
    EINA_INLIST_FOREACH(sd->stack, it)
      elm_wdg_item_translate(EO_OBJ(it));
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -594,7 +594,7 @@ end:
 
    _item_free(nit);
 
-   efl_destructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
 }
 
 static void
@@ -1192,8 +1192,8 @@ _access_prev_btn_info_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
 EOLIAN static Eo *
 _elm_naviframe_item_efl_object_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
 {
-   eo_item = efl_constructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
-   it->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+   eo_item = efl_constructor(efl_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
+   it->base = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
 }
@@ -1211,7 +1211,7 @@ _item_new(Evas_Object *obj,
 
    ELM_NAVIFRAME_DATA_GET(obj, sd);
 
-   eo_item = eo_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
 
    if (!eo_item)
      {
@@ -1391,7 +1391,7 @@ _elm_naviframe_efl_canvas_group_group_add(Eo *obj, Elm_Naviframe_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->dummy_edje = wd->resize_obj;
@@ -1464,7 +1464,7 @@ _elm_naviframe_efl_canvas_group_group_del(Eo *obj, Elm_Naviframe_Data *sd)
 
    evas_object_del(sd->dummy_edje);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 //Show only the top item view
@@ -1584,14 +1584,14 @@ EAPI Evas_Object *
 elm_naviframe_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1634,7 +1634,7 @@ _elm_naviframe_item_insert_before(Eo *obj, Elm_Naviframe_Data *sd, Elm_Object_It
                   title_label, prev_btn, next_btn, content, item_style);
    if (!eo_it) return NULL;
 
-   it = eo_data_scope_get(eo_it, ELM_NAVIFRAME_ITEM_CLASS);
+   it = efl_data_scope_get(eo_it, ELM_NAVIFRAME_ITEM_CLASS);
 
    sd->stack = eina_inlist_prepend_relative
        (sd->stack, EINA_INLIST_GET(it),
@@ -1713,10 +1713,10 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
    evas_object_ref(obj);
    if (it->pop_cb)
      {
-        eo_ref(eo_item);
+        efl_ref(eo_item);
         if (!it->pop_cb(it->pop_data, eo_item))
           {
-             eo_unref(eo_item);
+             efl_unref(eo_item);
              if (it->delete_me)
                elm_wdg_item_del(eo_item);
              else
@@ -1733,7 +1733,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
              evas_object_unref(obj);
              return NULL;
           }
-        eo_unref(eo_item);
+        efl_unref(eo_item);
      }
    evas_object_unref(obj);
 
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 65f72a457f..cd6343676e 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -77,7 +77,7 @@ static const Elm_Action key_actions[] = {
    {NULL, NULL}
 };
 
-EO_CALLBACKS_ARRAY_DEFINE(_emotion_cb,
+EFL_CALLBACKS_ARRAY_DEFINE(_emotion_cb,
    { EMOTION_OBJECT_EVENT_FRAME_DECODE, _update_frame },
    { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _update_slider },
    { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _update_slider },
@@ -86,7 +86,7 @@ EO_CALLBACKS_ARRAY_DEFINE(_emotion_cb,
    { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _play_finished }
 );
 
-EO_CALLBACKS_ARRAY_DEFINE(_slider_cb,
+EFL_CALLBACKS_ARRAY_DEFINE(_slider_cb,
    { ELM_SLIDER_EVENT_CHANGED, _update_position },
    { ELM_SLIDER_EVENT_SLIDER_DRAG_START, _drag_start },
    { ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, _drag_stop }
@@ -203,7 +203,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _update_theme_button(obj, sd->forward, "forward");
@@ -543,11 +543,11 @@ _elm_player_content_set(Eo *obj, Elm_Player_Data *sd, const char *part, Evas_Obj
 
    if (part && strcmp(part, "video"))
      {
-        int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+        int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
         return int_ret;
      }
    if ((!part) || (!strcmp(part, "video"))) part = "elm.swallow.content";
-   int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+   int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
 
    if (!_elm_video_check(content)) return EINA_FALSE;
    if (sd->video == content) goto end;
@@ -605,7 +605,7 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
 {
    char buf[256];
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
@@ -666,20 +666,20 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
 EOLIAN static void
 _elm_player_efl_canvas_group_group_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_player_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   return eo_add(MY_CLASS, parent);
+   return efl_add(MY_CLASS, parent);
 }
 
 EOLIAN static Eo *
 _elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 0742f2aec9..9fc6839a95 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -60,7 +60,7 @@ static const Elm_Action key_actions[] = {
    {NULL, NULL}
 };
 
-EO_CALLBACKS_ARRAY_DEFINE(_notify_cb,
+EFL_CALLBACKS_ARRAY_DEFINE(_notify_cb,
    { ELM_NOTIFY_EVENT_BLOCK_CLICKED, _block_clicked_cb },
    { ELM_NOTIFY_EVENT_TIMEOUT, _timeout_cb },
    { ELM_NOTIFY_EVENT_DISMISSED, _hide_effect_finished_cb }
@@ -77,7 +77,7 @@ _elm_popup_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd)
    EINA_LIST_FOREACH(sd->items, l, it)
       elm_wdg_item_translate(EO_OBJ(it));
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
    elm_obj_widget_translate(sd->main_layout);
 
    return EINA_TRUE;
@@ -268,7 +268,7 @@ _elm_popup_efl_canvas_group_group_del(Eo *obj, Elm_Popup_Data *sd)
    ELM_SAFE_FREE(sd->content, evas_object_del);
    ELM_SAFE_FREE(sd->title_text, eina_stringshare_del);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -501,7 +501,7 @@ _elm_popup_elm_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *s
    Elm_Popup_Item_Data *it;
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->title_icon)
@@ -867,7 +867,7 @@ _elm_popup_item_efl_object_destructor(Eo *eo_it, Elm_Popup_Item_Data *it)
         sd->items = NULL;
         _list_del(sd);
      }
-   efl_destructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
+   efl_destructor(efl_super(eo_it, ELM_POPUP_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -897,8 +897,8 @@ _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 EOLIAN static Eo *
 _elm_popup_item_efl_object_constructor(Eo *eo_it, Elm_Popup_Item_Data *it)
 {
-   eo_it = efl_constructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+   eo_it = efl_constructor(efl_super(eo_it, ELM_POPUP_ITEM_CLASS));
+   it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
    return eo_it;
 }
@@ -1487,7 +1487,7 @@ _elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv)
 {
    char style[1024];
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
@@ -1555,7 +1555,7 @@ _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_i
 
    evas_object_geometry_get(obj, &x, &y, &w, &h);
 
-   if (eo_isa(obj, EFL_UI_WIN_CLASS))
+   if (efl_isa(obj, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;
@@ -1571,7 +1571,7 @@ _elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object
    Evas_Coord x, y, w, h;
    evas_object_geometry_get(parent, &x, &y, &w, &h);
 
-   if (eo_isa(parent, EFL_UI_WIN_CLASS))
+   if (efl_isa(parent, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;
@@ -1594,7 +1594,7 @@ EAPI Evas_Object *
 elm_popup_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
    wd->highlight_root = EINA_TRUE;
@@ -1605,7 +1605,7 @@ elm_popup_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1772,7 +1772,7 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
    Evas_Object *prev_content;
    Eo *eo_it;
 
-   eo_it = eo_add(ELM_POPUP_ITEM_CLASS, obj);
+   eo_it = efl_add(ELM_POPUP_ITEM_CLASS, obj);
    if (!eo_it) return NULL;
    ELM_POPUP_ITEM_DATA_GET(eo_it, it);
    if (sd->content || sd->text_content_obj)
@@ -1873,7 +1873,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_popup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL);
 
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 568fd481c9..0f5f05c4e2 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -39,7 +39,7 @@ static void _access_object_unregister(Evas_Object *obj);
 EOLIAN static void
 _elm_access_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 }
 
@@ -1237,14 +1237,14 @@ static Evas_Object *
 _elm_access_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_access_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index e506475d8c..b4d90cbfba 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -116,7 +116,7 @@ _elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA
 
    mirrored = elm_object_mirrored_get(obj);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (elm_object_mirrored_get(obj) != mirrored)
@@ -133,7 +133,7 @@ _drag_button_down_cb(void *data,
                      const char *emission EINA_UNUSED,
                      const char *source EINA_UNUSED)
 {
-   Elm_Actionslider_Data *sd = eo_data_scope_get(data, MY_CLASS);
+   Elm_Actionslider_Data *sd = efl_data_scope_get(data, MY_CLASS);
 
    sd->mouse_down = EINA_TRUE;
 }
@@ -452,7 +452,7 @@ _elm_actionslider_elm_layout_text_set(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
    Eina_Bool int_ret = EINA_FALSE;
 
    _mirrored_part_fix(obj, &part);
-   int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, text);
+   int_ret = elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, text);
 
    return int_ret;
 }
@@ -464,7 +464,7 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
 
    _mirrored_part_fix(obj, &part);
 
-   text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part);
+   text = elm_obj_layout_text_get(efl_super(obj, MY_CLASS), part);
 
    return text;
 }
@@ -474,7 +474,7 @@ _elm_actionslider_efl_canvas_group_group_add(Eo *obj, Elm_Actionslider_Data *pri
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->enabled_position = ELM_ACTIONSLIDER_ALL;
@@ -532,14 +532,14 @@ EAPI Evas_Object *
 elm_actionslider_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_actionslider_efl_object_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_app_client.c b/src/lib/elementary/elm_app_client.c
index 1c4309210d..4867d67262 100644
--- a/src/lib/elementary/elm_app_client.c
+++ b/src/lib/elementary/elm_app_client.c
@@ -39,7 +39,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
         if (view)
           continue;
 
-        view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, obj_path));
+        view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, obj_path));
         eina_hash_add(data->views, obj_path, view);
         if (!loading_list)
           efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
@@ -50,7 +50,7 @@ static void
 _objects_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
 {
    Eo *eo = data;
-   Elm_App_Client_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Client_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
    Eldbus_Message_Iter *array_path, *path;
 
    if (eldbus_message_error_get(msg, NULL, NULL))
@@ -67,7 +67,7 @@ _objects_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA
 static void _iface_add(void *data, const Eldbus_Message *msg)
 {
    Eo *eo = data;
-   Elm_App_Client_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Client_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
    Eldbus_Message_Iter *main_iter;
 
    main_iter = eldbus_message_iter_get(msg);
@@ -78,7 +78,7 @@ static void
 _iface_del(void *data, const Eldbus_Message *msg)
 {
    Eo *eo = data;
-   Elm_App_Client_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Client_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
    const char *path, *iface;
    Eldbus_Message_Iter *array_iface;
 
@@ -114,7 +114,7 @@ static void
 _pkg_name_owner_changed_cb(void *data, const char *bus EINA_UNUSED, const char *old_id EINA_UNUSED, const char *new_id)
 {
    Elm_App_Client *eo = data;
-   Elm_App_Client_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Client_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
    Eina_Iterator *iter;
    Elm_App_Client_View *view;
    Eina_List *views_list = NULL;
@@ -185,7 +185,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
    const char *error_name, *error_message, *view_path;
    Elm_App_Client *eo = data;
    Elm_App_Client_View *view;
-   Elm_App_Client_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Client_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
 
    if (eldbus_message_error_get(msg, &error_name, &error_message))
      {
@@ -213,7 +213,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
    view = eina_hash_find(cdata->views, view_path);
    if (!view)
      {
-        view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, view_path));
+        view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, view_path));
         eina_hash_add(cdata->views, view_path, view);
         efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
@@ -302,7 +302,7 @@ _elm_app_client_efl_object_finalize(Eo *obj, Elm_App_Client_Data *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->views, NULL);
 
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -328,7 +328,7 @@ _elm_app_client_efl_object_destructor(Eo *eo, Elm_App_Client_Data *data)
    eldbus_connection_unref(conn);
    eldbus_shutdown();
 
-   efl_destructor(eo_super(eo, MY_CLASS));
+   efl_destructor(efl_super(eo, MY_CLASS));
 }
 
 #include "elm_app_client.eo.c"
diff --git a/src/lib/elementary/elm_app_client_view.c b/src/lib/elementary/elm_app_client_view.c
index fc723bc351..2328a8f22a 100644
--- a/src/lib/elementary/elm_app_client_view.c
+++ b/src/lib/elementary/elm_app_client_view.c
@@ -55,7 +55,7 @@ _prop_changed(void *user_data, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info
    Eldbus_Proxy_Event_Property_Changed *prop_event = event_info;
    Elm_App_Client_View *eo = user_data;
    const Eina_Value *v = prop_event->value;
-   Elm_App_Client_View_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Client_View_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
 
    if (!strcmp(prop_event->name, "Title"))
      efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void *) _string_prop_get(v));
@@ -108,9 +108,9 @@ elm_app_client_view_internal_state_set(Eo *eo, Elm_App_View_State state)
    Eina_Bool changed = EINA_FALSE;
 
    EINA_SAFETY_ON_NULL_RETURN(eo);
-   EINA_SAFETY_ON_FALSE_RETURN(eo_isa(eo, ELM_APP_CLIENT_VIEW_CLASS));
+   EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo, ELM_APP_CLIENT_VIEW_CLASS));
 
-   cdata = eo_data_scope_get(eo, MY_CLASS);
+   cdata = efl_data_scope_get(eo, MY_CLASS);
    changed = cdata->state != state;
    cdata->state = state;
    if (!changed)
@@ -128,7 +128,7 @@ _elm_app_client_view_efl_object_finalize(Eo *eo, Elm_App_Client_View_Data *data)
 
    parent = efl_parent_get(eo);
    EINA_SAFETY_ON_TRUE_RETURN_VAL((!parent) ||
-                            (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), NULL);
+                            (!efl_isa(parent, ELM_APP_CLIENT_CLASS)), NULL);
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->path, NULL);
 
@@ -147,7 +147,7 @@ _elm_app_client_view_efl_object_finalize(Eo *eo, Elm_App_Client_View_Data *data)
                                    ELDBUS_PROXY_EVENT_PROPERTY_LOADED,
                                    _props_loaded, eo);
 
-   return efl_finalize(eo_super(eo, MY_CLASS));
+   return efl_finalize(efl_super(eo, MY_CLASS));
 }
 
 static void
@@ -309,7 +309,7 @@ _elm_app_client_view_efl_object_destructor(Eo *eo, Elm_App_Client_View_Data *dat
 
    eina_stringshare_del(data->path);
 
-   efl_destructor(eo_super(eo, MY_CLASS));
+   efl_destructor(efl_super(eo, MY_CLASS));
 }
 
 #include "elm_app_client_view.eo.c"
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 020fca09a2..b5bc2afd7f 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -58,7 +58,7 @@ static Eldbus_Message *
 _method_create_view(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_Data *data = efl_data_scope_get(eo, MY_CLASS);
    Eina_Value *args;
    Eina_Stringshare *error_name, *error_message, *view_path = NULL;
    Elm_App_Server_View *view;
@@ -118,7 +118,7 @@ static Eldbus_Message *
 _method_close_all_views(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *message EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _close_all_views(data);
 
@@ -147,7 +147,7 @@ static Eina_Bool
 _prop_pid_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 'i', data->PID);
    return EINA_TRUE;
@@ -157,7 +157,7 @@ static Eina_Bool
 _prop_title_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 's', data->title);
    return EINA_TRUE;
@@ -167,7 +167,7 @@ static Eina_Bool
 _prop_icon_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 's', data->icon_name);
    return EINA_TRUE;
@@ -254,7 +254,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
              new_events = elm_app_server_view_props_new_events_get(view_eet_props);
              progress = elm_app_server_view_props_progress_get(view_eet_props);
 
-             view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(eo_self, view_id));
+             view = efl_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(efl_self, view_id));
              if (!view)
                continue;
 
@@ -419,7 +419,7 @@ _elm_app_server_efl_object_finalize(Eo *obj, Elm_App_Server_Data *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->pkg, NULL);
 
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -446,7 +446,7 @@ _elm_app_server_efl_object_destructor(Eo *obj, Elm_App_Server_Data *data)
    eldbus_service_interface_unregister(data->iface);
    eldbus_connection_unref(data->conn);
    eldbus_shutdown();
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "elm_app_server.eo.c"
diff --git a/src/lib/elementary/elm_app_server_view.c b/src/lib/elementary/elm_app_server_view.c
index b9f4ebf720..fcd4708c6b 100644
--- a/src/lib/elementary/elm_app_server_view.c
+++ b/src/lib/elementary/elm_app_server_view.c
@@ -40,7 +40,7 @@ static Eldbus_Message *
 _method_close(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
    efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
@@ -52,7 +52,7 @@ static Eldbus_Message *
 _method_pause(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
    efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
@@ -64,7 +64,7 @@ static Eldbus_Message *
 _method_resume(const Eldbus_Service_Interface *iface, const Eldbus_Message *message)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_LIVE);
    efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
@@ -83,7 +83,7 @@ static Eina_Bool
 _prop_title_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 's', data->title);
    return EINA_TRUE;
@@ -93,7 +93,7 @@ static Eina_Bool
 _prop_icon_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 's', data->icon_name);
    return EINA_TRUE;
@@ -110,7 +110,7 @@ static Eina_Bool
 _prop_events_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 'i', data->new_events);
    return EINA_TRUE;
@@ -120,7 +120,7 @@ static Eina_Bool
 _prop_progress_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 'n', data->progress);
    return EINA_TRUE;
@@ -130,7 +130,7 @@ static Eina_Bool
 _prop_state_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 's', _state_id_to_string(data->state));
    return EINA_TRUE;
@@ -140,7 +140,7 @@ static Eina_Bool
 _prop_window_get(const Eldbus_Service_Interface *iface, const char *propname EINA_UNUSED, Eldbus_Message_Iter *iter, const Eldbus_Message *request_msg EINA_UNUSED, Eldbus_Message **error EINA_UNUSED)
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
-   Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
+   Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    eldbus_message_iter_basic_append(iter, 'i', data->window_id);
    return EINA_TRUE;
@@ -310,7 +310,7 @@ _elm_app_server_view_id_set(Eo *obj, Elm_App_Server_View_Data *data, const char
      }
 
    server = efl_parent_get(obj);
-   EINA_SAFETY_ON_TRUE_RETURN(!server || !eo_isa(server, ELM_APP_SERVER_CLASS));
+   EINA_SAFETY_ON_TRUE_RETURN(!server || !efl_isa(server, ELM_APP_SERVER_CLASS));
 
    if (!id)
      {
@@ -346,7 +346,7 @@ _elm_app_server_view_efl_object_finalize(Eo *obj, Elm_App_Server_View_Data *data
    Elm_App_Server *server = NULL;
 
    server = efl_parent_get(obj);
-   EINA_SAFETY_ON_TRUE_RETURN_VAL(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), NULL);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(!server || !efl_isa(server, ELM_APP_SERVER_CLASS), NULL);
 
 
    if (!data->id)
@@ -368,7 +368,7 @@ _elm_app_server_view_efl_object_finalize(Eo *obj, Elm_App_Server_View_Data *data
    data->title = eina_stringshare_add("");
    data->icon_name = eina_stringshare_add("");
 
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -382,7 +382,7 @@ _elm_app_server_view_efl_object_destructor(Eo *obj, Elm_App_Server_View_Data *da
    eldbus_connection_unref(data->conn);
    eldbus_shutdown();
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "elm_app_server_view.eo.c"
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 3327193a47..bf44597157 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -22,7 +22,7 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O
 {
    if (_pd->descr) eina_stringshare_del(_pd->descr);
 
-   efl_destructor(eo_super(obj, ELM_ATSPI_APP_OBJECT_CLASS));
+   efl_destructor(efl_super(obj, ELM_ATSPI_APP_OBJECT_CLASS));
 }
 
 EOLIAN static Eina_List*
@@ -34,7 +34,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U
    EINA_LIST_FOREACH(_elm_win_list, l, win)
      {
         Elm_Atspi_Type type;
-        if (!eo_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+        if (!efl_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
           continue;
         type = elm_interface_atspi_accessible_type_get(win);
         if (type == ELM_ATSPI_TYPE_REGULAR)
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 81e9696dfa..5056cf4ca2 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -38,22 +38,22 @@
 #define ELM_ATSPI_BRIDGE_CLASS_NAME "__Elm_Atspi_Bridge"
 
 #define ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(obj, sd) \
-   Elm_Atspi_Bridge_Data *sd = eo_data_scope_get(obj, ELM_ATSPI_BRIDGE_CLASS); \
+   Elm_Atspi_Bridge_Data *sd = efl_data_scope_get(obj, ELM_ATSPI_BRIDGE_CLASS); \
    if (!sd) return;
 
 #define ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(obj, sd, val) \
-   Elm_Atspi_Bridge_Data *sd = eo_data_scope_get(obj, ELM_ATSPI_BRIDGE_CLASS); \
+   Elm_Atspi_Bridge_Data *sd = efl_data_scope_get(obj, ELM_ATSPI_BRIDGE_CLASS); \
    if (!sd) return val;
 
 #define ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, class, msg, error) \
-   if (!(obj) || !eo_isa(obj, class)) \
+   if (!(obj) || !efl_isa(obj, class)) \
      { \
         *(error) = _dbus_invalid_ref_error_new(msg); \
         return EINA_FALSE; \
      }
 
 #define ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, class, msg) \
-   if (!(obj) || !eo_isa(obj, class)) \
+   if (!(obj) || !efl_isa(obj, class)) \
      return _dbus_invalid_ref_error_new(msg);
 
 typedef struct Key_Event_Info {
@@ -2040,7 +2040,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
         return NULL;
      }
 
-   ret = eo_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? eo : NULL;
+   ret = efl_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? eo : NULL;
 
    return ret;
 }
@@ -2534,7 +2534,7 @@ _collection_match_interfaces_helper(Eo *obj, Eina_List *ifcs, Eina_Bool conditio
 
    EINA_LIST_FOREACH(ifcs, l, class)
      {
-        if (eo_isa(obj, class) == condition)
+        if (efl_isa(obj, class) == condition)
           return ret_if_true;
      }
    return ret_if_false;
@@ -3117,26 +3117,26 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
   iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
   if (!iter_array) return;
 
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
     {
        eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
        eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
     }
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION);
-  if (eo_isa(obj, ELM_ATSPI_APP_OBJECT_CLASS))
+  if (efl_isa(obj, ELM_ATSPI_APP_OBJECT_CLASS))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION);
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT);
-  if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE))
+  if (efl_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE);
 
   eldbus_message_iter_container_close(iter, iter_array);
@@ -3145,7 +3145,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
 static Eina_Bool
 _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_array)
 {
-  if (!eo_ref_get(data) || eo_destructed_is(data))
+  if (!efl_ref_get(data) || efl_destructed_is(data))
     return EINA_TRUE;
 
   Eldbus_Message_Iter *iter_struct, *iter_sub_array;
@@ -4462,7 +4462,7 @@ static void _bridge_object_register(Eo *bridge, Eo *obj)
 {
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
 
-   if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+   if (!efl_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
      {
         WRN("Unable to register class w/o Elm_Interface_Atspi_Accessible!");
         return;
@@ -4479,7 +4479,7 @@ _elm_atspi_bridge_init(void)
 {
    if (!_init_count)
      {
-        _instance = eo_add(ELM_ATSPI_BRIDGE_CLASS, NULL);
+        _instance = efl_add(ELM_ATSPI_BRIDGE_CLASS, NULL);
         _init_count = 1;
      }
 }
@@ -4683,7 +4683,7 @@ _elm_atspi_bridge_efl_object_constructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
    Eldbus_Proxy *proxy;
    Eldbus_Pending *req;
 
-   efl_constructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
+   efl_constructor(efl_super(obj, ELM_ATSPI_BRIDGE_CLASS));
 
    elm_need_eldbus();
 
@@ -4732,7 +4732,7 @@ _elm_atspi_bridge_efl_object_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
    if (pd->bus_obj) eldbus_object_unref(pd->bus_obj);
    if (pd->session_bus) eldbus_connection_unref(pd->session_bus);
 
-   efl_destructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
+   efl_destructor(efl_super(obj, ELM_ATSPI_BRIDGE_CLASS));
 }
 
 #include "elm_atspi_bridge.eo.c"
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index f1d4ceb226..2023239469 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -92,7 +92,7 @@ EOLIAN static void
 _elm_bg_efl_canvas_group_group_add(Eo *obj, Elm_Bg_Data *priv)
 {
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -114,7 +114,7 @@ EAPI Evas_Object *
 elm_bg_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -122,7 +122,7 @@ EOLIAN static Eo *
 _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 = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 1d266f8305..607794f74e 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -110,7 +110,7 @@ _elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
@@ -149,7 +149,7 @@ _elm_box_elm_widget_sub_object_del(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, Evas_
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), child);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), child);
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -372,7 +372,7 @@ _elm_box_efl_canvas_group_group_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
                                   EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _on_size_hints_changed, obj);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    efl_event_callback_add
@@ -409,14 +409,14 @@ _elm_box_efl_canvas_group_group_del(Eo *obj, Elm_Box_Data *sd)
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_box_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -424,7 +424,7 @@ EOLIAN static Eo *
 _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 = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index acff629654..9904f9dc49 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -117,7 +117,7 @@ _elm_bubble_elm_layout_text_set(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, const
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
+   int_ret = elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
    if (!int_ret) return EINA_FALSE;
 
    if (part && (!strcmp(part, "info") || !strcmp(part, "elm.info")))
@@ -178,7 +178,7 @@ _elm_bubble_efl_canvas_group_group_add(Eo *obj, Elm_Bubble_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default
@@ -220,14 +220,14 @@ EAPI Evas_Object *
 elm_bubble_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_bubble_efl_object_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 48393f66f0..25c70da6b7 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -124,7 +124,7 @@ _elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
    _icon_signal_emit(obj);
 
@@ -139,7 +139,7 @@ _elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -155,7 +155,7 @@ _elm_button_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *p
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+   int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -285,7 +285,7 @@ _elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    edje_object_signal_callback_add
@@ -327,14 +327,14 @@ EAPI Evas_Object *
 elm_button_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 8d46de0d10..53c8a4ea4a 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -739,7 +739,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
 
    if (edje_object_part_exists(wd->resize_obj, ELM_CALENDAR_BUTTON_LEFT))
      {
-        if (sd->dec_btn_month && eo_isa(sd->dec_btn_month, ELM_ACCESS_CLASS))
+        if (sd->dec_btn_month && efl_isa(sd->dec_btn_month, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "left_bt");
@@ -759,7 +759,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
         elm_object_style_set(sd->dec_btn_month, left_buf);
         elm_layout_content_set(obj, ELM_CALENDAR_BUTTON_LEFT, sd->dec_btn_month);
      }
-   else if (sd->dec_btn_month && !eo_isa(sd->dec_btn_month, ELM_ACCESS_CLASS))
+   else if (sd->dec_btn_month && !efl_isa(sd->dec_btn_month, ELM_ACCESS_CLASS))
      {
         evas_object_del(sd->dec_btn_month);
         sd->dec_btn_month = NULL;
@@ -767,7 +767,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
 
    if (edje_object_part_exists(wd->resize_obj, ELM_CALENDAR_BUTTON_RIGHT))
      {
-        if (sd->inc_btn_month && eo_isa(sd->inc_btn_month, ELM_ACCESS_CLASS))
+        if (sd->inc_btn_month && efl_isa(sd->inc_btn_month, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "right_bt");
@@ -787,7 +787,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
         elm_object_style_set(sd->inc_btn_month, right_buf);
         elm_layout_content_set(obj, ELM_CALENDAR_BUTTON_RIGHT, sd->inc_btn_month);
      }
-   else if (sd->inc_btn_month && !eo_isa(sd->inc_btn_month, ELM_ACCESS_CLASS))
+   else if (sd->inc_btn_month && !efl_isa(sd->inc_btn_month, ELM_ACCESS_CLASS))
      {
         evas_object_del(sd->inc_btn_month);
         sd->inc_btn_month = NULL;
@@ -795,7 +795,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
 
    if (edje_object_part_exists(wd->resize_obj, ELM_CALENDAR_BUTTON_YEAR_LEFT))
      {
-        if (sd->dec_btn_year && eo_isa(sd->dec_btn_year, ELM_ACCESS_CLASS))
+        if (sd->dec_btn_year && efl_isa(sd->dec_btn_year, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "left_bt_year");
@@ -815,7 +815,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
         elm_object_style_set(sd->dec_btn_year, left_buf);
         elm_layout_content_set(obj, ELM_CALENDAR_BUTTON_YEAR_LEFT, sd->dec_btn_year);
      }
-   else if (sd->dec_btn_year && !eo_isa(sd->dec_btn_year, ELM_ACCESS_CLASS))
+   else if (sd->dec_btn_year && !efl_isa(sd->dec_btn_year, ELM_ACCESS_CLASS))
      {
         evas_object_del(sd->dec_btn_year);
         sd->dec_btn_year = NULL;
@@ -823,7 +823,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
 
    if (edje_object_part_exists(wd->resize_obj, ELM_CALENDAR_BUTTON_YEAR_RIGHT))
      {
-        if (sd->inc_btn_year && eo_isa(sd->inc_btn_year, ELM_ACCESS_CLASS))
+        if (sd->inc_btn_year && efl_isa(sd->inc_btn_year, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "right_bt_year");
@@ -843,7 +843,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
         elm_object_style_set(sd->inc_btn_year, right_buf);
         elm_layout_content_set(obj, ELM_CALENDAR_BUTTON_YEAR_RIGHT, sd->inc_btn_year);
      }
-   else if (sd->inc_btn_year && !eo_isa(sd->inc_btn_year, ELM_ACCESS_CLASS))
+   else if (sd->inc_btn_year && !efl_isa(sd->inc_btn_year, ELM_ACCESS_CLASS))
      {
         evas_object_del(sd->inc_btn_year);
         sd->inc_btn_year = NULL;
@@ -855,7 +855,7 @@ _elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _spinner_buttons_add(obj, sd);
@@ -1377,7 +1377,7 @@ _elm_calendar_efl_canvas_group_group_add(Eo *obj, Elm_Calendar_Data *priv)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->first_interval = 0.85;
@@ -1457,7 +1457,7 @@ _elm_calendar_efl_canvas_group_group_del(Eo *obj, Elm_Calendar_Data *sd)
    for (i = 0; i < ELM_DAY_LAST; i++)
      eina_stringshare_del(sd->weekdays[i]);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_calendar_smart_focus_next_enable = EINA_FALSE;
@@ -1538,13 +1538,13 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
                }
           }
 
-        if (sd->dec_btn_month && eo_isa(sd->dec_btn_month, ELM_ACCESS_CLASS))
+        if (sd->dec_btn_month && efl_isa(sd->dec_btn_month, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "left_bt");
              sd->dec_btn_month = NULL;
           }
-        if (sd->inc_btn_month && eo_isa(sd->inc_btn_month, ELM_ACCESS_CLASS))
+        if (sd->inc_btn_month && efl_isa(sd->inc_btn_month, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "right_bt");
@@ -1554,13 +1554,13 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
           _elm_access_edje_object_part_object_unregister
             (obj, elm_layout_edje_get(obj), "month_text");
 
-        if (sd->dec_btn_year && eo_isa(sd->dec_btn_year, ELM_ACCESS_CLASS))
+        if (sd->dec_btn_year && efl_isa(sd->dec_btn_year, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "left_bt_year");
              sd->dec_btn_year = NULL;
           }
-        if (sd->inc_btn_year && eo_isa(sd->inc_btn_year, ELM_ACCESS_CLASS))
+        if (sd->inc_btn_year && efl_isa(sd->inc_btn_year, ELM_ACCESS_CLASS))
           {
              _elm_access_edje_object_part_object_unregister
                (obj, elm_layout_edje_get(obj), "right_bt_year");
@@ -1583,14 +1583,14 @@ EAPI Evas_Object *
 elm_calendar_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_calendar_efl_object_constructor(Eo *obj, Elm_Calendar_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index ccd4a100a0..648b0ec9c1 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -104,7 +104,7 @@ _elm_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Check_Data
 {
    Elm_Atspi_State_Set states = 0;
 
-   states = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_CHECK_CLASS));
+   states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_CHECK_CLASS));
 
    if (elm_check_state_get(obj))
        STATE_TYPE_SET(states, ELM_ATSPI_STATE_CHECKED);
@@ -120,7 +120,7 @@ _elm_check_elm_widget_sub_object_del(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, E
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -171,7 +171,7 @@ _elm_check_elm_widget_theme_apply(Eo *obj, Elm_Check_Data *sd EINA_UNUSED)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
 
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
@@ -294,7 +294,7 @@ _elm_check_efl_canvas_group_group_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)))
@@ -352,21 +352,21 @@ _elm_check_efl_ui_nstate_value_set(Eo *obj, Elm_Check_Data *pd EINA_UNUSED, int
    Eina_Bool _state = !!state;
    if (_state == efl_ui_nstate_value_get(obj)) return;
 
-   efl_ui_nstate_value_set(eo_super(obj, MY_CLASS), _state);
+   efl_ui_nstate_value_set(efl_super(obj, MY_CLASS), _state);
 }
 
 EAPI Evas_Object *
 elm_check_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_check_efl_object_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index df618084b1..ba71416207 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -565,7 +565,7 @@ _elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _time_update(obj, EINA_TRUE);
@@ -654,7 +654,7 @@ _elm_clock_efl_canvas_group_group_add(Eo *obj, Elm_Clock_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->cur.ampm = -1;
@@ -696,7 +696,7 @@ _elm_clock_efl_canvas_group_group_del(Eo *obj, Elm_Clock_Data *sd)
 
    /* NB: digits are killed for being sub objects, automatically */
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_clock_smart_focus_next_enable = EINA_FALSE;
@@ -790,14 +790,14 @@ EAPI Evas_Object *
 elm_clock_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_clock_efl_object_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index f1c8a212e1..41d1dc418e 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -333,7 +333,7 @@ _dropable_list_geom_find(Evas *evas, Evas_Coord px, Evas_Coord py)
                   object = evas_object_smart_parent_get(object);
                   if (dropable)
                     cnp_debug("Drop target %p of type %s found\n",
-                              dropable->obj, eo_class_name_get(eo_class_get(dropable->obj)));
+                              dropable->obj, efl_class_name_get(efl_class_get(dropable->obj)));
                }
              else
                 object = evas_object_smart_parent_get(object);
@@ -366,7 +366,7 @@ _dropable_coords_adjust(Dropable *dropable, Evas_Coord *x, Evas_Coord *y)
    if (elm_widget_is(dropable->obj))
      {
         win = elm_widget_top_get(dropable->obj);
-        if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+        if (win && efl_isa(win, EFL_UI_WIN_CLASS))
           {
              Evas_Coord x2, y2;
              int rot = elm_win_rotation_get(win);
@@ -1817,7 +1817,7 @@ _x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
                   if (elm_widget_is(dragwidget))
                     {
                        Evas_Object *win = elm_widget_top_get(dragwidget);
-                       if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+                       if (win && efl_isa(win, EFL_UI_WIN_CLASS))
                          efl_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                     }
                }
@@ -1883,7 +1883,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
              par = elm_widget_parent_widget_get(obj);
              if (par) top = elm_widget_top_get(par);
           }
-        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
+        if (top && (efl_isa(top, EFL_UI_WIN_CLASS)))
             xwin = elm_win_xwindow_get(top);
      }
    if (!xwin)
@@ -2271,7 +2271,7 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
    if (elm_widget_is(obj))
      {
         Evas_Object *win = elm_widget_top_get(obj);
-        if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+        if (win && efl_isa(win, EFL_UI_WIN_CLASS))
           {
              elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
              efl_event_callback_add(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
@@ -3437,7 +3437,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
 
         top = elm_widget_top_get(obj);
         if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
-        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
+        if (top && (efl_isa(top, EFL_UI_WIN_CLASS)))
           parent = elm_win_wl_window_get(top);
      }
    if (!parent)
@@ -3611,7 +3611,7 @@ _wl_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
                   evas_object_geometry_get(dropable->obj, &ox, &oy, NULL, NULL);
 
                   cnp_debug("Candidate %p (%s)\n",
-                        dropable->obj, eo_class_name_get(eo_class_get(dropable->obj)));
+                        dropable->obj, efl_class_name_get(efl_class_get(dropable->obj)));
                   _wl_dropable_handle(dropable, x - ox, y - oy);
                   wl_cnp_selection.requestwidget = dropable->obj;
                   will_accept = EINA_TRUE;
@@ -3943,7 +3943,7 @@ _wl_elm_widget_window_get(const Evas_Object *obj)
      {
         top = elm_widget_top_get(obj);
         if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
-        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
+        if (top && (efl_isa(top, EFL_UI_WIN_CLASS)))
             win = elm_win_wl_window_get(top);
      }
    if (!win)
@@ -4017,7 +4017,7 @@ _cocoa_elm_widget_cocoa_window_get(const Evas_Object *obj)
               par = elm_widget_parent_widget_get(obj);
               if (par) top = elm_widget_top_get(par);
            }
-         if ((top) && (eo_isa(top, EFL_UI_WIN_CLASS)))
+         if ((top) && (efl_isa(top, EFL_UI_WIN_CLASS)))
            win = elm_win_cocoa_window_get(top);
      }
    if (!win)
@@ -4616,7 +4616,7 @@ _win32_elm_widget_window_get(const Evas_Object *obj)
              par = elm_widget_parent_widget_get(obj);
              if (par) top = elm_widget_top_get(par);
           }
-        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
+        if (top && (efl_isa(top, EFL_UI_WIN_CLASS)))
           win = elm_win_win32_window_get(top);
      }
 
@@ -5660,7 +5660,7 @@ elm_drag_cancel(Evas_Object *obj)
              if (elm_widget_is(dragwidget))
                {
                   Evas_Object *win = elm_widget_top_get(dragwidget);
-                  if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+                  if (win && efl_isa(win, EFL_UI_WIN_CLASS))
                      efl_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                }
           }
diff --git a/src/lib/elementary/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c
index c874805cab..118e98e064 100644
--- a/src/lib/elementary/elm_code_diff_widget.c
+++ b/src/lib/elementary/elm_code_diff_widget.c
@@ -95,7 +95,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code *code)
    // left side of diff
    wcode1 = elm_code_create();
    elm_code_parser_standard_add(wcode1, ELM_CODE_PARSER_STANDARD_DIFF);
-   widget_left = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, wcode1));
+   widget_left = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, wcode1));
 
    evas_object_size_hint_weight_set(widget_left, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(widget_left, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -106,7 +106,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code *code)
    // right side of diff
    wcode2 = elm_code_create();
    elm_code_parser_standard_add(wcode2, ELM_CODE_PARSER_STANDARD_DIFF);
-   widget_right = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, wcode2));
+   widget_right = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, wcode2));
 
    evas_object_size_hint_weight_set(widget_right, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(widget_right, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 132bf06bec..9f01f0c5e5 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -60,14 +60,14 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = NULL;
-   obj = eo_add(MY_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
+   obj = efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_code_widget_efl_object_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, ELM_CODE_WIDGET_CLASS));
+   obj = efl_constructor(efl_super(obj, ELM_CODE_WIDGET_CLASS));
 
    pd->cursor_line = 1;
    pd->cursor_col = 1;
@@ -80,7 +80,7 @@ _elm_code_widget_efl_object_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
 EOLIAN static Eo *
 _elm_code_widget_efl_object_finalize(Eo *obj, Elm_Code_Widget_Data *pd)
 {
-   obj = efl_finalize(eo_super(obj, ELM_CODE_WIDGET_CLASS));
+   obj = efl_finalize(efl_super(obj, ELM_CODE_WIDGET_CLASS));
 
    if (pd->code)
      return obj;
@@ -102,7 +102,7 @@ _elm_code_widget_cell_size_get(Elm_Code_Widget *widget, Evas_Coord *width, Evas_
    Evas_Object *grid;
    Evas_Coord w = 0, h = 0;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    grid = eina_list_nth(pd->grids, 0);
    evas_object_textgrid_cell_size_get(grid, &w, &h);
@@ -119,7 +119,7 @@ _elm_code_widget_scroll_by(Elm_Code_Widget *widget, int by_x, int by_y)
    Elm_Code_Widget_Data *pd;
    Evas_Coord x, y, w, h;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    elm_scroller_region_get(pd->scroller, &x, &y, &w, &h);
    x += by_x;
@@ -143,7 +143,7 @@ _elm_code_widget_status_type_get(Elm_Code_Widget *widget, Elm_Code_Line *line, u
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT)
      return line->status;
@@ -198,7 +198,7 @@ _elm_code_widget_fill_gutter(Elm_Code_Widget *widget, Evas_Textgrid_Cell *cells,
    int gutter, g;
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    gutter = elm_code_widget_text_left_gutter_width_get(widget);
 
    if (width < gutter)
@@ -237,7 +237,7 @@ _elm_code_widget_fill_whitespace(Elm_Code_Widget *widget, Eina_Unicode character
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    if (!pd->show_whitespace)
      {
         if (character== '\t')
@@ -269,7 +269,7 @@ _elm_code_widget_fill_cursor(Elm_Code_Widget *widget, unsigned int number,
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    if (pd->editable && pd->focussed && pd->cursor_line == number)
      {
@@ -286,7 +286,7 @@ _elm_code_widget_fill_selection(Elm_Code_Widget *widget, Elm_Code_Line *line, Ev
    unsigned int x, start, end;
    Elm_Code_Widget_Selection_Data *selection;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    if (!pd->selection)
      return;
 
@@ -320,7 +320,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Line *line)
    Evas_Textgrid_Cell *cells;
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    gutter = elm_obj_code_widget_text_left_gutter_width_get(widget);
    if (eina_list_count(pd->grids) < line->number)
      return;
@@ -399,7 +399,7 @@ _elm_code_widget_fill_range(Elm_Code_Widget *widget, unsigned int first_row, uns
    unsigned int y;
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    _elm_code_widget_resize(widget, newline);
 
    // if called from new line cb, no need to update whole range unless visible
@@ -422,7 +422,7 @@ _elm_code_widget_refresh(Elm_Code_Widget *widget, Elm_Code_Line *line)
 
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    evas_object_geometry_get(widget, NULL, &oy, NULL, NULL);
    elm_scroller_region_get(pd->scroller, NULL, &scroll_y, NULL, &scroll_h);
@@ -443,7 +443,7 @@ _elm_code_widget_fill(Elm_Code_Widget *widget)
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    _elm_code_widget_fill_range(widget, 1, elm_code_file_lines_get(pd->code->file), NULL);
 }
@@ -507,7 +507,7 @@ _elm_code_widget_cursor_key_will_move(Elm_Code_Widget *widget, const char *key)
    Elm_Code_Widget_Data *pd;
    Elm_Code_Line *line;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    line = elm_code_file_line_get(pd->code->file, pd->cursor_line);
 
    if (!line)
@@ -562,7 +562,7 @@ _elm_code_widget_cursor_ensure_visible(Elm_Code_Widget *widget)
    Elm_Code_Widget_Data *pd;
    int gutter;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    evas_object_geometry_get(widget, NULL, &oy, NULL, NULL);
    elm_scroller_region_get(pd->scroller, &viewx, &viewy, &vieww, &viewh);
@@ -660,7 +660,7 @@ _elm_code_widget_clicked_gutter_cb(Elm_Code_Widget *widget, unsigned int row)
    Elm_Code_Widget_Data *pd;
    Elm_Code_Line *line;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    line = elm_code_file_line_get(pd->code->file, row);
    if (!line)
@@ -676,7 +676,7 @@ _elm_code_widget_clicked_editable_cb(Elm_Code_Widget *widget, unsigned int row,
    Elm_Code_Line *line;
    unsigned int column_width;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    line = elm_code_file_line_get(pd->code->file, row);
    if (!line)
@@ -697,7 +697,7 @@ _elm_code_widget_clicked_readonly_cb(Elm_Code_Widget *widget, unsigned int row)
    Elm_Code_Widget_Data *pd;
    Elm_Code_Line *line;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    line = elm_code_file_line_get(pd->code->file, row);
    if (!line)
      return;
@@ -716,7 +716,7 @@ _elm_code_widget_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
    int col;
 
    widget = (Elm_Code_Widget *)data;
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    event = (Evas_Event_Mouse_Down *)event_info;
    _elm_code_widget_position_at_coordinates_get(widget, pd, event->canvas.x, event->canvas.y, &row, &col);
 
@@ -747,7 +747,7 @@ _elm_code_widget_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
    int col;
 
    widget = (Elm_Code_Widget *)data;
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    event = (Evas_Event_Mouse_Move *)event_info;
 
    _elm_code_widget_position_at_coordinates_get(widget, pd, event->cur.canvas.x, event->cur.canvas.y, &row, &col);
@@ -774,7 +774,7 @@ _elm_code_widget_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj E
    Eina_Bool hasline;
 
    widget = (Elm_Code_Widget *)data;
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    event = (Evas_Event_Mouse_Up *)event_info;
 
    if (pd->selection)
@@ -805,7 +805,7 @@ _elm_code_widget_cursor_move_home(Elm_Code_Widget *widget)
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    elm_code_widget_selection_clear(widget);
 
    if (pd->cursor_col <= 1)
@@ -821,7 +821,7 @@ _elm_code_widget_cursor_move_end(Elm_Code_Widget *widget)
    Elm_Code_Line *line;
    unsigned int lastcol;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    elm_code_widget_selection_clear(widget);
 
    line = elm_code_file_line_get(pd->code->file, pd->cursor_line);
@@ -839,7 +839,7 @@ _elm_code_widget_cursor_move_up(Elm_Code_Widget *widget)
    Elm_Code_Line *line;
    unsigned int row, col, column_width;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    row = pd->cursor_line;
    col = pd->cursor_col;
    elm_code_widget_selection_clear(widget);
@@ -863,7 +863,7 @@ _elm_code_widget_cursor_move_down(Elm_Code_Widget *widget)
    Elm_Code_Line *line;
    unsigned int row, col, column_width;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    row = pd->cursor_line;
    col = pd->cursor_col;
    elm_code_widget_selection_clear(widget);
@@ -885,7 +885,7 @@ _elm_code_widget_cursor_move_left(Elm_Code_Widget *widget)
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    elm_code_widget_selection_clear(widget);
 
    if (pd->cursor_col <= 1)
@@ -907,7 +907,7 @@ _elm_code_widget_cursor_move_right(Elm_Code_Widget *widget)
    Elm_Code_Widget_Data *pd;
    Elm_Code_Line *line;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    elm_code_widget_selection_clear(widget);
 
    line = elm_code_file_line_get(pd->code->file, pd->cursor_line);
@@ -940,7 +940,7 @@ _elm_code_widget_cursor_move_pageup(Elm_Code_Widget *widget)
    Elm_Code_Line *line;
    unsigned int row, col, column_width;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    row = pd->cursor_line;
    col = pd->cursor_col;
 
@@ -968,7 +968,7 @@ _elm_code_widget_cursor_move_pagedown(Elm_Code_Widget *widget)
    Elm_Code_Line *line;
    unsigned int row, col, column_width;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    row = pd->cursor_line;
    col = pd->cursor_col;
 
@@ -994,7 +994,7 @@ _elm_code_widget_delete_selection(Elm_Code_Widget *widget)
    Elm_Code_Widget_Data *pd;
    Elm_Code_Widget_Selection_Data *selection;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    if (!pd->selection)
      return EINA_FALSE;
@@ -1092,7 +1092,7 @@ _elm_code_widget_tab_at_cursor_insert(Elm_Code_Widget *widget)
    Elm_Code_Widget_Data *pd;
    unsigned int col, row, rem;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    if (!pd->tab_inserts_spaces)
      {
         _elm_code_widget_text_at_cursor_insert(widget, "\t", 1);
@@ -1294,7 +1294,7 @@ _elm_code_widget_key_down_cb(void *data, Evas *evas EINA_UNUSED,
    Elm_Code_Widget_Data *pd;
 
    widget = (Elm_Code_Widget *)data;
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    Evas_Event_Key_Down *ev = event_info;
 
@@ -1354,7 +1354,7 @@ _elm_code_widget_focused_event_cb(void *data, Evas_Object *obj,
    Elm_Code_Widget_Data *pd;
 
    widget = (Elm_Code_Widget *)data;
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    pd->focussed = EINA_TRUE;
 
@@ -1370,7 +1370,7 @@ _elm_code_widget_unfocused_event_cb(void *data, Evas_Object *obj,
    Elm_Code_Widget_Data *pd;
 
    widget = (Elm_Code_Widget *)data;
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    pd->focussed = EINA_FALSE;
    _elm_code_widget_refresh(obj, NULL);
@@ -1505,7 +1505,7 @@ _elm_code_widget_ensure_n_grid_rows(Elm_Code_Widget *widget, int rows)
    int existing, i;
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    existing = eina_list_count(pd->grids);
 
    // trim unneeded rows in our rendering
@@ -1554,7 +1554,7 @@ _elm_code_widget_resize(Elm_Code_Widget *widget, Elm_Code_Line *newline)
    unsigned int line_width;
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    gutter = elm_obj_code_widget_text_left_gutter_width_get(widget);
 
    if (!pd->code)
@@ -1818,7 +1818,7 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
 {
    Evas_Object *background, *gridrows, *scroller;
 
-   efl_canvas_group_add(eo_super(obj, ELM_CODE_WIDGET_CLASS));
+   efl_canvas_group_add(efl_super(obj, ELM_CODE_WIDGET_CLASS));
    elm_object_focus_allow_set(obj, EINA_TRUE);
 
    if (!elm_layout_theme_set(obj, "code", "layout", "default"))
diff --git a/src/lib/elementary/elm_code_widget_selection.c b/src/lib/elementary/elm_code_widget_selection.c
index 7873b8a001..e6076ac361 100644
--- a/src/lib/elementary/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -47,7 +47,7 @@ elm_code_widget_selection_start(Evas_Object *widget,
    Elm_Code_Widget_Data *pd;
    Elm_Code_Widget_Selection_Data *selection;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    _elm_code_widget_selection_limit(widget, pd, &line, &col);
    if (!pd->selection)
@@ -73,7 +73,7 @@ elm_code_widget_selection_end(Evas_Object *widget,
    Elm_Code_Widget_Data *pd;
    Elm_Code_Widget_Selection_Data *selection;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    _elm_code_widget_selection_limit(widget, pd, &line, &col);
    if (!pd->selection)
@@ -98,7 +98,7 @@ elm_code_widget_selection_normalized_get(Evas_Object *widget)
    Elm_Code_Widget_Selection_Data *selection;
    Eina_Bool reverse;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    selection = _elm_code_widget_selection_new();
 
    if (!pd->selection)
@@ -137,7 +137,7 @@ elm_code_widget_selection_clear(Evas_Object *widget)
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    if (!pd->selection)
      return;
@@ -234,7 +234,7 @@ elm_code_widget_selection_delete(Evas_Object *widget)
 {
    Elm_Code_Widget_Data *pd;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    if (!pd->selection)
      return;
@@ -255,7 +255,7 @@ elm_code_widget_selection_select_line(Evas_Object *widget, unsigned int line)
    Elm_Code_Widget_Data *pd;
    Elm_Code_Line *lineobj;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    lineobj = elm_code_file_line_get(pd->code->file, line);
 
    if (!lineobj)
@@ -289,7 +289,7 @@ elm_code_widget_selection_select_word(Evas_Object *widget, unsigned int line, un
    unsigned int colpos, length, pos;
    const char *content;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
    lineobj = elm_code_file_line_get(pd->code->file, line);
    content = elm_code_line_text_get(lineobj, &length);
 
@@ -324,7 +324,7 @@ elm_code_widget_selection_text_get(Evas_Object *widget)
    Elm_Code_Widget_Selection_Data *selection;
    char *text;
 
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    if (!pd->selection)
      return strdup("");
diff --git a/src/lib/elementary/elm_code_widget_undo.c b/src/lib/elementary/elm_code_widget_undo.c
index 7c9113fb63..1e2b51ee21 100644
--- a/src/lib/elementary/elm_code_widget_undo.c
+++ b/src/lib/elementary/elm_code_widget_undo.c
@@ -27,7 +27,7 @@ _elm_code_widget_undo_change_add(Evas_Object *widget,
    Elm_Code_Widget_Change_Info *info_copy;
 
    info_copy = _elm_code_widget_undo_info_copy(info);
-   pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
 
    pd->undo_stack_ptr = eina_list_prepend(pd->undo_stack_ptr, info_copy);
    pd->undo_stack = pd->undo_stack_ptr;
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 0759ce88f2..3ba996a959 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1302,7 +1302,7 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||
@@ -1390,7 +1390,7 @@ _sub_obj_size_hints_set(Evas_Object *sobj,
    Evas_Coord minw = -1, minh = -1;
 
    elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh);
-   if (sobj && eo_isa(sobj, EDJE_OBJECT_CLASS))
+   if (sobj && efl_isa(sobj, EDJE_OBJECT_CLASS))
      edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
    evas_object_size_hint_min_set(sobj, minw, minh);
    evas_object_size_hint_max_set(sobj, -1, -1);
@@ -1671,7 +1671,7 @@ _elm_color_item_elm_widget_item_access_register(Eo *eo_it, Elm_Color_Item_Data *
    Elm_Access_Info *ai;
 
    Evas_Object *res;
-   res = elm_wdg_item_access_register(eo_super(eo_it, ELM_COLOR_ITEM_CLASS));
+   res = elm_wdg_item_access_register(efl_super(eo_it, ELM_COLOR_ITEM_CLASS));
 
    ai = _elm_access_info_get(it->base->access_obj);
 
@@ -1703,8 +1703,8 @@ _elm_color_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED,
 EOLIAN static Eo *
 _elm_color_item_efl_object_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
 {
-   eo_item = efl_constructor(eo_super(eo_item, ELM_COLOR_ITEM_CLASS));
-   item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+   eo_item = efl_constructor(efl_super(eo_item, ELM_COLOR_ITEM_CLASS));
+   item->base = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *obj;
    obj = efl_parent_get(eo_item);
@@ -1749,7 +1749,7 @@ EOLIAN static void
 _elm_color_item_efl_object_destructor(Eo *obj, Elm_Color_Item_Data *item)
 {
    free(item->color);
-   efl_destructor(eo_super(obj, ELM_COLOR_ITEM_CLASS));
+   efl_destructor(efl_super(obj, ELM_COLOR_ITEM_CLASS));
 }
 
 static void
@@ -1793,7 +1793,7 @@ _palette_colors_load(Evas_Object *obj)
 
    EINA_LIST_FOREACH(color_list, elist, color)
      {
-        eo_item = eo_add(ELM_COLOR_ITEM_CLASS, obj);
+        eo_item = efl_add(ELM_COLOR_ITEM_CLASS, obj);
         if (!eo_item) return;
 
         ELM_COLOR_ITEM_DATA_GET(eo_item, item);
@@ -1878,7 +1878,7 @@ _elm_colorselector_efl_canvas_group_group_add(Eo *obj, Elm_Colorselector_Data *p
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1935,7 +1935,7 @@ _elm_colorselector_efl_canvas_group_group_del(Eo *obj, Elm_Colorselector_Data *s
    /* This cb_data are used during the destruction process of base.del */
    for (i = 0; i < 4; i++)
      tmp[i] = sd->cb_data[i];
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
    for (i = 0; i < 4; i++)
      free(tmp[i]);
 }
@@ -1970,7 +1970,7 @@ _palette_box_vertical_item_get(Eina_List* ref_item, enum Palette_Box_Direction d
    for (l = ref_item; l; l = dir_func(l))
      {
         eo_item = eina_list_data_get(l);
-        item = eo_data_scope_get(eo_item, ELM_COLOR_ITEM_CLASS);
+        item = efl_data_scope_get(eo_item, ELM_COLOR_ITEM_CLASS);
         evas_object_geometry_get(VIEW(item), &x, &y, NULL, NULL);
         if (basey != y) break;
      }
@@ -1981,7 +1981,7 @@ _palette_box_vertical_item_get(Eina_List* ref_item, enum Palette_Box_Direction d
    for (; l; l = dir_func(l))
      {
         eo_item = eina_list_data_get(l);
-        item = eo_data_scope_get(eo_item, ELM_COLOR_ITEM_CLASS);
+        item = efl_data_scope_get(eo_item, ELM_COLOR_ITEM_CLASS);
         evas_object_geometry_get(VIEW(item), &x, &y, NULL, NULL);
         if (basey != y) break;
 
@@ -2158,7 +2158,7 @@ _elm_colorselector_elm_widget_focus_next(Eo *obj, Elm_Colorselector_Data *sd, El
         if (!sd->items) return EINA_FALSE;
         EINA_LIST_FOREACH(sd->items, l, eo_item)
           {
-             Elm_Widget_Item_Data *witem = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+             Elm_Widget_Item_Data *witem = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
              items = eina_list_append(items, witem->access_obj);
           }
      }
@@ -2229,14 +2229,14 @@ EAPI Evas_Object *
 elm_colorselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_colorselector_efl_object_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -2408,7 +2408,7 @@ _elm_colorselector_palette_color_add(Eo *obj, Elm_Colorselector_Data *sd, int r,
         _items_del(sd);
         sd->config_load = EINA_FALSE;
      }
-   eo_item = eo_add(ELM_COLOR_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_COLOR_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_COLOR_ITEM_DATA_GET(eo_item, item);
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 0ca7ca62ed..af8394b8ff 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1688,7 +1688,7 @@ _efl_config_obj_del(Eo *obj EINA_UNUSED)
 static void
 _config_load(void)
 {
-   _efl_config_obj = eo_add(EFL_CONFIG_GLOBAL_CLASS, NULL);
+   _efl_config_obj = efl_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);
    efl_del_intercept_set(_efl_config_obj, _efl_config_obj_del);
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index ead9d91b72..081b69eebf 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -576,7 +576,7 @@ _elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UN
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _conformant_parts_swallow(obj);
@@ -711,9 +711,9 @@ _autoscroll_objects_update(void *data)
 
    while (sub)
      {
-        if (eo_isa(sub, ELM_CONFORMANT_CLASS)) break;
+        if (efl_isa(sub, ELM_CONFORMANT_CLASS)) break;
 
-        if (eo_isa(sub, ELM_SCROLLER_CLASS) || eo_isa(sub, ELM_GENLIST_CLASS))
+        if (efl_isa(sub, ELM_SCROLLER_CLASS) || efl_isa(sub, ELM_GENLIST_CLASS))
           top_scroller = sub;
 
         sub = elm_object_parent_widget_get(sub);
@@ -916,7 +916,7 @@ _on_prop_change(void *data,
 EOLIAN static void
 _elm_conformant_efl_canvas_group_group_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -952,7 +952,7 @@ _elm_conformant_efl_canvas_group_group_del(Eo *obj, Elm_Conformant_Data *sd)
    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));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -988,14 +988,14 @@ EAPI Evas_Object *
 elm_conformant_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c
index f5ef1c99aa..9eb86f1cc7 100644
--- a/src/lib/elementary/elm_datetime.c
+++ b/src/lib/elementary/elm_datetime.c
@@ -387,7 +387,7 @@ _elm_datetime_elm_widget_translate(Eo *obj, Elm_Datetime_Data *sd)
    if (!sd->user_format) _reload_format(obj);
    else _field_list_display(obj);
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -461,7 +461,7 @@ _elm_datetime_elm_widget_on_focus(Eo *obj, Elm_Datetime_Data *sd, Elm_Object_Ite
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (!elm_widget_focus_get(obj))
@@ -480,7 +480,7 @@ _elm_datetime_elm_widget_disable(Eo *obj, Elm_Datetime_Data *sd)
    unsigned int idx = 0;
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT; idx++)
@@ -520,7 +520,7 @@ _elm_datetime_elm_widget_theme_apply(Eo *obj, Elm_Datetime_Data *sd)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if ((!dt_mod) || (!dt_mod->field_value_display)) return int_ret;
@@ -801,7 +801,7 @@ _elm_datetime_efl_canvas_group_group_add(Eo *obj, Elm_Datetime_Data *priv)
    Datetime_Field *field;
    int idx;
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    // module - initialise module for datetime
@@ -877,21 +877,21 @@ _elm_datetime_efl_canvas_group_group_del(Eo *obj, Elm_Datetime_Data *sd)
    if ((dt_mod) && (dt_mod->obj_unhook))
      dt_mod->obj_unhook(sd->mod_data);  // module - unhook
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_datetime_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_datetime_efl_object_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index af8112a4cf..644432388f 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -76,7 +76,7 @@ _elm_dayselector_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Dayselector_Data
         elm_object_text_set(VIEW(it), buf);
      }
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -132,7 +132,7 @@ _elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
    char buf[1024];
    Elm_Dayselector_Item_Data *it;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    EINA_LIST_FOREACH(sd->items, l, it)
@@ -240,7 +240,7 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
      {
         snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
 
-        int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), buf), content);
+        int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), buf), content);
         if (!int_ret) return EINA_FALSE;
 
         if (!content) return EINA_TRUE; /* item deletion already handled */
@@ -250,13 +250,13 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
      }
    else
      {
-        Eo *eo_it = eo_add(ELM_DAYSELECTOR_ITEM_CLASS, obj);
-        it = eo_data_scope_get(eo_it, ELM_DAYSELECTOR_ITEM_CLASS);
+        Eo *eo_it = efl_add(ELM_DAYSELECTOR_ITEM_CLASS, obj);
+        it = efl_data_scope_get(eo_it, ELM_DAYSELECTOR_ITEM_CLASS);
         it->day = day;
 
         snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
 
-        int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), buf), content);
+        int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), buf), content);
         if (!int_ret)
           {
              efl_del(eo_it);
@@ -293,8 +293,8 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
 EOLIAN static Eo *
 _elm_dayselector_item_efl_object_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item)
 {
-   eo_item = efl_constructor(eo_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS));
-   item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+   eo_item = efl_constructor(efl_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS));
+   item->base = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
 }
@@ -315,7 +315,7 @@ _elm_dayselector_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *it
 
    content = VIEW(it);
 
-   content = efl_content_unset(efl_part(eo_super(obj, MY_CLASS), buf));
+   content = efl_content_unset(efl_part(efl_super(obj, MY_CLASS), buf));
    if (!content) return NULL;
 
    sd->items = eina_list_remove(sd->items, it);
@@ -415,7 +415,7 @@ _items_create(Evas_Object *obj)
 EOLIAN static void
 _elm_dayselector_efl_canvas_group_group_add(Eo *obj, Elm_Dayselector_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "dayselector", "base",
@@ -446,21 +446,21 @@ _elm_dayselector_efl_canvas_group_group_del(Eo *obj, Elm_Dayselector_Data *sd)
      }
 
    /* handles freeing sd */
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_dayselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_dayselector_efl_object_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 64aba70ce8..371ddbe3c4 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -473,7 +473,7 @@ _elm_diskselector_item_efl_object_destructor(Eo *eo_it, Elm_Diskselector_Item_Da
 
    _sizing_eval(obj);
 
-   efl_destructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
+   efl_destructor(efl_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -652,8 +652,8 @@ _access_on_highlight_cb(void *data)
 EOLIAN static Eo *
 _elm_diskselector_item_efl_object_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
 {
-   eo_it = efl_constructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+   eo_it = efl_constructor(efl_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
+   it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
    return eo_it;
 }
@@ -665,7 +665,7 @@ _item_new(Evas_Object *obj,
           Evas_Smart_Cb func,
           const void *data)
 {
-   Eo *eo_it = eo_add(ELM_DISKSELECTOR_ITEM_CLASS, obj);
+   Eo *eo_it = efl_add(ELM_DISKSELECTOR_ITEM_CLASS, obj);
    if (!eo_it) return NULL;
    ELM_DISKSELECTOR_ITEM_DATA_GET(eo_it, it);
 
@@ -820,7 +820,7 @@ _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
    Evas *evas;
    const char *style = elm_widget_style_get(obj);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    evas = evas_object_evas_get(obj);
@@ -878,7 +878,7 @@ _elm_diskselector_elm_widget_sub_object_del(Eo *obj, Elm_Diskselector_Data *sd,
    Elm_Diskselector_Item_Data *it;
    const Eina_List *l;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    EINA_LIST_FOREACH(sd->items, l, it)
@@ -901,7 +901,7 @@ _elm_diskselector_elm_widget_on_focus(Eo *obj, Elm_Diskselector_Data *_pd EINA_U
    Eina_Bool int_ret = EINA_FALSE;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -1282,7 +1282,7 @@ _elm_diskselector_efl_canvas_group_group_add(Eo *obj, Elm_Diskselector_Data *pri
    edje = edje_object_add(evas);
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
      (obj, edje, "diskselector", "base", elm_widget_style_get(obj));
@@ -1417,13 +1417,13 @@ _elm_diskselector_efl_canvas_group_group_del(Eo *obj, Elm_Diskselector_Data *sd)
    ELM_SAFE_FREE(sd->scroller_move_idle_enterer, ecore_idle_enterer_del);
    ELM_SAFE_FREE(sd->string_check_idle_enterer, ecore_idle_enterer_del);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_diskselector_efl_canvas_group_group_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -1431,7 +1431,7 @@ _elm_diskselector_efl_canvas_group_group_move(Eo *obj, Elm_Diskselector_Data *sd
 EOLIAN static void
 _elm_diskselector_efl_canvas_group_group_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -1439,7 +1439,7 @@ _elm_diskselector_efl_canvas_group_group_resize(Eo *obj, Elm_Diskselector_Data *
 EOLIAN static void
 _elm_diskselector_efl_canvas_group_group_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -1455,14 +1455,14 @@ EAPI Evas_Object *
 elm_diskselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_diskselector_efl_object_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1602,7 +1602,7 @@ _elm_diskselector_elm_interface_scrollable_policy_get(Eo *obj, Elm_Diskselector_
 {
    Elm_Scroller_Policy s_policy_h, s_policy_v;
 
-   elm_interface_scrollable_policy_get(eo_super((Eo *)obj, MY_CLASS), &s_policy_h, &s_policy_v);
+   elm_interface_scrollable_policy_get(efl_super((Eo *)obj, MY_CLASS), &s_policy_h, &s_policy_v);
    if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h;
    if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v;
 }
@@ -1623,7 +1623,7 @@ _elm_diskselector_elm_interface_scrollable_policy_set(Eo *obj, Elm_Diskselector_
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 1c064cba63..66e7eaadda 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -443,7 +443,7 @@ _viewport_region_get(Evas_Object *obj)
    parent = elm_widget_parent_get(obj);
    while (parent)
      {
-        if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
+        if (efl_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
           {
              Eina_Rectangle r;
              EINA_RECTANGLE_SET(&r, 0, 0, 0, 0);
@@ -846,7 +846,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    evas_event_freeze(evas_object_evas_get(obj));
@@ -1226,7 +1226,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
    if (!sd->editable) return EINA_FALSE;
 
    top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      top_is_win = EINA_TRUE;
 
    if (elm_widget_focus_get(obj))
@@ -1340,7 +1340,7 @@ _elm_entry_elm_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, E
         elm_layout_signal_emit(obj, "elm,action,hide,end", "elm");
      }
 
-   ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!ret) return EINA_FALSE;
 
    return EINA_TRUE;
@@ -1841,7 +1841,7 @@ _magnifier_move(void *data)
 
    // keep magnifier inside window
    top = elm_widget_top_get(data);
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      {
         Evas_Coord wh, ww;
         evas_object_geometry_get(top, NULL, NULL, &ww, &wh);
@@ -2008,7 +2008,7 @@ _mouse_up_cb(void *data,
              top = elm_widget_top_get(data);
              if (top)
                {
-                  if (eo_isa(top, EFL_UI_WIN_CLASS))
+                  if (efl_isa(top, EFL_UI_WIN_CLASS))
                     top_is_win = EINA_TRUE;
 
                   if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&
@@ -3043,14 +3043,14 @@ _elm_entry_elm_layout_signal_callback_add (Eo *obj, Elm_Entry_Data *sd, const ch
    wd->resize_obj = sd->entry_edje;
 
    elm_obj_layout_signal_callback_add
-     (eo_super(obj, MY_CLASS), emission, source, func_cb, data);
+     (efl_super(obj, MY_CLASS), emission, source, func_cb, data);
 
    if (sd->scr_edje)
      {
         wd->resize_obj = sd->scr_edje;
 
         elm_obj_layout_signal_callback_add
-              (eo_super(obj, MY_CLASS), emission, source, func_cb, data);
+              (efl_super(obj, MY_CLASS), emission, source, func_cb, data);
      }
 
    wd->resize_obj = ro;
@@ -3069,14 +3069,14 @@ _elm_entry_elm_layout_signal_callback_del(Eo *obj, Elm_Entry_Data *sd, const cha
    wd->resize_obj = sd->entry_edje;
 
    data = elm_obj_layout_signal_callback_del
-         (eo_super(obj, MY_CLASS), emission, source, func_cb);
+         (efl_super(obj, MY_CLASS), emission, source, func_cb);
 
    if (sd->scr_edje)
      {
         wd->resize_obj = sd->scr_edje;
 
         data = elm_obj_layout_signal_callback_del
-              (eo_super(obj, MY_CLASS), emission, source, func_cb);
+              (efl_super(obj, MY_CLASS), emission, source, func_cb);
      }
 
    wd->resize_obj = ro;
@@ -3087,7 +3087,7 @@ static Eina_Bool
 _elm_entry_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+   int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
    if (!int_ret) return EINA_FALSE;
 
    /* too bad entry does not follow the pattern
@@ -3105,7 +3105,7 @@ static Evas_Object*
 _elm_entry_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part)
 {
    Evas_Object *ret = NULL;
-   ret = efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part));
+   ret = efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
    if (!ret) return NULL;
 
    /* too bad entry does not follow the pattern
@@ -3641,7 +3641,7 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->entry_edje = wd->resize_obj;
@@ -3905,13 +3905,13 @@ _elm_entry_efl_canvas_group_group_del(Eo *obj, Elm_Entry_Data *sd)
         evas_object_del(sd->end_handler);
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_entry_efl_canvas_group_group_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 
@@ -3924,7 +3924,7 @@ _elm_entry_efl_canvas_group_group_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x
 EOLIAN static void
 _elm_entry_efl_canvas_group_group_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
    if (sd->have_selection)
@@ -3934,7 +3934,7 @@ _elm_entry_efl_canvas_group_group_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_entry_efl_canvas_group_group_show(Eo *obj, Elm_Entry_Data *sd)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    if (sd->have_selection)
      _update_selection_handler(obj);
@@ -3943,7 +3943,7 @@ _elm_entry_efl_canvas_group_group_show(Eo *obj, Elm_Entry_Data *sd)
 EOLIAN static void
 _elm_entry_efl_canvas_group_group_hide(Eo *obj, Elm_Entry_Data *sd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    if (sd->have_selection)
      _hide_selection_handler(obj);
@@ -3952,7 +3952,7 @@ _elm_entry_efl_canvas_group_group_hide(Eo *obj, Elm_Entry_Data *sd)
 EOLIAN static void
 _elm_entry_efl_canvas_group_group_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -3974,7 +3974,7 @@ EAPI Evas_Object *
 elm_entry_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -4003,7 +4003,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
 EOLIAN static Eo *
 _elm_entry_efl_object_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -5065,7 +5065,7 @@ _elm_entry_elm_interface_scrollable_policy_set(Eo *obj, Elm_Entry_Data *sd, Elm_
 {
    sd->policy_h = h;
    sd->policy_v = v;
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), sd->policy_h, sd->policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), sd->policy_h, sd->policy_v);
 }
 
 EAPI void
@@ -5082,7 +5082,7 @@ _elm_entry_elm_interface_scrollable_bounce_allow_set(Eo *obj, Elm_Entry_Data *sd
 {
    sd->h_bounce = h_bounce;
    sd->v_bounce = v_bounce;
-   elm_interface_scrollable_bounce_allow_set(eo_super(obj, MY_CLASS), h_bounce, v_bounce);
+   elm_interface_scrollable_bounce_allow_set(efl_super(obj, MY_CLASS), h_bounce, v_bounce);
 }
 
 EAPI void
@@ -5962,7 +5962,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_entry_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_ENTRY_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_ENTRY_CLASS));
 
    if (elm_entry_editable_get(obj))
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE);
@@ -5974,7 +5974,7 @@ EOLIAN static char*
 _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
 {
    char *name;
-   name = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_ENTRY_CLASS));
+   name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_ENTRY_CLASS));
    if (name && strncmp("", name, 1)) return name;
    const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide");
    return ret ? strdup(ret) : NULL;
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index d436bc55bb..7bf5f0d6a2 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -290,14 +290,14 @@ _elm_flipselector_item_efl_object_destructor(Eo *eo_item, Elm_Flipselector_Item_
    _sentinel_eval(sd);
    _update_view(sd->obj);
 
-   efl_destructor(eo_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
 _elm_flipselector_item_efl_object_constructor(Eo *obj, Elm_Flipselector_Item_Data *it)
 {
-   obj = efl_constructor(eo_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS));
-   it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+   obj = efl_constructor(efl_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS));
+   it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
 }
@@ -313,7 +313,7 @@ _item_new(Evas_Object *obj,
 
    ELM_FLIPSELECTOR_DATA_GET(obj, sd);
 
-   eo_item = eo_add(ELM_FLIPSELECTOR_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_FLIPSELECTOR_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_FLIPSELECTOR_ITEM_DATA_GET(eo_item, it);
@@ -338,7 +338,7 @@ _elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    max_len = edje_object_data_get(wd->resize_obj, "max_len");
@@ -606,7 +606,7 @@ _signal_val_change_stop(void *data,
 EOLIAN static void
 _elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -642,14 +642,14 @@ _elm_flipselector_efl_canvas_group_group_del(Eo *obj, Elm_Flipselector_Data *sd)
 
    ecore_timer_del(sd->spin);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_flipselector_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -668,7 +668,7 @@ elm_flipselector_first_interval_get(const Evas_Object *obj)
 EOLIAN static Eo *
 _elm_flipselector_efl_object_constructor(Eo *obj, Elm_Flipselector_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index ef62d3f9b9..44a092cc6c 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -476,8 +476,8 @@ _calc_job(void *data)
 EOLIAN static void
 _elm_gengrid_pan_efl_object_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
 {
-   eo_data_unref(psd->wobj, psd->wsd);
-   efl_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_data_unref(psd->wobj, psd->wsd);
+   efl_destructor(efl_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -1147,7 +1147,7 @@ _item_mouse_up_cb(void *data,
              while (sd->selected)
                {
                   Elm_Object_Item *eo_sel = sd->selected->data;
-                  Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENGRID_ITEM_CLASS);
+                  Elm_Gen_Item *sel = efl_data_scope_get(eo_sel, ELM_GENGRID_ITEM_CLASS);
                   it->unhighlight_cb(sel);
                   it->unsel_cb(sel);
                }
@@ -2097,7 +2097,7 @@ _item_focus_up(Elm_Gengrid_Data *sd)
              if (!elm_object_item_disabled_get(eo_prev)) break;
           }
 
-        prev = eo_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS);
+        prev = efl_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (!prev) return EINA_FALSE;
@@ -2150,7 +2150,7 @@ _item_focus_down(Elm_Gengrid_Data *sd)
                }
           }
 
-	  next = eo_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS);
+	  next = efl_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (!next) return EINA_FALSE;
@@ -2184,7 +2184,7 @@ _item_focus_left(Elm_Gengrid_Data *sd)
              eo_prev = elm_gengrid_item_prev_get(eo_prev);
           }
 
-        prev = eo_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS);
+        prev = efl_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (!prev) return EINA_FALSE;
@@ -2218,7 +2218,7 @@ _item_focus_right(Elm_Gengrid_Data *sd)
              eo_next = elm_gengrid_item_next_get(eo_next);
           }
 
-        next = eo_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS);
+        next = efl_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (!next) return EINA_FALSE;
@@ -2415,7 +2415,7 @@ _item_single_select_left(Elm_Gengrid_Data *sd)
                break;
              eo_prev = elm_gengrid_item_prev_get(eo_prev);
           }
-        prev = eo_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS);
+        prev = efl_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (!prev) return EINA_FALSE;
@@ -2449,7 +2449,7 @@ _item_single_select_right(Elm_Gengrid_Data *sd)
                break;
              eo_next = elm_gengrid_item_next_get(eo_next);
           }
-        next = eo_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS);
+        next = efl_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (!next) return EINA_FALSE;
@@ -3009,7 +3009,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir)
              while (!_elm_gengrid_item_edge_check(EO_OBJ(item), dir))
                {
                   eo_item = elm_gengrid_item_prev_get(eo_item);
-                  item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
+                  item = efl_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
                   counter++;
                }
              eo_item = elm_gengrid_first_item_get(obj);
@@ -3026,7 +3026,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir)
                     {
                        for (i = 0; i < sd->nmax; i++)
                          eo_item = elm_gengrid_item_next_get(eo_item);
-                       item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
+                       item = efl_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
                     }
                }
           }
@@ -3040,7 +3040,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir)
                   if (!elm_gengrid_item_next_get(eo_item))
                     break;
                   eo_item = elm_gengrid_item_next_get(eo_item);
-                  item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
+                  item = efl_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
                }
           }
         else if (dir == ELM_FOCUS_LEFT)
@@ -3050,7 +3050,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir)
                   if (!elm_gengrid_item_prev_get(EO_OBJ(item)))
                     break;
                   eo_item = elm_gengrid_item_prev_get(eo_item);
-                  item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
+                  item = efl_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS);
                }
           }
         else
@@ -3528,7 +3528,7 @@ _key_action_select(Evas_Object *obj, const char *params)
              while (sd->selected)
                {
                   Elm_Object_Item *eo_sel = sd->selected->data;
-                  Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENGRID_ITEM_CLASS);
+                  Elm_Gen_Item *sel = efl_data_scope_get(eo_sel, ELM_GENGRID_ITEM_CLASS);
                   it->unsel_cb(sel);
                }
           }
@@ -3651,14 +3651,14 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd, Elm_Object_Item
    Eina_Bool int_ret = EINA_FALSE;
    Elm_Object_Item *eo_it = NULL;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj) && (sd->selected) &&
        (!sd->last_selected_item))
      {
         Elm_Object_Item *sel = eina_list_data_get(sd->selected);
-        sd->last_selected_item = eo_data_scope_get(sel, ELM_GENGRID_ITEM_CLASS);
+        sd->last_selected_item = efl_data_scope_get(sel, ELM_GENGRID_ITEM_CLASS);
      }
 
    if (elm_widget_focus_get(obj) && !sd->mouse_down)
@@ -3793,7 +3793,7 @@ _mirrored_set(Evas_Object *obj,
    ELM_GENGRID_DATA_GET(obj, sd);
 
    _item_cache_zero(sd);
-   elm_interface_scrollable_mirrored_set(eo_super(obj, MY_CLASS), rtl);
+   elm_interface_scrollable_mirrored_set(efl_super(obj, MY_CLASS), rtl);
 
    if (!sd->items) return;
    it = ELM_GEN_ITEM_FROM_INLIST(sd->items);
@@ -3810,7 +3810,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -4200,8 +4200,8 @@ _item_select(Elm_Gen_Item *it)
 EOLIAN static Eo *
 _elm_gengrid_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_it = efl_constructor(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+   eo_it = efl_constructor(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
+   it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
    return eo_it;
@@ -4216,7 +4216,7 @@ _elm_gengrid_item_new(Elm_Gengrid_Data *sd,
 {
    if (!itc) return NULL;
 
-   Eo *eo_it = eo_add(ELM_GENGRID_ITEM_CLASS, sd->obj);
+   Eo *eo_it = efl_add(ELM_GENGRID_ITEM_CLASS, sd->obj);
    if (!eo_it) return NULL;
    ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
 
@@ -4260,7 +4260,7 @@ _elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv)
    Elm_Gengrid_Pan_Data *pan_data;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -4306,9 +4306,9 @@ _elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv)
    priv->highlight = EINA_TRUE;
    priv->item_cache_max = CACHE_MAX;
 
-   priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
-   pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
-   eo_data_ref(obj, NULL);
+   priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
+   pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
+   efl_data_ref(obj, NULL);
    pan_data->wobj = obj;
    pan_data->wsd = priv;
 
@@ -4329,13 +4329,13 @@ _elm_gengrid_efl_canvas_group_group_del(Eo *obj, Elm_Gengrid_Data *sd)
    _item_cache_zero(sd);
    ecore_job_del(sd->calc_job);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_gengrid_efl_canvas_group_group_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -4343,7 +4343,7 @@ _elm_gengrid_efl_canvas_group_group_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coo
 EOLIAN static void
 _elm_gengrid_efl_canvas_group_group_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -4351,7 +4351,7 @@ _elm_gengrid_efl_canvas_group_group_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_C
 EOLIAN static void
 _elm_gengrid_efl_canvas_group_group_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -4383,14 +4383,14 @@ EAPI Evas_Object *
 elm_gengrid_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -4876,7 +4876,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_content_cb_set(Eo *eo_it, Elm_Gen_Item
    if (VIEW(it))
      {
         elm_wdg_item_tooltip_content_cb_set
-              (eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), it->tooltip.content_cb, it->tooltip.data, NULL);
+              (efl_super(eo_it, ELM_GENGRID_ITEM_CLASS), it->tooltip.content_cb, it->tooltip.data, NULL);
         elm_wdg_item_tooltip_style_set(eo_it, it->tooltip.style);
         elm_wdg_item_tooltip_window_mode_set(eo_it, it->tooltip.free_size);
      }
@@ -4899,7 +4899,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_unset(Eo *eo_it, Elm_Gen_Item *it)
    ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
 
    if ((VIEW(it)) && (it->tooltip.content_cb))
-     elm_wdg_item_tooltip_unset(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
+     elm_wdg_item_tooltip_unset(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
 
    if (it->tooltip.del_cb)
      it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
@@ -4923,7 +4923,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
                                    const char *style)
 {
    eina_stringshare_replace(&it->tooltip.style, style);
-   if (VIEW(it)) elm_wdg_item_tooltip_style_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), style);
+   if (VIEW(it)) elm_wdg_item_tooltip_style_set(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS), style);
 }
 
 EAPI const char *
@@ -4951,7 +4951,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
 {
    it->tooltip.free_size = disable;
    if (VIEW(it))
-     return elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
+     return elm_wdg_item_tooltip_window_mode_set(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
 
    return EINA_TRUE;
 }
@@ -4984,7 +4984,7 @@ _elm_gengrid_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
    ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
 
    eina_stringshare_replace(&it->mouse_cursor, cursor);
-   if (VIEW(it)) elm_wdg_item_cursor_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), cursor);
+   if (VIEW(it)) elm_wdg_item_cursor_set(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS), cursor);
 }
 
 EAPI const char *
@@ -5006,7 +5006,7 @@ _elm_gengrid_item_elm_widget_item_cursor_unset(Eo *eo_it, Elm_Gen_Item *it)
    if (!it->mouse_cursor)
      return;
 
-   if (VIEW(it)) elm_wdg_item_cursor_unset(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
+   if (VIEW(it)) elm_wdg_item_cursor_unset(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
 
    ELM_SAFE_FREE(it->mouse_cursor, eina_stringshare_del);
 }
@@ -5088,7 +5088,7 @@ elm_gengrid_bounce_set(Evas_Object *obj,
 EOLIAN static void
 _elm_gengrid_elm_interface_scrollable_bounce_allow_set(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED, Eina_Bool h_bounce, Eina_Bool v_bounce)
 {
-   elm_interface_scrollable_bounce_allow_set(eo_super(obj, MY_CLASS), !!h_bounce, !!v_bounce);
+   elm_interface_scrollable_bounce_allow_set(efl_super(obj, MY_CLASS), !!h_bounce, !!v_bounce);
 }
 
 EAPI void
@@ -5180,7 +5180,7 @@ _elm_gengrid_elm_interface_scrollable_policy_set(Eo *obj, Elm_Gengrid_Data *sd E
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -5197,7 +5197,7 @@ _elm_gengrid_elm_interface_scrollable_policy_get(Eo *obj, Elm_Gengrid_Data *sd E
 {
    Elm_Scroller_Policy s_policy_h, s_policy_v;
 
-   elm_interface_scrollable_policy_get(eo_super(obj, MY_CLASS), &s_policy_h, &s_policy_v);
+   elm_interface_scrollable_policy_get(efl_super(obj, MY_CLASS), &s_policy_h, &s_policy_v);
    if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h;
    if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v;
 }
@@ -5506,7 +5506,7 @@ _elm_gengrid_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Ge
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
 
    sel = elm_obj_gengrid_item_selected_get(eo_it);
 
@@ -5524,7 +5524,7 @@ _elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Ite
    char *ret;
    Eina_Strbuf *buf;
 
-   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
    if (ret) return ret;
 
    buf = eina_strbuf_new();
@@ -5705,7 +5705,7 @@ _elm_gengrid_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Gengrid_Da
    EINA_INLIST_FOREACH(sd->items, it)
       ret = eina_list_append(ret, EO_OBJ(it));
 
-   ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_GENGRID_CLASS));
+   ret2 = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_GENGRID_CLASS));
 
    return eina_list_merge(ret, ret2);
 }
@@ -5715,7 +5715,7 @@ _elm_gengrid_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Gengrid_D
 {
    Elm_Atspi_State_Set ret;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_GENGRID_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_GENGRID_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS);
 
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index c17b480ee7..a00852eb2d 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -264,7 +264,7 @@ _elm_genlist_pan_efl_canvas_group_group_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
 {
    ecore_job_del(psd->resize_job);
 
-   efl_canvas_group_del(eo_super(obj, MY_PAN_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -400,7 +400,7 @@ _item_content_realize(Elm_Gen_Item *it,
              // FIXME: cause elm_layout sizing eval is delayed by smart calc,
              // genlist cannot get actual min size of edje.
              // This is workaround code to set min size directly.
-             if (eo_class_get(content) == ELM_LAYOUT_CLASS)
+             if (efl_class_get(content) == ELM_LAYOUT_CLASS)
                {
                   Evas_Coord old_w, old_h, minw = 0, minh = 0;
                   efl_gfx_size_hint_combined_min_get(content, &old_w, &old_h);
@@ -2038,7 +2038,7 @@ _tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED)
    eo_it2 = EO_OBJ(it2);
    while (eo_it2 && vis)
      {
-        it2 = eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
+        it2 = efl_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
         evas_object_move(VIEW(it2), it2->item->scrl_x, it2->item->scrl_y);
         vis = (ELM_RECTS_INTERSECT(it2->item->scrl_x, it2->item->scrl_y,
                                    it2->item->w, it2->item->h, cvx, cvy, cvw,
@@ -2140,7 +2140,7 @@ _tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED)
 
         while (eo_it)
           {
-             it = eo_data_scope_get(eo_it, ELM_GENLIST_ITEM_CLASS);
+             it = efl_data_scope_get(eo_it, ELM_GENLIST_ITEM_CLASS);
              num++;
              if (sd->expanded_item->item->expanded_depth >=
                  it->item->expanded_depth) break;
@@ -2554,8 +2554,8 @@ _elm_genlist_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Pan_Data
 EOLIAN static void
 _elm_genlist_pan_efl_object_destructor(Eo *obj, Elm_Genlist_Pan_Data *psd)
 {
-   eo_data_unref(psd->wobj, psd->wsd);
-   efl_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_data_unref(psd->wobj, psd->wsd);
+   efl_destructor(efl_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -2657,7 +2657,7 @@ _item_single_select_up(Elm_Genlist_Data *sd)
      {
         Elm_Object_Item *eo_prev = elm_genlist_item_prev_get
            (sd->last_selected_item);
-        prev = eo_data_scope_get(eo_prev, ELM_GENLIST_ITEM_CLASS);
+        prev = efl_data_scope_get(eo_prev, ELM_GENLIST_ITEM_CLASS);
      }
 
    while (prev)
@@ -2687,7 +2687,7 @@ _item_single_select_down(Elm_Genlist_Data *sd)
    else
      {
         eo_next = elm_genlist_item_next_get(sd->last_selected_item);
-        next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
+        next = efl_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
      }
 
    while (next)
@@ -2801,14 +2801,14 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
              eo_first_item = elm_genlist_first_item_get(WIDGET(focus_it));
              if (eo_first_item == sd->focused_item) return EINA_FALSE;
              eo_next = elm_genlist_item_prev_get(sd->focused_item);
-             next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
+             next = efl_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
              while ((next) &&
                     ((elm_wdg_item_disabled_get(eo_next)) ||
                     (_is_no_select(next))))
                {
                   eo_next = elm_genlist_item_prev_get(eo_next);
-                  next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
+                  next = efl_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
                }
           }
         else if (dir == ELM_FOCUS_DOWN)
@@ -2816,14 +2816,14 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
              eo_last_item = elm_genlist_last_item_get(WIDGET(focus_it));
              if (eo_last_item == sd->focused_item) return EINA_FALSE;
              eo_next = elm_genlist_item_next_get(sd->focused_item);
-             next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
+             next = efl_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
              while ((next) &&
                     ((elm_wdg_item_disabled_get(eo_next)) ||
                     (_is_no_select(next))))
                {
                   eo_next = elm_genlist_item_next_get(eo_next);
-                  next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
+                  next = efl_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
                }
           }
         else
@@ -3106,7 +3106,7 @@ _key_action_select(Evas_Object *obj, const char *params)
              while (sd->selected)
                {
                   Elm_Object_Item *eo_sel = sd->selected->data;
-                  Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS);
+                  Elm_Gen_Item *sel = efl_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS);
                   _item_unselect(sel);
                }
           }
@@ -3180,7 +3180,7 @@ _elm_genlist_elm_widget_sub_object_add(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSE
     * creation, thus issuing TOO MANY sizing_eval()'s here. they are
     * not needed at here anyway, so let's skip listening to those
     * hints changes */
-   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    return EINA_TRUE;
@@ -3198,7 +3198,7 @@ _elm_genlist_elm_widget_sub_object_del(Eo *obj, Elm_Genlist_Data *sd, Evas_Objec
     * about too many recalculations */
    sd->on_sub_del = EINA_TRUE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    sd->on_sub_del = EINA_FALSE;
@@ -3279,7 +3279,7 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd, Elm_Object_Item
    Elm_Object_Item *eo_it = NULL;
    Eina_Bool is_sel = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) &&
@@ -3412,7 +3412,7 @@ _elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
    Eina_List *l;
    Elm_Gen_Item *it;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    evas_event_freeze(evas_object_evas_get(obj));
@@ -4783,7 +4783,7 @@ _access_activate_cb(void *data EINA_UNUSED,
              while (sd->selected)
                {
                   Elm_Object_Item *eo_sel = sd->selected->data;
-                  Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS);
+                  Elm_Gen_Item *sel = efl_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS);
                   _item_unselect(sel);
                }
           }
@@ -4973,7 +4973,7 @@ _item_mouse_up_cb(void *data,
              while (sd->selected)
                {
                   Elm_Object_Item *eo_sel = sd->selected->data;
-                  Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS);
+                  Elm_Gen_Item *sel = efl_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS);
                   _item_unselect(sel);
                }
           }
@@ -5536,7 +5536,7 @@ _elm_genlist_efl_canvas_group_group_add(Eo *obj, Elm_Genlist_Data *priv)
    Evas_Coord minw, minh;
    int i;
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->size_caches = eina_hash_pointer_new(_size_cache_free);
@@ -5585,9 +5585,9 @@ _elm_genlist_efl_canvas_group_group_add(Eo *obj, Elm_Genlist_Data *priv)
    priv->longpress_timeout = _elm_config->longpress_timeout;
    priv->highlight = EINA_TRUE;
 
-   priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
-   pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
-   eo_data_ref(obj, NULL);
+   priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
+   pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
+   efl_data_ref(obj, NULL);
    pan_data->wobj = obj;
    pan_data->wsd = priv;
 
@@ -5637,13 +5637,13 @@ _elm_genlist_efl_canvas_group_group_del(Eo *obj, Elm_Genlist_Data *sd)
 
    _elm_genlist_tree_effect_stop(sd);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_genlist_efl_canvas_group_group_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -5651,7 +5651,7 @@ _elm_genlist_efl_canvas_group_group_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coo
 EOLIAN static void
 _elm_genlist_efl_canvas_group_group_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
    if ((sd->queue) && (!sd->queue_idle_enterer) && (w > 0))
@@ -5661,7 +5661,7 @@ _elm_genlist_efl_canvas_group_group_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_C
 EOLIAN static void
 _elm_genlist_efl_canvas_group_group_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -5704,14 +5704,14 @@ EAPI Evas_Object *
 elm_genlist_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_genlist_efl_object_constructor(Eo *obj, Elm_Genlist_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -6059,9 +6059,9 @@ _elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it)
 EOLIAN static Eo *
 _elm_genlist_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_it = efl_constructor(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
+   eo_it = efl_constructor(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+   it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
    return eo_it;
@@ -6081,7 +6081,7 @@ _elm_genlist_item_new(Elm_Genlist_Data *sd,
 
    if (!itc) return NULL;
 
-   Eo *eo_it = eo_add(ELM_GENLIST_ITEM_CLASS, sd->obj);
+   Eo *eo_it = efl_add(ELM_GENLIST_ITEM_CLASS, sd->obj);
    if (!eo_it) return NULL;
    ELM_GENLIST_ITEM_DATA_GET(eo_it, it);
 
@@ -6403,7 +6403,7 @@ _elm_genlist_item_sorted_insert(Eo *obj, Elm_Genlist_Data *sd, const Elm_Genlist
         if (l)
           {
              eo_rel = eina_list_data_get(l);
-             rel = eo_data_scope_get(eo_rel, ELM_GENLIST_ITEM_CLASS);
+             rel = efl_data_scope_get(eo_rel, ELM_GENLIST_ITEM_CLASS);
 
              if (cmp_result >= 0)
                {
@@ -6421,7 +6421,7 @@ _elm_genlist_item_sorted_insert(Eo *obj, Elm_Genlist_Data *sd, const Elm_Genlist
                     {
                        last = eina_list_last(rel->item->items);
                        eo_rel = eina_list_data_get(last);
-                       rel = eo_data_scope_get(eo_rel, ELM_GENLIST_ITEM_CLASS);
+                       rel = efl_data_scope_get(eo_rel, ELM_GENLIST_ITEM_CLASS);
                     }
                   sd->items = eina_inlist_append_relative
                       (sd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(rel));
@@ -6805,7 +6805,7 @@ _elm_genlist_expanded_next_item_get(Elm_Gen_Item *it)
              eo_it2 = elm_genlist_item_next_get(eo_it2);
           }
      }
-   return eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
+   return efl_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
 }
 
 static void
@@ -6843,7 +6843,7 @@ _elm_genlist_move_items_set(Elm_Gen_Item *it)
 
         while (eo_it2 && (dh < oy + oh))
           {
-             it2 = eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
+             it2 = efl_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
              dh += it2->item->h;
              sd->move_items = eina_list_append(sd->move_items, it2);
              eo_it2 = elm_genlist_item_next_get(eo_it2);
@@ -7246,7 +7246,7 @@ _elm_genlist_item_elm_widget_item_tooltip_content_cb_set(Eo *eo_it, Elm_Gen_Item
    if (VIEW(it))
      {
         elm_wdg_item_tooltip_content_cb_set
-              (eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), it->tooltip.content_cb, it->tooltip.data, NULL);
+              (efl_super(eo_it, ELM_GENLIST_ITEM_CLASS), it->tooltip.content_cb, it->tooltip.data, NULL);
         elm_wdg_item_tooltip_style_set(eo_it, it->tooltip.style);
         elm_wdg_item_tooltip_window_mode_set(eo_it, it->tooltip.free_size);
      }
@@ -7269,7 +7269,7 @@ _elm_genlist_item_elm_widget_item_tooltip_unset(Eo *eo_it, Elm_Gen_Item *it)
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
 
    if ((VIEW(it)) && (it->tooltip.content_cb))
-     elm_wdg_item_tooltip_unset(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
+     elm_wdg_item_tooltip_unset(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    if (it->tooltip.del_cb)
      it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
@@ -7295,7 +7295,7 @@ _elm_genlist_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
 
    eina_stringshare_replace(&it->tooltip.style, style);
-   if (VIEW(it)) elm_wdg_item_tooltip_style_set(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), style);
+   if (VIEW(it)) elm_wdg_item_tooltip_style_set(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS), style);
 }
 
 EAPI const char *
@@ -7327,7 +7327,7 @@ _elm_genlist_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
    if (VIEW(it))
      {
         Eina_Bool ret;
-        ret = elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), disable);
+        ret = elm_wdg_item_tooltip_window_mode_set(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS), disable);
         return ret;
      }
 
@@ -7359,7 +7359,7 @@ _elm_genlist_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
 {
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
    eina_stringshare_replace(&it->mouse_cursor, cursor);
-   if (VIEW(it)) elm_wdg_item_cursor_set(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), cursor);
+   if (VIEW(it)) elm_wdg_item_cursor_set(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS), cursor);
 }
 
 EAPI const char *
@@ -7381,7 +7381,7 @@ _elm_genlist_item_elm_widget_item_cursor_unset(Eo *eo_it, Elm_Gen_Item *it)
 
    if (!it->mouse_cursor) return;
 
-   if (VIEW(it)) elm_wdg_item_cursor_unset(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
+   if (VIEW(it)) elm_wdg_item_cursor_unset(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    ELM_SAFE_FREE(it->mouse_cursor, eina_stringshare_del);
 }
@@ -7473,7 +7473,7 @@ _elm_genlist_elm_interface_scrollable_bounce_allow_set(Eo *obj, Elm_Genlist_Data
    sd->h_bounce = !!h_bounce;
    sd->v_bounce = !!v_bounce;
    elm_interface_scrollable_bounce_allow_set
-         (eo_super(obj, MY_CLASS), sd->h_bounce, sd->v_bounce);
+         (efl_super(obj, MY_CLASS), sd->h_bounce, sd->v_bounce);
 }
 
 EAPI void
@@ -7772,7 +7772,7 @@ _elm_genlist_elm_interface_scrollable_policy_set(Eo *obj, Elm_Genlist_Data *sd E
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -7790,7 +7790,7 @@ _elm_genlist_elm_interface_scrollable_policy_get(Eo *obj, Elm_Genlist_Data *sd E
    Elm_Scroller_Policy s_policy_h, s_policy_v;
 
    elm_interface_scrollable_policy_get
-         (eo_super(obj, MY_CLASS), &s_policy_h, &s_policy_v);
+         (efl_super(obj, MY_CLASS), &s_policy_h, &s_policy_v);
    if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h;
    if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v;
 }
@@ -7848,7 +7848,7 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it,
      {
         Elm_Gen_Item *it2 = NULL;
         eo_it2 = elm_genlist_selected_item_get(sd->obj);
-        if (eo_it2) it2 = eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
+        if (eo_it2) it2 = efl_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS);
         if (it2 && it2->realized)
           elm_genlist_item_selected_set(eo_it2, EINA_FALSE);
      }
@@ -8169,7 +8169,7 @@ _elm_genlist_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Ge
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    sel = elm_obj_genlist_item_selected_get(eo_it);
 
@@ -8194,7 +8194,7 @@ _elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Ite
    char *ret;
    Eina_Strbuf *buf;
 
-   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
    if (ret) return ret;
 
    buf = eina_strbuf_new();
@@ -8340,7 +8340,7 @@ _elm_genlist_search_by_text_item_get(Eo *obj EINA_UNUSED,
 #endif
 
    start = (item_to_search_from) ?
-   EINA_INLIST_GET((Elm_Gen_Item *)eo_data_scope_get(item_to_search_from, ELM_GENLIST_ITEM_CLASS)) :
+   EINA_INLIST_GET((Elm_Gen_Item *)efl_data_scope_get(item_to_search_from, ELM_GENLIST_ITEM_CLASS)) :
    sd->items;
    EINA_INLIST_FOREACH(start, it)
      {
@@ -8415,7 +8415,7 @@ _elm_genlist_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Genlist_Da
    EINA_INLIST_FOREACH(sd->items, it)
       ret = eina_list_append(ret, EO_OBJ(it));
 
-   ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_GENLIST_CLASS));
+   ret2 = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_GENLIST_CLASS));
 
    return eina_list_merge(ret, ret2);
 }
@@ -8425,7 +8425,7 @@ _elm_genlist_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Genlist_D
 {
    Elm_Atspi_State_Set ret;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_GENLIST_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_GENLIST_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS);
 
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index c49c7218d7..7816f37b52 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -56,7 +56,7 @@ _glayer_buf_dup(void *buf, size_t size)
   ((sd->gesture[T]) ? sd->gesture[T]->test : EINA_FALSE)
 
 #define ELM_GESTURE_LAYER_DATA_GET(o, sd) \
-  Elm_Gesture_Layer_Data * sd = eo_data_scope_get(o, MY_CLASS)
+  Elm_Gesture_Layer_Data * sd = efl_data_scope_get(o, MY_CLASS)
 
 #define ELM_GESTURE_LAYER_DATA_GET_OR_RETURN(o, ptr) \
   ELM_GESTURE_LAYER_DATA_GET(o, ptr);                \
@@ -77,7 +77,7 @@ _glayer_buf_dup(void *buf, size_t size)
     }
 
 #define ELM_GESTURE_LAYER_CHECK(obj)                                      \
-  if (!obj || !eo_isa(obj, MY_CLASS)) \
+  if (!obj || !efl_isa(obj, MY_CLASS)) \
     return
 
 /**
@@ -3736,7 +3736,7 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_
 EOLIAN static void
 _elm_gesture_layer_efl_canvas_group_group_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->line_min_length =
@@ -3810,21 +3810,21 @@ _elm_gesture_layer_efl_canvas_group_group_del(Eo *obj, Elm_Gesture_Layer_Data *s
    if (!elm_widget_disabled_get(obj))
      _callbacks_unregister(obj);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_gesture_layer_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_gesture_layer_efl_object_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index b921ed38c6..84b3f88e32 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -32,7 +32,7 @@ _elm_glview_elm_widget_on_focus(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED, Elm_O
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -88,7 +88,7 @@ _glview_update_surface(Evas_Object *obj)
 EOLIAN static void
 _elm_glview_efl_canvas_group_group_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    sd->resized = EINA_TRUE;
 
@@ -203,7 +203,7 @@ _set_render_policy_callback(Evas_Object *obj)
         if (evas_object_image_pixels_dirty_get(wd->resize_obj))
           sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(),
                                                                    EFL_LOOP_EVENT_IDLE_ENTER,
-                                                                   EO_CALLBACK_PRIORITY_BEFORE,
+                                                                   EFL_CALLBACK_PRIORITY_BEFORE,
                                                                    _render_cb,
                                                                    obj);
         // Unset the pixel getter callback if set already
@@ -230,7 +230,7 @@ _elm_glview_efl_canvas_group_group_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSE
    elm_widget_resize_object_set(obj, img, EINA_TRUE);
    evas_object_image_size_set(img, 1, 1);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -314,7 +314,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
    if (sd->config) evas_gl_config_free(sd->config);
    if (sd->evasgl) evas_gl_free(sd->evasgl);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -338,7 +338,7 @@ EAPI Evas_Object *
 elm_glview_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eo_self, EVAS_GL_GLES_2_X));
+   Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_self, EVAS_GL_GLES_2_X));
    return obj;
 }
 
@@ -346,7 +346,7 @@ EAPI Evas_Object *
 elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eo_self, version));
+   Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_self, version));
    return obj;
 }
 
@@ -373,7 +373,7 @@ _elm_glview_efl_object_finalize(Eo *obj, Elm_Glview_Data *sd)
         return NULL;
      }
 
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Evas_GL_API*
@@ -534,7 +534,7 @@ _elm_glview_draw_request(Eo *obj, Elm_Glview_Data *sd)
        !sd->render_idle_enterer)
      sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(),
                                                               EFL_LOOP_EVENT_IDLE_ENTER,
-                                                              EO_CALLBACK_PRIORITY_BEFORE,
+                                                              EFL_CALLBACK_PRIORITY_BEFORE,
                                                               _render_cb, obj);
 }
 
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 51e63dcad2..20c1060015 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -107,7 +107,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -127,7 +127,7 @@ _elm_grid_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
    elm_widget_resize_object_set(obj, grid, EINA_TRUE);
    evas_object_grid_size_set(wd->resize_obj, 100, 100);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -154,21 +154,21 @@ _elm_grid_efl_canvas_group_group_del(Eo *obj, void *_pd EINA_UNUSED)
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_grid_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_grid_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 479d90ab25..0e33cab50d 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -139,7 +139,7 @@ _elm_hover_left_space_calc(Elm_Hover_Data *sd,
    if (sd->parent)
      {
         evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
-        if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
+        if (efl_isa(sd->parent, EFL_UI_WIN_CLASS))
           {
              x = 0;
              y = 0;
@@ -294,7 +294,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
@@ -318,7 +318,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd)
    if (sd->parent)
      {
         evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
-        if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
+        if (efl_isa(sd->parent, EFL_UI_WIN_CLASS))
           {
              x = 0;
              y = 0;
@@ -352,7 +352,7 @@ _elm_hover_elm_widget_sub_object_add(Eo *obj, Elm_Hover_Data *sd, Evas_Object *s
 
    if (evas_object_data_get(sobj, "elm-parent") == obj) return EINA_TRUE;
 
-   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sd->smt_sub && sd->smt_sub->obj == sobj)
@@ -367,7 +367,7 @@ _elm_hover_elm_widget_sub_object_del(Eo *obj, Elm_Hover_Data *sd, Evas_Object *s
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sd->smt_sub && sd->smt_sub->obj == sobj)
@@ -438,7 +438,7 @@ _elm_hover_content_set(Eo *obj, Elm_Hover_Data *sd, const char *swallow, Evas_Ob
           }
      }
 
-   int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), swallow), content);
+   int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), swallow), content);
    if (!int_ret) return EINA_FALSE;
 
    if (strstr(swallow, "elm.swallow.slot."))
@@ -464,9 +464,9 @@ _elm_hover_content_get(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
    if (!swallow) return NULL;
 
    if (!strcmp(swallow, "smart"))
-     return efl_content_get(efl_part(eo_super(obj, MY_CLASS), sd->smt_sub->swallow));
+     return efl_content_get(efl_part(efl_super(obj, MY_CLASS), sd->smt_sub->swallow));
    else
-     return efl_content_get(efl_part(eo_super(obj, MY_CLASS), swallow));
+     return efl_content_get(efl_part(efl_super(obj, MY_CLASS), swallow));
 }
 
 static Evas_Object*
@@ -475,9 +475,9 @@ _elm_hover_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
    if (!swallow) return NULL;
 
    if (!strcmp(swallow, "smart"))
-     return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), sd->smt_sub->swallow));
+     return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), sd->smt_sub->swallow));
    else
-     return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), swallow));
+     return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), swallow));
 }
 
 static void
@@ -566,7 +566,7 @@ _hov_dismiss_cb(void *data,
 EOLIAN static void
 _elm_hover_efl_canvas_group_group_add(Eo *obj, Elm_Hover_Data *sd)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    ELM_HOVER_PARTS_FOREACH
@@ -612,13 +612,13 @@ _elm_hover_efl_canvas_group_group_del(Eo *obj, Elm_Hover_Data *sd)
    _elm_hover_parent_detach(obj);
    sd->parent = NULL;
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_hover_efl_canvas_group_group_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    elm_layout_sizing_eval(obj);
 }
@@ -626,7 +626,7 @@ _elm_hover_efl_canvas_group_group_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED,
 EOLIAN static void
 _elm_hover_efl_canvas_group_group_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    elm_layout_sizing_eval(obj);
 }
@@ -634,7 +634,7 @@ _elm_hover_efl_canvas_group_group_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSE
 EOLIAN static void
 _elm_hover_efl_canvas_group_group_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    _hov_show_do(obj);
 }
@@ -644,7 +644,7 @@ _elm_hover_efl_canvas_group_group_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
    const char *dismissstr;
 
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    // for backward compatibility
    dismissstr = elm_layout_data_get(obj, "dismiss");
@@ -663,14 +663,14 @@ EAPI Evas_Object *
 elm_hover_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 44df2c9301..05d4dc608d 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -298,7 +298,7 @@ static void
 _edje_signals_free(Elm_Icon_Data *sd)
 {
    Edje_Signal_Data *esd;
-   Efl_Ui_Image_Data *id = eo_data_scope_get(sd->obj, EFL_UI_IMAGE_CLASS);
+   Efl_Ui_Image_Data *id = efl_data_scope_get(sd->obj, EFL_UI_IMAGE_CLASS);
 
    EINA_LIST_FREE(sd->edje_signals, esd)
      {
@@ -316,7 +316,7 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
 {
    Evas_Object *pclip;
 
-   Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
+   Efl_Ui_Image_Data *id = efl_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
 
@@ -328,7 +328,7 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
    if (!sd->is_video)
      {
         Eina_Bool int_ret = EINA_FALSE;
-        int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, key);
+        int_ret = efl_file_set(efl_super(obj, MY_CLASS), file, key);
         return int_ret;
      }
 
@@ -374,7 +374,7 @@ _elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
    if (sd->stdicon)
      _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    return int_ret;
@@ -492,7 +492,7 @@ _elm_icon_thumb_resize_cb(void *data,
 EOLIAN static void
 _elm_icon_efl_canvas_group_group_add(Eo *obj, Elm_Icon_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->thumb.request = NULL;
@@ -517,7 +517,7 @@ _elm_icon_efl_canvas_group_group_del(Eo *obj, Elm_Icon_Data *sd)
 
    _edje_signals_free(sd);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 /* WARNING: to be deprecated */
@@ -527,7 +527,7 @@ _elm_icon_signal_emit(Evas_Object *obj,
                       const char *source)
 {
 
-   Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
+   Efl_Ui_Image_Data *id = efl_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
 
    if (!id->edje) return;
 
@@ -545,7 +545,7 @@ _elm_icon_signal_callback_add(Evas_Object *obj,
    Edje_Signal_Data *esd;
 
    ELM_ICON_DATA_GET(obj, sd);
-   Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
+   Efl_Ui_Image_Data *id = efl_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
 
    if (!id->edje) return;
 
@@ -576,7 +576,7 @@ _elm_icon_signal_callback_del(Evas_Object *obj,
    Eina_List *l;
 
    ELM_ICON_DATA_GET(obj, sd);
-   Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
+   Efl_Ui_Image_Data *id = efl_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
 
    if (!id->edje) return NULL;
 
@@ -607,14 +607,14 @@ EAPI Evas_Object *
 elm_icon_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_icon_efl_object_constructor(Eo *obj, Elm_Icon_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -648,7 +648,7 @@ elm_icon_memfile_set(Evas_Object *obj,
 
    _edje_signals_free(sd);
 
-   return elm_image_memfile_set(eo_super(obj, MY_CLASS), img, size, format, key);
+   return elm_image_memfile_set(efl_super(obj, MY_CLASS), img, size, format, key);
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 6643294a13..11739aee10 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -123,7 +123,7 @@ _elm_index_item_elm_widget_item_access_register(Eo *eo_item, Elm_Index_Item_Data
    Elm_Access_Info *ai;
 
    Evas_Object *ret = NULL;
-   ret = elm_wdg_item_access_register(eo_super(eo_item, ELM_INDEX_ITEM_CLASS));
+   ret = elm_wdg_item_access_register(efl_super(eo_item, ELM_INDEX_ITEM_CLASS));
 
    ai = _elm_access_info_get(it->base->access_obj);
 
@@ -456,7 +456,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
    else
      eina_stringshare_replace(&ld->group, "base/vertical");
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -541,14 +541,14 @@ _elm_index_item_efl_object_destructor(Eo *eo_item EINA_UNUSED, Elm_Index_Item_Da
    _item_free(it);
    _index_box_clear(WIDGET(it), sd->level);
 
-   efl_destructor(eo_super(eo_item, ELM_INDEX_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_INDEX_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
 _elm_index_item_efl_object_constructor(Eo *obj, Elm_Index_Item_Data *it)
 {
-   obj = efl_constructor(eo_super(obj, ELM_INDEX_ITEM_CLASS));
-   it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+   obj = efl_constructor(efl_super(obj, ELM_INDEX_ITEM_CLASS));
+   it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
    return obj;
@@ -564,7 +564,7 @@ _item_new(Evas_Object *obj,
 
    ELM_INDEX_DATA_GET(obj, sd);
 
-   eo_item = eo_add(ELM_INDEX_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_INDEX_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_INDEX_ITEM_DATA_GET(eo_item, it);
@@ -642,7 +642,7 @@ _sel_eval(Evas_Object *obj,
 
         EINA_LIST_FOREACH(sd->items, l, eo_item)
           {
-             it = eo_data_scope_get(eo_item, ELM_INDEX_ITEM_CLASS);
+             it = efl_data_scope_get(eo_item, ELM_INDEX_ITEM_CLASS);
              if (it->level != i) continue;
              if (it->level != sd->level)
                {
@@ -1051,7 +1051,7 @@ _elm_index_efl_canvas_group_group_add(Eo *obj, Elm_Index_Data *priv)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1134,7 +1134,7 @@ _elm_index_efl_canvas_group_group_del(Eo *obj, Elm_Index_Data *sd)
 
    ecore_timer_del(sd->delay);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_index_smart_focus_next_enable = EINA_FALSE;
@@ -1241,7 +1241,7 @@ EAPI Evas_Object *
 elm_index_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -1270,7 +1270,7 @@ EAPI Eina_Bool elm_index_horizontal_get(const Evas_Object *obj)
 EOLIAN static Eo *
 _elm_index_efl_object_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1737,7 +1737,7 @@ EOLIAN static Eina_List*
 _elm_index_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Index_Data *data)
 {
    Eina_List *ret;
-   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_INDEX_CLASS));
+   ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_INDEX_CLASS));
    return eina_list_merge(eina_list_clone(data->items), ret);
 }
 
@@ -1745,7 +1745,7 @@ EOLIAN static char*
 _elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Index_Item_Data *data)
 {
    char *name;
-   name = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_INDEX_ITEM_CLASS));
+   name = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS));
    if (name) return name;
 
    return data->letter ? strdup(data->letter) : NULL;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index a5f2d2f234..5bbfb48727 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -158,7 +158,7 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi
      }
    if (ret == (int)eina_list_count(children))
      {
-        ERR("Object %s not present in its AT-SPI parents (%s) children list! This should never happen.", eo_class_name_get(eo_class_get(obj)), eo_class_name_get(eo_class_get(parent)));
+        ERR("Object %s not present in its AT-SPI parents (%s) children list! This should never happen.", efl_class_name_get(efl_class_get(obj)), efl_class_name_get(efl_class_get(parent)));
         ret = -1;
      }
    eina_list_free(children);
@@ -173,28 +173,28 @@ _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_At
 
    do {
       parent = efl_parent_get(obj);
-      if (eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+      if (efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
         {
            type = elm_interface_atspi_accessible_type_get(parent);
            if (type != ELM_ATSPI_TYPE_SKIPPED) break;
         }
    } while (parent);
 
-   return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
+   return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
 }
 
 EOLIAN static void
 _elm_interface_atspi_accessible_parent_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Interface_Atspi_Accessible *new_parent EINA_UNUSED)
 {
    WRN("The %s object does not implement the \"accessible_parent_set\" function.",
-       eo_class_name_get(eo_class_get(obj)));
+       efl_class_name_get(efl_class_get(obj)));
 }
 
 EOLIAN Eina_List*
 _elm_interface_atspi_accessible_attributes_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED)
 {
    WRN("The %s object does not implement the \"accessible_attributes_set\" function.",
-       eo_class_name_get(eo_class_get(obj)));
+       efl_class_name_get(efl_class_get(obj)));
    return NULL;
 }
 
@@ -287,7 +287,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
 
    EINA_ITERATOR_FOREACH(iter, chld)
      {
-        if (eo_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+        if (efl_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
           children = eina_list_append(children, chld);
      }
    eina_iterator_free(iter);
@@ -325,9 +325,9 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
    Elm_Atspi_Event_Handler *hdl;
    Elm_Atspi_Type type;
 
-   if (!accessible || !event || !eo_isa(accessible, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+   if (!accessible || !event || !efl_isa(accessible, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
      {
-        CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? eo_class_name_get(accessible) : "NULL");
+        CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
         return;
      }
 
@@ -443,7 +443,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
    Elm_Atspi_Relation *rel;
    Eina_List *l;
 
-   if (!eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
+   if (!efl_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
      return EINA_FALSE;
 
    EINA_LIST_FOREACH(*set, l, rel)
@@ -572,7 +572,7 @@ EOLIAN Eo*
 _elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
 {
    if (!root)
-      root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+      root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    return root;
 }
diff --git a/src/lib/elementary/elm_interface_atspi_component.c b/src/lib/elementary/elm_interface_atspi_component.c
index 2d917d2708..e2d8ccab87 100644
--- a/src/lib/elementary/elm_interface_atspi_component.c
+++ b/src/lib/elementary/elm_interface_atspi_component.c
@@ -77,7 +77,7 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U
    EINA_LIST_FOREACH(children, l, child)
      {
         Eina_Bool contains;
-        if (eo_isa(child, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
+        if (efl_isa(child, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
           {
               contains = elm_interface_atspi_component_contains(child, screen_coords, x, y);
               if (contains)
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.c b/src/lib/elementary/elm_interface_atspi_widget_action.c
index 2061e35e69..05b895dcdd 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.c
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.c
@@ -48,7 +48,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo
    Elm_Config_Binding_Key *binding;
    int tmp = 0;
 
-   if (!eo_isa(obj, ELM_WIDGET_CLASS))
+   if (!efl_isa(obj, ELM_WIDGET_CLASS))
       return NULL;
 
    actions = elm_interface_atspi_widget_action_elm_actions_get(obj);
diff --git a/src/lib/elementary/elm_interface_fileselector.h b/src/lib/elementary/elm_interface_fileselector.h
index 98e4ba51f9..1c9b05c57d 100644
--- a/src/lib/elementary/elm_interface_fileselector.h
+++ b/src/lib/elementary/elm_interface_fileselector.h
@@ -9,7 +9,7 @@
 #endif
 
 #define ELM_FILESELECTOR_INTERFACE_CHECK(obj, ...) \
-  if (EINA_UNLIKELY(!eo_isa(obj, ELM_INTERFACE_FILESELECTOR_INTERFACE))) \
+  if (EINA_UNLIKELY(!efl_isa(obj, ELM_INTERFACE_FILESELECTOR_INTERFACE))) \
     { \
        ERR("The object (%p) doesn't implement the Elementary fileselector" \
             " interface", obj); \
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 453198b137..85f977cf19 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -13,7 +13,7 @@
 #define MY_PAN_CLASS_NAME_LEGACY "elm_pan"
 
 #define ELM_PAN_DATA_GET_OR_RETURN(o, ptr)                      \
-  Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS);       \
+  Elm_Pan_Smart_Data *ptr = efl_data_scope_get(o, MY_PAN_CLASS);       \
   if (!ptr)                                                     \
     {                                                           \
        CRI("No smart data for object %p (%s)",             \
@@ -22,7 +22,7 @@
     }
 
 #define ELM_PAN_DATA_GET_OR_RETURN_VAL(o, ptr, val)             \
-  Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS);       \
+  Elm_Pan_Smart_Data *ptr = efl_data_scope_get(o, MY_PAN_CLASS);       \
   if (!ptr)                                                     \
     {                                                           \
        CRI("No smart data for object %p (%s)",             \
@@ -106,7 +106,7 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd)
 EOLIAN static void
 _elm_pan_efl_canvas_group_group_add(Eo *obj, Elm_Pan_Smart_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_PAN_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_PAN_CLASS));
 
    priv->self = obj;
 }
@@ -116,7 +116,7 @@ _elm_pan_efl_canvas_group_group_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED
 {
    _elm_pan_content_set(obj, NULL);
 
-   efl_canvas_group_del(eo_super(obj, MY_PAN_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -141,7 +141,7 @@ _elm_pan_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *
 EOLIAN static void
 _elm_pan_efl_canvas_group_group_show(Eo *obj, Elm_Pan_Smart_Data *psd)
 {
-   efl_canvas_group_show(eo_super(obj, MY_PAN_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_PAN_CLASS));
 
    if (psd->content)
      evas_object_show(psd->content);
@@ -150,7 +150,7 @@ _elm_pan_efl_canvas_group_group_show(Eo *obj, Elm_Pan_Smart_Data *psd)
 EOLIAN static void
 _elm_pan_efl_canvas_group_group_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_PAN_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_PAN_CLASS));
 
    if (psd->content)
      evas_object_hide(psd->content);
@@ -226,14 +226,14 @@ _elm_pan_gravity_get(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, double *x, do
 static Evas_Object *
 _elm_pan_add(Evas *evas)
 {
-   Evas_Object *obj = eo_add(MY_PAN_CLASS, evas);
+   Evas_Object *obj = efl_add(MY_PAN_CLASS, evas);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_PAN_CLASS));
+   obj = efl_constructor(efl_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);
 
@@ -333,8 +333,8 @@ _elm_pan_class_constructor(Efl_Class *klass)
 
 #define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(o, ptr)     \
   Elm_Scrollable_Smart_Interface_Data *ptr =            \
-    (!eo_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL :       \
-     eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE));    \
+    (!efl_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL :       \
+     efl_data_scope_get(o, MY_SCROLLABLE_INTERFACE));    \
   if (!ptr)                                             \
     {                                                   \
        CRI("No interface data for object %p (%s)", \
@@ -344,8 +344,8 @@ _elm_pan_class_constructor(Efl_Class *klass)
 
 #define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   Elm_Scrollable_Smart_Interface_Data *ptr =                 \
-    (!eo_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL :            \
-     eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE));         \
+    (!efl_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL :            \
+     efl_data_scope_get(o, MY_SCROLLABLE_INTERFACE));         \
   if (!ptr)                                                  \
     {                                                        \
        CRI("No interface data for object %p (%s)",      \
@@ -4512,14 +4512,14 @@ _elm_interface_scrollable_efl_canvas_group_group_add(Eo *obj, Elm_Scrollable_Sma
 
    _elm_scroll_scroll_bar_reset(sid);
 
-   efl_canvas_group_add(eo_super(obj, MY_SCROLLABLE_INTERFACE));
+   efl_canvas_group_add(efl_super(obj, MY_SCROLLABLE_INTERFACE));
 }
 
 EOLIAN static void
 _elm_interface_scrollable_efl_canvas_group_group_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
 {
 
-   efl_canvas_group_del(eo_super(obj, MY_SCROLLABLE_INTERFACE));
+   efl_canvas_group_del(efl_super(obj, MY_SCROLLABLE_INTERFACE));
 
    elm_interface_scrollable_content_set(obj, NULL);
    if (!sid->extern_pan) evas_object_del(sid->pan_obj);
diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index 402e3069ee..aa95df6147 100644
--- a/src/lib/elementary/elm_interface_scrollable.h
+++ b/src/lib/elementary/elm_interface_scrollable.h
@@ -238,7 +238,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
 
 #define ELM_SCROLLABLE_CHECK(obj, ...)                                       \
                                                                              \
-  if (!eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN))                    \
+  if (!efl_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN))                    \
     {                                                                        \
        ERR("The object (%p) doesn't implement the Elementary scrollable"     \
             " interface", obj);                                              \
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 0cb4d34391..ae60d4fbef 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -68,7 +68,7 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm
 EOLIAN static void
 _elm_inwin_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -98,7 +98,7 @@ EAPI Evas_Object *
 elm_win_inwin_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -109,13 +109,13 @@ _elm_inwin_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 
    parent = efl_parent_get(obj);
 
-   if (parent && !eo_isa(parent, EFL_UI_WIN_CLASS))
+   if (parent && !efl_isa(parent, EFL_UI_WIN_CLASS))
      {
         ERR("Failed");
         return NULL;
      }
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 90e97e650b..2b0bdda57a 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -183,7 +183,7 @@ _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
 
    evas_event_freeze(evas_object_evas_get(obj));
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _label_format_set(wd->resize_obj, sd->format);
@@ -333,7 +333,7 @@ _elm_label_elm_layout_text_set(Eo *obj, Elm_Label_Data *sd, const char *part, co
    if (!label) label = "";
    _label_format_set(wd->resize_obj, sd->format);
 
-   int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
+   int_ret = elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
    if (int_ret)
      {
         sd->lastw = -1;
@@ -370,7 +370,7 @@ _elm_label_efl_canvas_group_group_add(Eo *obj, Elm_Label_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_sub_object_parent_add(obj);
 
@@ -407,14 +407,14 @@ EAPI Evas_Object *
 elm_label_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_label_efl_object_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index f05cc9fd6f..0502d6bcd0 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -389,7 +389,7 @@ _elm_layout_elm_widget_theme_apply(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
    /* The following lines are here to support entry design; the _theme function
     * of entry needs to call directly the widget _theme function */
@@ -433,7 +433,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
         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);
      }
-   if (eo_isa(wd->resize_obj, EDJE_OBJECT_CLASS))
+   if (efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS))
      edje_object_message_signal_process(wd->resize_obj);
 
    return EINA_TRUE;
@@ -513,7 +513,7 @@ _elm_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_U
 
    if (evas_object_data_get(sobj, "elm-parent") == obj) return EINA_TRUE;
 
-   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    Eina_Bool enable = EINA_TRUE;
@@ -541,7 +541,7 @@ _elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_O
      (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
      _on_sub_object_size_hint_change, obj);
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
    if (sd->destructed_is) return EINA_TRUE;
 
@@ -774,7 +774,7 @@ _elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -837,7 +837,7 @@ _elm_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
 
    sd->destructed_is = EINA_TRUE;
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 /* rewrite or extend this one on your derived class as to suit your
@@ -1178,7 +1178,7 @@ elm_layout_content_swallow_list_get(const Evas_Object *obj)
    ELM_LAYOUT_CHECK(obj) NULL;
    Eina_List *ret = NULL;
    Elm_Layout_Sub_Object_Data *sub_d = NULL;
-   Elm_Layout_Smart_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Elm_Layout_Smart_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Eina_List *l = NULL;
 
    EINA_LIST_FOREACH(sd->subs, l, sub_d)
@@ -1872,24 +1872,24 @@ _elm_layout_edje_object_can_access_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Dat
 EOLIAN static void
 _elm_layout_efl_object_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   efl_dbg_info_get(efl_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))
+   if (wd->resize_obj && efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS))
      {
-        Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+        Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
         const char *file, *edje_group;
         Evas_Object *edje_obj = wd->resize_obj;
 
         efl_file_get(edje_obj, &file, &edje_group);
-        EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
-        EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
+        EFL_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
+        EFL_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
 
         Edje_Load_Error error = EDJE_LOAD_ERROR_GENERIC;
         error = edje_obj_load_error_get(edje_obj);
         if (error != EDJE_LOAD_ERROR_NONE)
           {
-             EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
+             EFL_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
                                 edje_load_error_str(error));
           }
      }
@@ -1899,7 +1899,7 @@ EAPI Evas_Object *
 elm_layout_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -1907,7 +1907,7 @@ EOLIAN static Eo *
 _elm_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
    sd->obj = obj;
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -2022,12 +2022,12 @@ _elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd,
      return _elm_layout_pack_proxy_get((Eo *) obj, type, part);
 
    // Generic parts (text, anything, ...)
-   proxy = eo_add(ELM_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj);
-   pd = eo_data_scope_get(proxy, ELM_LAYOUT_INTERNAL_PART_CLASS);
+   proxy = efl_add(ELM_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj);
+   pd = efl_data_scope_get(proxy, ELM_LAYOUT_INTERNAL_PART_CLASS);
    if (pd)
      {
         pd->obj = (Eo *) obj;
-        pd->sd = eo_data_xref(pd->obj, ELM_LAYOUT_CLASS, proxy);
+        pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, proxy);
         pd->part = part ? strdup(part) : NULL;
         pd->temp = 1;
      }
diff --git a/src/lib/elementary/elm_layout_pack.c b/src/lib/elementary/elm_layout_pack.c
index 2c9676f06c..69a7363b60 100644
--- a/src/lib/elementary/elm_layout_pack.c
+++ b/src/lib/elementary/elm_layout_pack.c
@@ -55,11 +55,11 @@ Eo *
 _elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *part)
 {
    if (type == EDJE_PART_TYPE_BOX)
-     return eo_add(BOX_CLASS, obj,
-                   efl_ui_layout_internal_box_real_part_set(eo_self, obj, part));
+     return efl_add(BOX_CLASS, obj,
+                   efl_ui_layout_internal_box_real_part_set(efl_self, obj, part));
    else if (type == EDJE_PART_TYPE_TABLE)
-     return eo_add(TABLE_CLASS, obj,
-                   efl_ui_layout_internal_table_real_part_set(eo_self, obj, part));
+     return efl_add(TABLE_CLASS, obj,
+                   efl_ui_layout_internal_table_real_part_set(efl_self, obj, part));
    else
      return NULL;
 }
@@ -68,16 +68,16 @@ EOLIAN static void
 _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);
+   efl_data_xunref(pd->obj, pd->sd, obj);
    eina_stringshare_del(pd->part);
-   efl_destructor(eo_super(obj, BOX_CLASS));
+   efl_destructor(efl_super(obj, BOX_CLASS));
 }
 
 EOLIAN static void
 _efl_ui_layout_internal_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
 {
    pd->obj = layout;
-   pd->sd = eo_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj);
+   pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj);
    eina_stringshare_replace(&pd->part, part);
    pd->temp = 1;
 }
@@ -227,7 +227,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED
    Evas_Object_Box_Data *priv;
    Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
 
-   priv = eo_data_scope_get(pack, EVAS_BOX_CLASS);
+   priv = efl_data_scope_get(pack, EVAS_BOX_CLASS);
    opt = eina_list_nth(priv->children, index);
    if (!opt) ELM_PART_RETURN_VAL(NULL);
    ELM_PART_RETURN_VAL(opt->obj);
@@ -270,7 +270,7 @@ EOLIAN static void
 _efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
 {
    pd->obj = layout;
-   pd->sd = eo_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj);
+   pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj);
    eina_stringshare_replace(&pd->part, part);
    pd->temp = 1;
 }
@@ -279,9 +279,9 @@ EOLIAN static void
 _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);
+   efl_data_xunref(pd->obj, pd->sd, obj);
    eina_stringshare_del(pd->part);
-   efl_destructor(eo_super(obj, TABLE_CLASS));
+   efl_destructor(efl_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 6b3a8af100..a6d9804a18 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -654,7 +654,7 @@ _elm_list_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_List_Data *sd)
    EINA_LIST_FOREACH(sd->items, l, it)
      elm_wdg_item_translate(it);
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -747,7 +747,7 @@ _elm_list_content_min_limit_cb(Evas_Object *obj,
 static void
 _elm_list_mode_set_internal(Evas_Object *obj)
 {
-   Elm_List_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Elm_List_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    if (sd->mode == ELM_LIST_LIMIT)
      {
         if (!sd->h_mode)
@@ -1054,7 +1054,7 @@ EOLIAN static Eina_Bool
 _elm_list_elm_widget_disable(Eo *obj, Elm_List_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_disabled_get(obj))
@@ -1099,7 +1099,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
    Eina_List *n;
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -1226,7 +1226,7 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj, Elm_List_Item_Data *it)
      {
         while ((item_list = eina_list_next(item_list)))
           {
-             item = eo_data_scope_get(eina_list_data_get(item_list), ELM_LIST_ITEM_CLASS);
+             item = efl_data_scope_get(eina_list_data_get(item_list), ELM_LIST_ITEM_CLASS);
              if (!item) continue;
              evas_object_geometry_get(VIEW(item), &cx, &cy, &cw, &ch);
              if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, cx, cy, cw, ch) &&
@@ -1240,7 +1240,7 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj, Elm_List_Item_Data *it)
      {
         while ((item_list = eina_list_prev(item_list)))
           {
-             item = eo_data_scope_get(eina_list_data_get(item_list), ELM_LIST_ITEM_CLASS);
+             item = efl_data_scope_get(eina_list_data_get(item_list), ELM_LIST_ITEM_CLASS);
              if (!item) continue;
              evas_object_geometry_get(VIEW(item), &cx, &cy, &cw, &ch);
              if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, cx, cy, cw, ch) &&
@@ -1261,13 +1261,13 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd, Elm_Object_Item *item
    Elm_Object_Item *eo_it = NULL;
    Eina_Bool is_sel = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item)
      {
         Elm_Object_Item *sel = eina_list_data_get(sd->selected);
-        sd->last_selected_item = eo_data_scope_get(sel, ELM_LIST_ITEM_CLASS);
+        sd->last_selected_item = efl_data_scope_get(sel, ELM_LIST_ITEM_CLASS);
      }
 
    if (!sd->items) return EINA_FALSE;
@@ -1313,7 +1313,7 @@ _elm_list_elm_widget_sub_object_del(Eo *obj, Elm_List_Data *sd, Evas_Object *sob
    Elm_Object_Item *eo_it;
 
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if ((sobj == sd->box) || (sobj == obj)) goto end;
@@ -2128,7 +2128,7 @@ _elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
 
    if (elm_object_item_disabled_get(eo_it))
      return ret;
@@ -2148,7 +2148,7 @@ EOLIAN static char*
 _elm_list_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_List_Item_Data *data)
 {
    char *ret;
-   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
    if (ret) return ret;
    return data->label ? strdup(data->label) : NULL;
 }
@@ -2273,8 +2273,8 @@ _access_widget_item_register(Elm_List_Item_Data *it, Eina_Bool is_access)
 EOLIAN static Eo *
 _elm_list_item_efl_object_constructor(Eo *eo_it, Elm_List_Item_Data *it)
 {
-   eo_it = efl_constructor(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+   eo_it = efl_constructor(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
+   it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
    return eo_it;
@@ -2288,7 +2288,7 @@ _item_new(Evas_Object *obj,
           Evas_Smart_Cb func,
           const void *data)
 {
-   Eo *eo_it = eo_add(ELM_LIST_ITEM_CLASS, obj);
+   Eo *eo_it = efl_add(ELM_LIST_ITEM_CLASS, obj);
    if (!eo_it) return NULL;
    ELM_LIST_ITEM_DATA_GET(eo_it, it);
 
@@ -2393,7 +2393,7 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -2499,13 +2499,13 @@ _elm_list_efl_canvas_group_group_del(Eo *obj, Elm_List_Data *sd)
 
    sd->selected = eina_list_free(sd->selected);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_list_efl_canvas_group_group_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -2513,7 +2513,7 @@ _elm_list_efl_canvas_group_group_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x,
 EOLIAN static void
 _elm_list_efl_canvas_group_group_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -2521,7 +2521,7 @@ _elm_list_efl_canvas_group_group_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w
 EOLIAN static void
 _elm_list_efl_canvas_group_group_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -2545,14 +2545,14 @@ EAPI Evas_Object *
 elm_list_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_list_efl_object_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -2706,7 +2706,7 @@ _elm_list_elm_interface_scrollable_policy_set(Eo *obj, Elm_List_Data *sd EINA_UN
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -3189,7 +3189,7 @@ EOLIAN Eina_List*
 _elm_list_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_List_Data *pd)
 {
    Eina_List *ret;
-   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_LIST_CLASS));
+   ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_LIST_CLASS));
    return eina_list_merge(eina_list_clone(pd->items), ret);
 }
 
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 39d7dfffae..fd3169e479 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1516,7 +1516,7 @@ elm_object_focus_set(Evas_Object *obj,
         if (focus == elm_widget_focus_get(obj)) return;
 
         // ugly, but, special case for inlined windows
-        if (eo_isa(obj, EFL_UI_WIN_CLASS))
+        if (efl_isa(obj, EFL_UI_WIN_CLASS))
           {
              Evas_Object *inlined = elm_win_inlined_image_object_get(obj);
 
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index cd581e6019..f6ced5aa72 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3897,7 +3897,7 @@ _elm_map_elm_widget_on_focus(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_Object_
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -3919,8 +3919,8 @@ _elm_map_elm_widget_on_focus(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_Object_
 EOLIAN static void
 _elm_map_pan_efl_object_destructor(Eo *obj, Elm_Map_Pan_Data *psd)
 {
-   eo_data_unref(psd->wobj, psd->wsd);
-   efl_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_data_unref(psd->wobj, psd->wsd);
+   efl_destructor(efl_super(obj, MY_PAN_CLASS));
 }
 
 static void
@@ -3936,7 +3936,7 @@ _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
 
@@ -4046,7 +4046,7 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
      (obj, edje, "map", "base", elm_widget_style_get(obj));
@@ -4081,9 +4081,9 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
    elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
    elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
 
-   priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
-   pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
-   eo_data_ref(obj, NULL);
+   priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
+   pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
+   efl_data_ref(obj, NULL);
    pan_data->wobj = obj;
    pan_data->wsd = priv;
 
@@ -4200,13 +4200,13 @@ _elm_map_efl_canvas_group_group_del(Eo *obj, Elm_Map_Data *sd)
    evas_object_del(sd->pan_obj);
    sd->pan_obj = NULL;
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_map_efl_canvas_group_group_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -4214,7 +4214,7 @@ _elm_map_efl_canvas_group_group_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Ev
 EOLIAN static void
 _elm_map_efl_canvas_group_group_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -4222,7 +4222,7 @@ _elm_map_efl_canvas_group_group_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w,
 EOLIAN static void
 _elm_map_efl_canvas_group_group_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -4232,14 +4232,14 @@ EAPI Evas_Object *
 elm_map_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    sd->obj = obj;
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index d56bac36c7..cff0c92f7f 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -39,7 +39,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _sizing_eval(obj);
@@ -78,7 +78,7 @@ EOLIAN static Eina_Bool
 _elm_mapbuf_elm_widget_sub_object_del(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->content)
@@ -158,7 +158,7 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd)
 EOLIAN static void
 _elm_mapbuf_efl_canvas_group_group_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    _mapbuf_auto_eval(obj, sd);
    _mapbuf_auto_smooth(obj, sd);
@@ -168,7 +168,7 @@ _elm_mapbuf_efl_canvas_group_group_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_mapbuf_efl_canvas_group_group_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    if (sd->content) evas_object_resize(sd->content, w, h);
    _mapbuf_auto_eval(obj, sd);
@@ -178,7 +178,7 @@ _elm_mapbuf_efl_canvas_group_group_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coo
 EOLIAN static void
 _elm_mapbuf_efl_canvas_group_group_show(Eo *obj, Elm_Mapbuf_Data *sd)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    _mapbuf_auto_eval(obj, sd);
    _configure(obj);
@@ -187,7 +187,7 @@ _elm_mapbuf_efl_canvas_group_group_show(Eo *obj, Elm_Mapbuf_Data *sd)
 EOLIAN static void
 _elm_mapbuf_efl_canvas_group_group_hide(Eo *obj, Elm_Mapbuf_Data *sd)
 {
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    _mapbuf_auto_eval(obj, sd);
    _configure(obj);
@@ -269,7 +269,7 @@ _elm_mapbuf_efl_canvas_group_group_del(Eo *obj, Elm_Mapbuf_Data *priv)
    ELM_SAFE_FREE(priv->idler, ecore_idler_del);
    ELM_SAFE_FREE(priv->map, evas_map_free);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -280,7 +280,7 @@ _elm_mapbuf_efl_canvas_group_group_add(Eo *obj, Elm_Mapbuf_Data *priv)
 
    elm_widget_resize_object_set(obj, rect, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    evas_object_static_clip_set(rect, EINA_TRUE);
@@ -308,14 +308,14 @@ EAPI Evas_Object *
 elm_mapbuf_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_mapbuf_efl_object_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index b5c92dafa9..8a4db47055 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -119,7 +119,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it)
    evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2);
    evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh);
    evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph);
-   if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
+   if (efl_isa(sd->parent, EFL_UI_WIN_CLASS))
      {
         px = 0;
         py = 0;
@@ -185,7 +185,7 @@ _sizing_eval(Evas_Object *obj)
 
    evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
    evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
-   if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
+   if (efl_isa(sd->parent, EFL_UI_WIN_CLASS))
      {
         x2 = 0;
         y2 = 0;
@@ -209,7 +209,7 @@ _sizing_eval(Evas_Object *obj)
    evas_object_size_hint_max_set(sd->location, bw, h_p);
    elm_hover_target_set(sd->hv, sd->location);
 
-   hover = eo_data_scope_get(sd->hv, ELM_WIDGET_CLASS);
+   hover = efl_data_scope_get(sd->hv, ELM_WIDGET_CLASS);
    edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL,
                                  NULL, &bw, &bh);
    evas_object_size_hint_min_set(obj, bw, bh);
@@ -231,7 +231,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
    const char *s;
    char style[1024];
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (sd->menu_bar)
@@ -668,7 +668,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
 EOLIAN static void
 _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -715,7 +715,7 @@ _elm_menu_efl_canvas_group_group_del(Eo *obj, Elm_Menu_Data *sd)
    evas_object_del(sd->hv);
    evas_object_del(sd->location);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 void
@@ -776,7 +776,7 @@ EAPI Evas_Object *
 elm_menu_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -785,7 +785,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd)
 {
    Eo *parent = NULL;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    parent = efl_parent_get(obj);
@@ -814,7 +814,7 @@ _elm_menu_efl_object_destructor(Eo *obj, Elm_Menu_Data *sd)
    EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item)
      elm_wdg_item_del(eo_item);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EAPI void
@@ -991,14 +991,14 @@ _elm_menu_item_efl_object_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
    if (sd->dbus_menu)
      _elm_dbus_menu_item_delete(sd->dbus_menu, item->dbus_idx);
 
-   efl_destructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_MENU_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
 _elm_menu_item_efl_object_constructor(Eo *eo_item, Elm_Menu_Item_Data *item)
 {
-   eo_item = efl_constructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
-   item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+   eo_item = efl_constructor(efl_super(eo_item, ELM_MENU_ITEM_CLASS));
+   item->base = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
 }
@@ -1013,7 +1013,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
    elm_interface_atspi_accessible_type_set(icon_obj, ELM_ATSPI_TYPE_DISABLED);
    if (!icon_obj) return NULL;
 
-   eo_item = eo_add(ELM_MENU_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj);
    if (!eo_item)
      {
         evas_object_del(icon_obj);
@@ -1024,7 +1024,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
 
    WIDGET_ITEM_DATA_SET(eo_item, data);
    it->func = func;
-   it->parent = eo_data_scope_get(parent, ELM_MENU_ITEM_CLASS);
+   it->parent = efl_data_scope_get(parent, ELM_MENU_ITEM_CLASS);
    it->content = icon_obj;
 
    _item_obj_create(it);
@@ -1101,10 +1101,10 @@ _elm_menu_item_separator_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *eo_p_i
    ELM_MENU_ITEM_DATA_GET(eo_subitem, subitem);
    if (subitem->separator) return NULL;
 
-   eo_subitem = eo_add(ELM_MENU_ITEM_CLASS, obj);
+   eo_subitem = efl_add(ELM_MENU_ITEM_CLASS, obj);
    if (!eo_subitem) return NULL;
 
-   subitem = eo_data_scope_get(eo_subitem, ELM_MENU_ITEM_CLASS);
+   subitem = efl_data_scope_get(eo_subitem, ELM_MENU_ITEM_CLASS);
 
    subitem->separator = EINA_TRUE;
    _item_separator_obj_create(subitem);
@@ -1276,7 +1276,7 @@ EOLIAN static Eina_List*
 _elm_menu_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Menu_Data *sd)
 {
    Eina_List *ret;
-   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_MENU_CLASS));
+   ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_MENU_CLASS));
    return eina_list_merge(eina_list_clone(sd->items), ret);
 }
 
@@ -1302,7 +1302,7 @@ EOLIAN static char*
 _elm_menu_item_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Menu_Item_Data *sd)
 {
    char *ret;
-   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_MENU_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS));
    if (ret) return ret;
    return sd->label ? strdup(sd->label) : NULL;
 }
@@ -1311,7 +1311,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_menu_item_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
 {
    Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_MENU_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index eba87af592..9d923c41a1 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -131,7 +131,7 @@ _sizing_eval(Evas_Object *obj)
 
    if (!sd->parent) return;
    evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
-   if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
+   if (efl_isa(sd->parent, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;
@@ -144,7 +144,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -202,7 +202,7 @@ EOLIAN static Eina_Bool
 _elm_notify_elm_widget_sub_object_del(Eo *obj, Elm_Notify_Data *sd, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->content)
@@ -230,7 +230,7 @@ _elm_notify_efl_canvas_group_group_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coo
 {
    Evas_Coord x, y;
 
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    if (!sd->parent && sd->content)
      {
@@ -244,7 +244,7 @@ _elm_notify_efl_canvas_group_group_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord
 {
    Evas_Coord w, h;
 
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    if (!sd->parent && sd->content)
      {
@@ -286,7 +286,7 @@ _elm_notify_efl_canvas_group_group_show(Eo *obj, Elm_Notify_Data *sd)
 {
    sd->had_hidden = EINA_FALSE;
    sd->in_timeout = EINA_FALSE;
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    evas_object_show(sd->notify);
    if (!sd->allow_events) evas_object_show(sd->block_events);
@@ -310,7 +310,7 @@ _elm_notify_efl_canvas_group_group_hide(Eo *obj, Elm_Notify_Data *sd)
      }
    else //for backport supporting: edc without emitting hide finished signal
      {
-        efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+        efl_canvas_group_hide(efl_super(obj, MY_CLASS));
         evas_object_hide(sd->notify);
         if (sd->allow_events) evas_object_hide(sd->block_events);
      }
@@ -447,14 +447,14 @@ _hide_finished_cb(void *data,
    sd->had_hidden = EINA_TRUE;
    evas_object_hide(sd->notify);
    if (!sd->allow_events) evas_object_hide(sd->block_events);
-   efl_canvas_group_hide(eo_super(data, MY_CLASS));
+   efl_canvas_group_hide(efl_super(data, MY_CLASS));
    efl_event_callback_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
 }
 
 EOLIAN static void
 _elm_notify_efl_canvas_group_group_add(Eo *obj, Elm_Notify_Data *priv)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->allow_events = EINA_TRUE;
@@ -479,21 +479,21 @@ _elm_notify_efl_canvas_group_group_del(Eo *obj, Elm_Notify_Data *sd)
    ecore_timer_del(sd->timer);
 
    ELM_SAFE_FREE(sd->notify, evas_object_del);
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_notify_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_notify_efl_object_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 9ef0aa0e91..826e8c3f22 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -46,7 +46,7 @@ _mirrored_set(Evas_Object *obj,
 {
    ELM_PANEL_DATA_GET(obj, sd);
 
-   if ((sd->content) && (eo_isa(sd->content, ELM_WIDGET_CLASS)))
+   if ((sd->content) && (efl_isa(sd->content, ELM_WIDGET_CLASS)))
      elm_widget_mirrored_set(sd->content, rtl);
    elm_panel_orient_set(obj, elm_panel_orient_get(obj));
 }
@@ -215,7 +215,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -249,7 +249,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
         evas_object_size_hint_min_set(sd->event, minw, minh);
 
         if (edje_object_part_exists(wd->resize_obj, "elm.swallow.event"))
-          efl_content_set(efl_part(eo_super(obj, MY_CLASS), "elm.swallow.event"), sd->event);
+          efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.event"), sd->event);
      }
 
    elm_layout_sizing_eval(obj);
@@ -925,7 +925,7 @@ _elm_panel_content_set(Eo *obj, Elm_Panel_Data *sd, const char *part, Evas_Objec
         if (strcmp(part, "default"))
           {
              Eina_Bool int_ret = EINA_TRUE;
-             int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+             int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
              return int_ret;
           }
      }
@@ -961,7 +961,7 @@ _elm_panel_content_get(Eo *obj, Elm_Panel_Data *sd, const char *part)
         if (strcmp(part, "default"))
           {
              Evas_Object *ret = NULL;
-             ret = efl_content_get(efl_part(eo_super(obj, MY_CLASS), part));
+             ret = efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
              return ret;
           }
      }
@@ -984,7 +984,7 @@ _elm_panel_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part)
           }
         if (strcmp(part, "default"))
           {
-             ret = efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part));
+             ret = efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
              return ret;
           }
      }
@@ -1005,7 +1005,7 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -1041,7 +1041,7 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
 
              elm_coords_finger_size_adjust(1, &minw, 1, &minh);
              evas_object_size_hint_min_set(priv->event, minw, minh);
-             efl_content_set(efl_part(eo_super(obj, MY_CLASS), "elm.swallow.event"), priv->event);
+             efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.event"), priv->event);
           }
      }
 
@@ -1072,13 +1072,13 @@ _elm_panel_efl_canvas_group_group_del(Eo *obj, Elm_Panel_Data *sd)
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_panel_efl_canvas_group_group_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -1103,7 +1103,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
 EOLIAN static void
 _elm_panel_efl_canvas_group_group_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    if (!sd->scrollable) return;
 
@@ -1133,7 +1133,7 @@ _elm_panel_efl_canvas_group_group_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_panel_efl_canvas_group_group_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect) evas_object_raise(sd->hit_rect);
 }
@@ -1162,7 +1162,7 @@ EAPI Evas_Object *
 elm_panel_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
    wd->highlight_root = EINA_TRUE;
@@ -1173,7 +1173,7 @@ elm_panel_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_panel_efl_object_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1323,7 +1323,7 @@ EOLIAN static Eina_Bool
 _elm_panel_elm_widget_disable(Eo *obj, Elm_Panel_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->scrollable)
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 48bf4da524..95978aad9b 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -61,7 +61,7 @@ _elm_panes_elm_widget_theme_apply(Eo *obj, Elm_Panes_Data *sd)
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
    evas_object_size_hint_min_set(sd->event, minw, minh);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    size = elm_panes_content_left_size_get(obj);
@@ -267,7 +267,7 @@ _elm_panes_efl_canvas_group_group_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    ELM_PANES_DATA_GET(obj, sd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -323,14 +323,14 @@ EAPI Evas_Object *
 elm_panes_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_panes_efl_object_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index eaf45c4a45..de8e443572 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -6,7 +6,7 @@
 //#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0)
 #define ELM_PART_HOOK
 
-#define ELM_PART_REF(obj, pd) do { if (!(pd->temp++)) eo_ref(obj); } while(0)
+#define ELM_PART_REF(obj, pd) do { if (!(pd->temp++)) efl_ref(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)
@@ -30,8 +30,8 @@ _ ## type ## _internal_part_efl_object_destructor(Eo *obj, partdata *pd) \
 { \
    ELM_PART_HOOK; \
    free(pd->part); \
-   eo_data_xunref(pd->obj, pd->sd, obj); \
-   efl_destructor(eo_super(obj, TYPE ## _INTERNAL_PART_CLASS)); \
+   efl_data_xunref(pd->obj, pd->sd, obj); \
+   efl_destructor(efl_super(obj, TYPE ## _INTERNAL_PART_CLASS)); \
 } \
 
 // Main part proxy implementation
@@ -43,12 +43,12 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
    partdata *pd; \
    Eo *proxy; \
 \
-   proxy = eo_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \
-   pd = eo_data_scope_get(proxy, TYPE ## _INTERNAL_PART_CLASS); \
+   proxy = efl_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \
+   pd = efl_data_scope_get(proxy, TYPE ## _INTERNAL_PART_CLASS); \
    if (pd) \
      { \
         pd->obj = (Eo *) obj; \
-        pd->sd = eo_data_xref(pd->obj, TYPE ## _CLASS, proxy); \
+        pd->sd = efl_data_xref(pd->obj, TYPE ## _CLASS, proxy); \
         pd->part = part ? strdup(part) : NULL; \
         pd->temp = 1; \
      } \
@@ -85,12 +85,12 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
    partdata *pd; \
    Eo *proxy; \
 \
-   proxy = eo_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \
-   pd = eo_data_scope_get(proxy, SUPER ## _INTERNAL_PART_CLASS); \
+   proxy = efl_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \
+   pd = efl_data_scope_get(proxy, SUPER ## _INTERNAL_PART_CLASS); \
    if (pd) \
      { \
         pd->obj = (Eo *) obj; \
-        pd->sd = eo_data_xref(pd->obj, SUPER ## _CLASS, proxy); \
+        pd->sd = efl_data_xref(pd->obj, SUPER ## _CLASS, proxy); \
         pd->part = part ? strdup(part) : NULL; \
         pd->temp = 1; \
      } \
@@ -102,8 +102,8 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
 static EOLIAN Eina_Bool \
 _ ## type ## _internal_part_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) \
 { \
-   partdata *pd = eo_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \
-   typedata *sd = eo_data_scope_get(pd->obj, TYPE ## _CLASS); \
+   partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \
+   typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
    ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, sd, pd->part, content)); \
 }
 
@@ -111,8 +111,8 @@ _ ## type ## _internal_part_efl_container_content_set(Eo *obj, void *_pd EINA_UN
 static EOLIAN Efl_Gfx * \
 _ ## type ## _internal_part_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) \
 { \
-   partdata *pd = eo_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \
-   typedata *sd = eo_data_scope_get(pd->obj, TYPE ## _CLASS); \
+   partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \
+   typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
    ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, sd, pd->part)); \
 }
 
@@ -120,8 +120,8 @@ _ ## type ## _internal_part_efl_container_content_get(Eo *obj, void *_pd EINA_UN
 static EOLIAN Efl_Gfx * \
 _ ## type ## _internal_part_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) \
 { \
-   partdata *pd = eo_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \
-   typedata *sd = eo_data_scope_get(pd->obj, TYPE ## _CLASS); \
+   partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \
+   typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
    ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, sd, pd->part)); \
 }
 
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index b640a0b3cb..f0e1ee9725 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -53,7 +53,7 @@ _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    edje_object_mirrored_set
@@ -245,7 +245,7 @@ _elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -289,21 +289,21 @@ _elm_photo_efl_canvas_group_group_del(Eo *obj, Elm_Photo_Data *sd)
 {
    ecore_timer_del(sd->long_press_timer);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_photo_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_photo_efl_object_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 3c9166b68b..4bdda88616 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -416,8 +416,8 @@ _elm_photocam_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Photocam_Pan
 EOLIAN static void
 _elm_photocam_pan_efl_object_destructor(Eo *obj, Elm_Photocam_Pan_Data *psd)
 {
-   eo_data_unref(psd->wobj, psd->wsd);
-   efl_destructor(eo_super(obj, MY_PAN_CLASS));
+   efl_data_unref(psd->wobj, psd->wsd);
+   efl_destructor(efl_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -854,7 +854,7 @@ _elm_photocam_elm_widget_on_focus(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, E
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -877,7 +877,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_photocam_elm_widget_theme_apply(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _sizing_eval(obj);
@@ -1205,7 +1205,7 @@ static Evas_Event_Flags
 _g_layer_zoom_move_cb(void *data,
                       void *event_info)
 {
-   Elm_Photocam_Data *sd = eo_data_scope_get(data, MY_CLASS);
+   Elm_Photocam_Data *sd = efl_data_scope_get(data, MY_CLASS);
    Elm_Gesture_Zoom_Info *p = event_info;
 
    _g_layer_zoom_do(data, sd->zoom_point_x, sd->zoom_point_y, p);
@@ -1385,7 +1385,7 @@ _elm_photocam_efl_canvas_group_group_add(Eo *obj, Elm_Photocam_Data *priv)
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
       (obj, edje, "photocam", "base", elm_widget_style_get(obj));
@@ -1411,9 +1411,9 @@ _elm_photocam_efl_canvas_group_group_add(Eo *obj, Elm_Photocam_Data *priv)
 
    elm_interface_scrollable_bounce_allow_set(obj, bounce, bounce);
 
-   priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
-   pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
-   eo_data_ref(obj, NULL);
+   priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
+   pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
+   efl_data_ref(obj, NULL);
    pan_data->wobj = obj;
    pan_data->wsd = priv;
 
@@ -1470,13 +1470,13 @@ _elm_photocam_efl_canvas_group_group_del(Eo *obj, Elm_Photocam_Data *sd)
    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));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_photocam_efl_canvas_group_group_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -1484,7 +1484,7 @@ _elm_photocam_efl_canvas_group_group_move(Eo *obj, Elm_Photocam_Data *sd, Evas_C
 EOLIAN static void
 _elm_photocam_efl_canvas_group_group_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -1493,7 +1493,7 @@ EOLIAN static void
 _elm_photocam_efl_canvas_group_group_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member)
 {
 
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -1503,14 +1503,14 @@ EAPI Evas_Object *
 elm_photocam_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_photocam_efl_object_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1587,7 +1587,7 @@ static void
 _elm_photocam_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *download)
 {
    Eo *obj = data;
-   Elm_Photocam_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Elm_Photocam_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Eina_File *f;
    size_t length;
    Evas_Load_Error ret = EVAS_LOAD_ERROR_NONE;
@@ -1623,7 +1623,7 @@ static void
 _elm_photocam_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
 {
    Eo *obj = data;
-   Elm_Photocam_Data *sd = eo_data_scope_get(obj, MY_CLASS);
+   Elm_Photocam_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Elm_Photocam_Error err = { error, EINA_FALSE };
 
    efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
@@ -2105,7 +2105,7 @@ _elm_photocam_elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Photocam_Dat
    _elm_photocam_bounce_reset(obj, sd);
    _elm_photocam_zoom_reset(obj, sd);
 
-   elm_interface_scrollable_region_bring_in(eo_super(obj, MY_CLASS), rx, ry, rw, rh);
+   elm_interface_scrollable_region_bring_in(efl_super(obj, MY_CLASS), rx, ry, rw, rh);
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 62adb0156f..957a994a0a 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -65,7 +65,7 @@ _elm_plug_elm_widget_on_focus(Eo *obj, void *sd EINA_UNUSED, Elm_Object_Item *it
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -84,7 +84,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _sizing_eval(obj);
@@ -113,7 +113,7 @@ _elm_plug_efl_canvas_group_group_add(Eo *obj, void *sd EINA_UNUSED)
    Ecore_Evas *ee;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
@@ -136,14 +136,14 @@ EAPI Evas_Object *
 elm_plug_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_plug_efl_object_constructor(Eo *obj, void *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index ca2f1e2511..ac5214f67a 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -48,7 +48,7 @@ static Eina_Bool _prefs_item_widget_value_from_self(Elm_Prefs_Item_Node *,
 EOLIAN static void
 _elm_prefs_efl_canvas_group_group_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 }
 
@@ -469,7 +469,7 @@ _elm_prefs_efl_canvas_group_group_del(Eo *obj, Elm_Prefs_Data *sd)
    eina_stringshare_del(sd->file);
    eina_stringshare_del(sd->page);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -508,14 +508,14 @@ elm_prefs_add(Evas_Object *parent)
         return NULL;
      }
 
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_prefs_efl_object_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c
index 153d59ae6a..99f375dd38 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/elm_progressbar.c
@@ -166,7 +166,7 @@ EOLIAN static Eina_Bool
 _elm_progressbar_elm_widget_sub_object_del(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -181,7 +181,7 @@ static Eina_Bool
 _elm_progressbar_content_set(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+   int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -200,7 +200,7 @@ _elm_progressbar_elm_widget_theme_apply(Eo *obj, Elm_Progressbar_Data *sd)
      eina_stringshare_replace(&ld->group, "horizontal");
    else eina_stringshare_replace(&ld->group, "vertical");
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (sd->pulse)
@@ -283,7 +283,7 @@ _elm_progressbar_efl_canvas_group_group_add(Eo *obj, Elm_Progressbar_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->orientation = EFL_ORIENT_RIGHT;
@@ -332,7 +332,7 @@ _elm_progressbar_efl_canvas_group_group_del(Eo *obj, Elm_Progressbar_Data *sd)
            }
       }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
@@ -351,14 +351,14 @@ EAPI Evas_Object *
 elm_progressbar_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_progressbar_efl_object_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index 3306272438..c23087b01e 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -168,7 +168,7 @@ _elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, ELM_CHECK_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, ELM_CHECK_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
@@ -224,7 +224,7 @@ _elm_radio_efl_canvas_group_group_add(Eo *obj, Elm_Radio_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, ELM_CHECK_CLASS));
+   efl_canvas_group_add(efl_super(obj, ELM_CHECK_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
@@ -255,7 +255,7 @@ _elm_radio_efl_canvas_group_group_del(Eo *obj, Elm_Radio_Data *sd)
    sd->group->radios = eina_list_remove(sd->group->radios, obj);
    if (!sd->group->radios) free(sd->group);
 
-   efl_canvas_group_del(eo_super(obj, ELM_CHECK_CLASS));
+   efl_canvas_group_del(efl_super(obj, ELM_CHECK_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
@@ -268,14 +268,14 @@ EAPI Evas_Object *
 elm_radio_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_radio_efl_object_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -400,7 +400,7 @@ _elm_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Radio_Data
 {
    Elm_Atspi_State_Set ret;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_RADIO_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_RADIO_CLASS));
    if (obj == elm_radio_selected_object_get(obj))
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED);
 
diff --git a/src/lib/elementary/elm_removed.h b/src/lib/elementary/elm_removed.h
index 2d0e0c25e4..31dea6600d 100644
--- a/src/lib/elementary/elm_removed.h
+++ b/src/lib/elementary/elm_removed.h
@@ -3576,7 +3576,7 @@ EINA_DEPRECATED EAPI Eina_Bool                    elm_toolbar_item_cursor_engine
  * the player itself.
  *
  * @see elm_player_add()
- * @see elm_video_add()
+ * @see elm_videfl_add()
  * @deprecated use elm_object_part_content_set() instead
  *
  */
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index b7659529df..d68044074b 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -90,7 +90,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    //TODO
@@ -137,7 +137,7 @@ EOLIAN static void
 _elm_route_efl_canvas_group_group_add(Eo *obj, Elm_Route_Data *priv)
 {
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -163,7 +163,7 @@ _elm_route_efl_canvas_group_group_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
    _clear_route(obj);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 /**
@@ -178,14 +178,14 @@ EAPI Evas_Object *
 elm_route_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_route_efl_object_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 076df9ba19..cdc4e16670 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -384,7 +384,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -545,7 +545,7 @@ EOLIAN static Eina_Bool
 _elm_scroller_elm_widget_sub_object_del(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->content)
@@ -769,7 +769,7 @@ _elm_scroller_content_set(Eo *obj, Elm_Scroller_Data *sd, const char *part, Evas
 {
    if (part && strcmp(part, "default"))
      {
-        return efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content);
+        return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
      }
 
    if (sd->content == content) return EINA_TRUE;
@@ -812,7 +812,7 @@ _elm_scroller_content_get(Eo *obj, Elm_Scroller_Data *sd, const char *part)
 {
    if (part && strcmp(part, "default"))
      {
-        return efl_content_get(efl_part(eo_super(obj, MY_CLASS), part));
+        return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
      }
 
    return sd->content;
@@ -824,7 +824,7 @@ _elm_scroller_content_unset(Eo *obj, Elm_Scroller_Data *sd, const char *part)
    Evas_Object *ret = NULL;
    if (part && strcmp(part, "default"))
      {
-        return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part));
+        return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
      }
 
    if (!sd->content) return NULL;
@@ -867,7 +867,7 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Evas_Coord minw, minh;
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -921,7 +921,7 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv)
 EOLIAN static void
 _elm_scroller_efl_canvas_group_group_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -929,7 +929,7 @@ _elm_scroller_efl_canvas_group_group_move(Eo *obj, Elm_Scroller_Data *sd, Evas_C
 EOLIAN static void
 _elm_scroller_efl_canvas_group_group_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -937,7 +937,7 @@ _elm_scroller_efl_canvas_group_group_resize(Eo *obj, Elm_Scroller_Data *sd, Evas
 EOLIAN static void
 _elm_scroller_efl_canvas_group_group_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -947,14 +947,14 @@ EAPI Evas_Object *
 elm_scroller_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_scroller_efl_object_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1014,7 +1014,7 @@ _elm_scroller_elm_interface_scrollable_policy_set(Eo *obj, Elm_Scroller_Data *sd
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
+   elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -1041,7 +1041,7 @@ _elm_scroller_elm_interface_scrollable_single_direction_set(Eo *obj, Elm_Scrolle
    if (single_dir >= ELM_SCROLLER_SINGLE_DIRECTION_LAST)
      return;
 
-   elm_interface_scrollable_single_direction_set(eo_super(obj, MY_CLASS), single_dir);
+   elm_interface_scrollable_single_direction_set(efl_super(obj, MY_CLASS), single_dir);
 }
 
 EAPI Elm_Scroller_Single_Direction
@@ -1057,7 +1057,7 @@ elm_scroller_single_direction_get(const Evas_Object *obj)
 EOLIAN static Elm_Scroller_Single_Direction
 _elm_scroller_elm_interface_scrollable_single_direction_get(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
 {
-   return elm_interface_scrollable_single_direction_get(eo_super(obj, MY_CLASS));
+   return elm_interface_scrollable_single_direction_get(efl_super(obj, MY_CLASS));
 }
 
 EAPI void
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 51b56e4727..baaf53164b 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -32,7 +32,7 @@ _elm_segment_control_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Segment_Contr
    EINA_LIST_FOREACH(sd->items, l, it)
      elm_wdg_item_translate(it);
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -221,7 +221,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
    Elm_Object_Item *eo_item;
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    rtl = elm_widget_mirrored_get(obj);
@@ -246,7 +246,7 @@ EOLIAN static Eina_Bool
 _elm_segment_control_elm_widget_disable(Eo *obj, Elm_Segment_Control_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _update_list(sd);
@@ -499,7 +499,7 @@ _elm_segment_control_item_efl_object_destructor(Eo *eo_item, Elm_Segment_Control
    _item_free(item);
    _update_list(sd);
 
-   efl_destructor(eo_super(eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS));
 }
 
 static char *
@@ -539,7 +539,7 @@ _elm_segment_control_item_elm_widget_item_access_register(Eo *eo_it EINA_UNUSED,
    Elm_Access_Info *ai;
    Evas_Object *ret;
 
-   ret = elm_wdg_item_access_register(eo_super(eo_it, ELM_SEGMENT_CONTROL_ITEM_CLASS));
+   ret = elm_wdg_item_access_register(efl_super(eo_it, ELM_SEGMENT_CONTROL_ITEM_CLASS));
 
    ai = _elm_access_info_get(it->base->access_obj);
 
@@ -557,7 +557,7 @@ _item_new(Evas_Object *obj,
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_SEGMENT_CONTROL_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_SEGMENT_CONTROL_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_SEGMENT_ITEM_DATA_GET(eo_item, it);
@@ -588,8 +588,8 @@ _item_new(Evas_Object *obj,
 EOLIAN static Eo *
 _elm_segment_control_item_efl_object_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it)
 {
-   obj = efl_constructor(eo_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS));
-   it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+   obj = efl_constructor(efl_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS));
+   it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *parent;
    parent = efl_parent_get(obj);
@@ -611,7 +611,7 @@ EOLIAN static void
 _elm_segment_control_efl_canvas_group_group_add(Eo *obj, Elm_Segment_Control_Data *sd)
 {
    sd->obj = obj;
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -636,7 +636,7 @@ _elm_segment_control_efl_canvas_group_group_del(Eo *obj, Elm_Segment_Control_Dat
         efl_del(eo_it);
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_segment_control_smart_focus_next_enable = EINA_FALSE;
@@ -697,14 +697,14 @@ EAPI Evas_Object *
 elm_segment_control_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_segment_control_efl_object_constructor(Eo *obj, Elm_Segment_Control_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index 75e175ce39..ff49649768 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -26,7 +26,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
    else
      eina_stringshare_replace(&ld->group, "vertical");
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    return int_ret;
@@ -47,7 +47,7 @@ _elm_separator_elm_layout_sizing_eval(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
 EOLIAN static void
 _elm_separator_efl_canvas_group_group_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -64,7 +64,7 @@ EAPI Evas_Object *
 elm_separator_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -97,7 +97,7 @@ elm_separator_horizontal_get(const Evas_Object *obj)
 EOLIAN static Eo *
 _elm_separator_efl_object_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 78f74a4d96..24ed47c40b 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -778,7 +778,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
                          elm_widget_style_get(obj));
      }
 
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (sd->popup)
@@ -1141,7 +1141,7 @@ _elm_slider_efl_canvas_group_group_add(Eo *obj, Elm_Slider_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->orientation = EFL_ORIENT_RIGHT;
@@ -1211,7 +1211,7 @@ _elm_slider_efl_canvas_group_group_del(Eo *obj, Elm_Slider_Data *sd)
    evas_object_del(sd->popup);
    evas_object_del(sd->popup2);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
@@ -1278,14 +1278,14 @@ EAPI Evas_Object *
 elm_slider_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_slider_efl_object_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1611,7 +1611,7 @@ _elm_slider_elm_widget_on_focus(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Elm_Ob
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
 
    if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj))
      _popup_show(obj, NULL, NULL, NULL);
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index d6a2a65683..e85613993d 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -315,7 +315,7 @@ _elm_slideshow_item_efl_object_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *
    if ((VIEW(item)) && (item->itc->func.del))
      item->itc->func.del(elm_object_item_data_get(eo_item), VIEW(item));
 
-   efl_destructor(eo_super(eo_item, ELM_SLIDESHOW_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_SLIDESHOW_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -323,7 +323,7 @@ _elm_slideshow_efl_canvas_group_group_add(Eo *obj, Elm_Slideshow_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->count_item_pre_before = 2;
@@ -374,21 +374,21 @@ _elm_slideshow_efl_canvas_group_group_del(Eo *obj, Elm_Slideshow_Data *sd)
    EINA_LIST_FREE(sd->layout.list, layout)
      eina_stringshare_del(layout);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_slideshow_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_slideshow_efl_object_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -399,8 +399,8 @@ _elm_slideshow_efl_object_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUS
 EOLIAN static Eo *
 _elm_slideshow_item_efl_object_constructor(Eo *obj, Elm_Slideshow_Item_Data *it)
 {
-   obj = efl_constructor(eo_super(obj, ELM_SLIDESHOW_ITEM_CLASS));
-   it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+   obj = efl_constructor(efl_super(obj, ELM_SLIDESHOW_ITEM_CLASS));
+   it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
 }
@@ -410,7 +410,7 @@ _elm_slideshow_item_add(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Slideshow_Ite
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_SLIDESHOW_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_SLIDESHOW_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_SLIDESHOW_ITEM_DATA_GET(eo_item, item);
@@ -431,7 +431,7 @@ _elm_slideshow_item_sorted_insert(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Sli
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_SLIDESHOW_ITEM_CLASS, obj);
+   eo_item = efl_add(ELM_SLIDESHOW_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_SLIDESHOW_ITEM_DATA_GET(eo_item, item);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index d75ba8c466..72c30822f1 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -56,7 +56,7 @@ static const Elm_Action key_actions[] = {
    {NULL, NULL}
 };
 
-EO_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
+EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
    { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb},
    { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb},
    { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
@@ -913,7 +913,7 @@ _elm_spinner_elm_widget_on_focus(Eo *obj, Elm_Spinner_Data *sd, Elm_Object_Item
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (!elm_widget_focus_get(obj))
@@ -1159,7 +1159,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    ELM_SPINNER_DATA_GET(obj, sd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->val_max = 100.0;
@@ -1255,7 +1255,7 @@ _elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd)
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Elm_Theme_Apply
@@ -1411,7 +1411,7 @@ EAPI Evas_Object *
 elm_spinner_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -1466,7 +1466,7 @@ elm_spinner_value_get(const Evas_Object *obj)
 EOLIAN static Eo *
 _elm_spinner_efl_object_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -1757,7 +1757,7 @@ EOLIAN static char*
 _elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED)
 {
    char *name;
-   name = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_SPINNER_CLASS));
+   name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_SPINNER_CLASS));
    if (name) return name;
    const char *ret = elm_layout_text_get(obj, "elm.text");
    return ret ? strdup(ret) : NULL;
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index 61d634b6fd..0b3597275e 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -68,7 +68,7 @@ _elm_sys_notify_efl_object_constructor(Eo                  *obj,
         return NULL;
      }
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    _singleton = obj;
 
    return obj;
@@ -78,7 +78,7 @@ EOLIAN static void
 _elm_sys_notify_efl_object_destructor(Eo                  *obj,
                                    Elm_Sys_Notify_Data *sd  EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
    _singleton = NULL;
 }
 
@@ -169,7 +169,7 @@ _elm_sys_notify_servers_set(Eo                     *obj  EINA_UNUSED,
                        return EINA_FALSE;
                     }
 
-                  sd->servers[i] = eo_add(class_get(), NULL);
+                  sd->servers[i] = efl_add(class_get(), NULL);
                   if (EINA_UNLIKELY(!(sd->servers[i])))
                     {
                        CRI("Failed to create notification server");
@@ -201,7 +201,7 @@ _elm_sys_notify_singleton_get(Eo   *obj EINA_UNUSED,
                               void *sd  EINA_UNUSED)
 {
    if (!_singleton)
-     _singleton = eo_add(MY_CLASS, NULL);
+     _singleton = efl_add(MY_CLASS, NULL);
    return _singleton;
 }
 
diff --git a/src/lib/elementary/elm_sys_notify_dbus.c b/src/lib/elementary/elm_sys_notify_dbus.c
index 98a48e83e8..0fa412aef7 100644
--- a/src/lib/elementary/elm_sys_notify_dbus.c
+++ b/src/lib/elementary/elm_sys_notify_dbus.c
@@ -374,7 +374,7 @@ _elm_sys_notify_dbus_efl_object_constructor(Eo   *obj,
 
         eldbus_name_owner_get(_elm_sysnotif_conn, BUS, _name_owner_get_cb, NULL);
 
-        obj = efl_constructor(eo_super(obj, MY_CLASS));
+        obj = efl_constructor(efl_super(obj, MY_CLASS));
         return obj;
      }
 
@@ -390,7 +390,7 @@ _elm_sys_notify_dbus_efl_object_destructor(Eo   *obj,
 
    eldbus_connection_unref(_elm_sysnotif_conn);
    _elm_sysnotif_conn = NULL;
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 6455804d99..09801e21c0 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -110,7 +110,7 @@ EOLIAN static Elm_Theme_Apply
 _elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -145,7 +145,7 @@ _elm_table_elm_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), child);
+   int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), child);
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -166,7 +166,7 @@ _elm_table_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
    evas_object_event_callback_add
      (table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
    elm_widget_highlight_ignore_set(obj, EINA_FALSE);
@@ -198,21 +198,21 @@ _elm_table_efl_canvas_group_group_del(Eo *obj, void *_pd EINA_UNUSED)
           }
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_table_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_table_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
 
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 542316b710..44007fc408 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -349,7 +349,7 @@ _elm_theme_icon_set(Elm_Theme *th,
    char buf2[1024];
    int w, h;
 
-   if (eo_isa((o), ELM_ICON_CLASS) && elm_icon_standard_get(o) &&
+   if (efl_isa((o), ELM_ICON_CLASS) && elm_icon_standard_get(o) &&
        strcmp(elm_config_icon_theme_get(), ELM_CONFIG_ICON_THEME_ELEMENTARY))
      {
         elm_icon_standard_set(o, elm_icon_standard_get(o));
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 09f5526cae..dde82a327b 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -228,7 +228,7 @@ _thumb_finish(Elm_Thumb_Data *sd,
              sd->thumb.retry = EINA_TRUE;
 
              retry = eina_list_append(retry, sd);
-             eo_data_ref(sd->obj, NULL);
+             efl_data_ref(sd->obj, NULL);
              return;
           }
      }
@@ -258,7 +258,7 @@ _thumb_finish(Elm_Thumb_Data *sd,
              sd->thumb.retry = EINA_TRUE;
 
              retry = eina_list_append(retry, sd);
-             eo_data_ref(sd->obj, NULL);
+             efl_data_ref(sd->obj, NULL);
              return;
           }
 
@@ -273,7 +273,7 @@ _thumb_finish(Elm_Thumb_Data *sd,
         if (_thumb_retry(sd))
           {
              retry = eina_list_remove_list(retry, l);
-             eo_data_unref(sd->obj, sd);
+             efl_data_unref(sd->obj, sd);
           }
 
      }
@@ -281,12 +281,12 @@ _thumb_finish(Elm_Thumb_Data *sd,
    if (pending_request == 0)
      EINA_LIST_FREE(retry, sd)
        {
-          eo_data_unref(sd->obj, sd);
+          efl_data_unref(sd->obj, sd);
           ELM_SAFE_FREE(sd->thumb.thumb_path, eina_stringshare_del);
           ELM_SAFE_FREE(sd->thumb.thumb_key, eina_stringshare_del);
           ELM_SAFE_FREE(sd->view, evas_object_del);
 
-          wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
+          wd = efl_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
           edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
           efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
        }
@@ -371,7 +371,7 @@ _thumb_start(Elm_Thumb_Data *sd)
    if (sd->thumb.retry)
      {
         retry = eina_list_remove(retry, sd);
-        eo_data_unref(sd->obj, sd);
+        efl_data_unref(sd->obj, sd);
         sd->thumb.retry = EINA_FALSE;
      }
 
@@ -455,7 +455,7 @@ _thumb_show(Elm_Thumb_Data *sd)
 EOLIAN static void
 _elm_thumb_efl_canvas_group_group_show(Eo *obj, Elm_Thumb_Data *sd)
 {
-   efl_canvas_group_show(eo_super(obj, MY_CLASS));
+   efl_canvas_group_show(efl_super(obj, MY_CLASS));
 
    _thumb_show(sd);
 }
@@ -465,7 +465,7 @@ _elm_thumb_efl_canvas_group_group_hide(Eo *obj, Elm_Thumb_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+   efl_canvas_group_hide(efl_super(obj, MY_CLASS));
 
    if (sd->thumb.request)
      {
@@ -479,7 +479,7 @@ _elm_thumb_efl_canvas_group_group_hide(Eo *obj, Elm_Thumb_Data *sd)
    if (sd->thumb.retry)
      {
         retry = eina_list_remove(retry, sd);
-        eo_data_unref(sd->obj, sd);
+        efl_data_unref(sd->obj, sd);
         sd->thumb.retry = EINA_FALSE;
      }
 
@@ -528,7 +528,7 @@ _elm_thumb_efl_canvas_group_group_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
@@ -553,7 +553,7 @@ _elm_thumb_efl_canvas_group_group_del(Eo *obj, Elm_Thumb_Data *sd)
    if (sd->thumb.retry)
      {
         retry = eina_list_remove(retry, sd);
-        eo_data_unref(sd->obj, sd);
+        efl_data_unref(sd->obj, sd);
         sd->thumb.retry = EINA_FALSE;
      }
    evas_object_event_callback_del_full(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED,
@@ -568,21 +568,21 @@ _elm_thumb_efl_canvas_group_group_del(Eo *obj, Elm_Thumb_Data *sd)
 
    ecore_event_handler_del(sd->eeh);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_thumb_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_thumb_efl_object_constructor(Eo *obj, Elm_Thumb_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index b361cbc607..c8f3df93cf 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -749,7 +749,7 @@ _elm_toolbar_elm_widget_on_focus(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item
    Eina_Bool int_ret = EINA_FALSE;
    Elm_Object_Item *eo_it = NULL;
 
-   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
+   int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
    if (!sd->items) return EINA_FALSE;
 
@@ -1571,7 +1571,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
    if (sd->delete_me) return ELM_THEME_APPLY_SUCCESS;
 
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    elm_widget_theme_object_set
@@ -1772,7 +1772,7 @@ _elm_toolbar_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
    EINA_INLIST_FOREACH(sd->items, it)
      elm_wdg_item_translate(EO_OBJ(it));
 
-   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(efl_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -2413,7 +2413,7 @@ _elm_toolbar_item_efl_object_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item
    if (item != sd->more_item)
       elm_obj_widget_theme_apply(obj);
 
-   efl_destructor(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
 }
 
 static void
@@ -2454,8 +2454,8 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it)
 EOLIAN static Eo *
 _elm_toolbar_item_efl_object_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
 {
-   eo_it = efl_constructor(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+   eo_it = efl_constructor(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
+   it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_MENU_ITEM);
 
    return eo_it;
@@ -2472,7 +2472,7 @@ _item_new(Evas_Object *obj,
 
    ELM_TOOLBAR_DATA_GET(obj, sd);
 
-   Eo *eo_it = eo_add(ELM_TOOLBAR_ITEM_CLASS, obj);
+   Eo *eo_it = efl_add(ELM_TOOLBAR_ITEM_CLASS, obj);
 
    if (!eo_it) return NULL;
 
@@ -2816,7 +2816,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
      (obj, edje, "toolbar", "base", elm_widget_style_get(obj));
@@ -2928,13 +2928,13 @@ _elm_toolbar_efl_canvas_group_group_del(Eo *obj, Elm_Toolbar_Data *sd)
    if (sd->more_item) elm_wdg_item_del(EO_OBJ(sd->more_item));
    ecore_timer_del(sd->long_timer);
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_toolbar_efl_canvas_group_group_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+   efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -2942,7 +2942,7 @@ _elm_toolbar_efl_canvas_group_group_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coo
 EOLIAN static void
 _elm_toolbar_efl_canvas_group_group_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+   efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -2950,7 +2950,7 @@ _elm_toolbar_efl_canvas_group_group_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_C
 EOLIAN static void
 _elm_toolbar_efl_canvas_group_group_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -3086,14 +3086,14 @@ EAPI Evas_Object *
 elm_toolbar_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent);
+   Evas_Object *obj = efl_add(MY_CLASS, parent);
    return obj;
 }
 
 EOLIAN static Eo *
 _elm_toolbar_efl_object_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -3952,7 +3952,7 @@ EOLIAN static char*
 _elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item)
 {
    char *ret;
-   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
    if (ret) return ret;
    return item->label ? strdup(item->label) : NULL;
 }
@@ -3963,7 +3963,7 @@ _elm_toolbar_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_To
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
+   ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
 
    sel = elm_obj_toolbar_item_selected_get(eo_it);
 
@@ -4006,7 +4006,7 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El
 {
    Eina_List *ret = NULL, *ret2 = NULL;
    Elm_Toolbar_Item_Data *it;
-   ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_TOOLBAR_CLASS));
+   ret2 = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_TOOLBAR_CLASS));
 
    EINA_INLIST_FOREACH(sd->items, it)
       ret = eina_list_append(ret, EO_OBJ(it));
@@ -4017,7 +4017,7 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El
 EOLIAN static Elm_Atspi_State_Set
 _elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED)
 {
-   return elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
+   return elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_TOOLBAR_CLASS));
 }
 
 EOLIAN int
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 39e573e03f..d6dd99312d 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -220,16 +220,16 @@ _elm_view_widget_add(Elm_View_Form_Data *priv, const char *propname, Evas_Object
    w->widget_obj = widget_obj;
    priv->widgets = eina_list_append(priv->widgets, w);
 
-   if(eo_isa(widget_obj, ELM_ENTRY_CLASS))
+   if(efl_isa(widget_obj, ELM_ENTRY_CLASS))
      {
         w->widget_obj_set_cb = _elm_evas_object_text_set_cb;
         evas_object_event_callback_add(w->widget_obj, EVAS_CALLBACK_KEY_DOWN, _elm_evas_object_text_changed_cb, priv);
      }
-   else if(eo_isa(widget_obj, ELM_LABEL_CLASS))
+   else if(efl_isa(widget_obj, ELM_LABEL_CLASS))
      {
         w->widget_obj_set_cb = _elm_evas_object_text_set_cb;
      }
-   else if(eo_isa(widget_obj, ELM_THUMB_CLASS))
+   else if(efl_isa(widget_obj, ELM_THUMB_CLASS))
      {
         w->widget_obj_set_cb = _elm_evas_object_thumb_set_cb;
      }
@@ -261,7 +261,7 @@ _elm_view_form_efl_object_constructor(Eo *obj EINA_UNUSED, Elm_View_Form_Data *_
    Elm_View_Form_Data *priv = (Elm_View_Form_Data *)_pd;
    priv->model_obj = NULL;
 
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
 
    return obj;
 }
@@ -281,7 +281,7 @@ _elm_view_form_efl_object_destructor(Eo *obj, Elm_View_Form_Data *priv)
      }
    priv->widgets = NULL;
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
@@ -291,14 +291,14 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
    if (priv->model_obj != NULL)
      {
         efl_event_callback_del(priv->model_obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
-        eo_unref(priv->model_obj);
+        efl_unref(priv->model_obj);
      }
 
    priv->model_obj = model;
 
    if (priv->model_obj != NULL)
      {
-        eo_ref(priv->model_obj);
+        efl_ref(priv->model_obj);
         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_list.c b/src/lib/elementary/elm_view_list.c
index 7ac268122c..397f7587c4 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -56,9 +56,9 @@ static void _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event);
 static void _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event);
 
 /* --- Genlist Callbacks --- */
-EO_CALLBACKS_ARRAY_DEFINE(model_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(model_callbacks,
                           { EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, _efl_model_children_count_change_cb });
-EO_CALLBACKS_ARRAY_DEFINE(genlist_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(genlist_callbacks,
                           { ELM_GENLIST_EVENT_EXPAND_REQUEST, _expand_request_cb },
                           { ELM_GENLIST_EVENT_CONTRACT_REQUEST, _contract_request_cb },
                           { ELM_GENLIST_EVENT_CONTRACTED, _contracted_cb });
@@ -83,7 +83,7 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
    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);
+   efl_unref(idata->model);
    idata->model = NULL;
    idata->item = NULL;
    idata->parent = NULL;
@@ -280,7 +280,7 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
    if (priv && priv->genlist && priv->genlist == obj)
      {
         efl_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
-        eo_unref(priv->genlist);
+        efl_unref(priv->genlist);
         priv->genlist = NULL;
      }
 }
@@ -319,7 +319,7 @@ _efl_model_load_children_then(void * data, void* value)
         idata->priv = priv;
         idata->parent = pdata;
         idata->model = child;
-        eo_ref(child);
+        efl_ref(child);
         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);
@@ -358,7 +358,7 @@ _priv_model_set(Elm_View_List_Data *priv, Eo *model)
      {
          efl_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
          elm_obj_genlist_clear(priv->genlist);
-         eo_unref(priv->model);
+         efl_unref(priv->model);
          priv->model = NULL;
      }
 
@@ -367,7 +367,7 @@ _priv_model_set(Elm_View_List_Data *priv, Eo *model)
 
    priv->model = model;
    priv->rootdata->model = priv->model;
-   eo_ref(priv->model);
+   efl_ref(priv->model);
 
    efl_event_callback_array_add(priv->model, model_callbacks(), priv->rootdata);
    _efl_model_load_children(priv->rootdata);
@@ -384,7 +384,7 @@ _elm_view_list_genlist_set(Eo *obj, Elm_View_List_Data *priv, Evas_Object *genli
    priv->genlist = genlist;
    priv->itype = itype;
    EINA_SAFETY_ON_NULL_RETURN(priv->genlist);
-   eo_ref(priv->genlist);
+   efl_ref(priv->genlist);
 
    priv->rootdata = calloc(1, sizeof(View_List_ItemData));
    priv->rootdata->priv = priv;
@@ -422,12 +422,12 @@ _elm_view_list_efl_object_destructor(Eo *obj, Elm_View_List_Data *priv)
      {
          evas_object_event_callback_del(priv->genlist, EVAS_CALLBACK_DEL, _genlist_deleted);
          efl_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
-         eo_unref(priv->genlist);
+         efl_unref(priv->genlist);
      }
 
-   eo_unref(priv->model);
+   efl_unref(priv->model);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c
index c422d5bbe1..3e644df292 100644
--- a/src/lib/elementary/elm_web2.c
+++ b/src/lib/elementary/elm_web2.c
@@ -80,7 +80,7 @@ elm_web_add(Evas_Object *parent)
 {
    if (!parent || !ewm.class_get) return NULL;
 
-   return eo_add(ewm.class_get(), parent);
+   return efl_add(ewm.class_get(), parent);
 }
 
 EAPI const Efl_Class *
@@ -94,7 +94,7 @@ elm_web_real_class_get(void)
 EOLIAN static Eo *
 _elm_web_efl_object_constructor(Eo *obj, Elm_Web_Data *sd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 3953e390ec..65e8e40809 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -24,7 +24,7 @@
 #define MY_CLASS_NAME_LEGACY "elm_widget"
 
 #define ELM_WIDGET_DATA_GET(o, wd)                             \
-  Elm_Widget_Smart_Data *wd = eo_data_scope_get(o, MY_CLASS)
+  Elm_Widget_Smart_Data *wd = efl_data_scope_get(o, MY_CLASS)
 
 #define API_ENTRY                                    \
   ELM_WIDGET_DATA_GET(obj, sd);                      \
@@ -34,7 +34,7 @@
   if (!sd) return
 
 #define ELM_WIDGET_FOCUS_GET(obj)                                          \
-  (eo_isa(obj, ELM_WIDGET_CLASS) &&                                    \
+  (efl_isa(obj, ELM_WIDGET_CLASS) &&                                    \
    ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \
                                          (elm_widget_focus_get(obj))))
 
@@ -74,7 +74,7 @@ static unsigned int focus_order = 0;
 static inline Eina_Bool
 _elm_widget_is(const Evas_Object *obj)
 {
-   return eo_isa(obj, MY_CLASS);
+   return efl_isa(obj, MY_CLASS);
 }
 
 static inline Eina_Bool
@@ -96,7 +96,7 @@ _elm_scrollable_is(const Evas_Object *obj)
 {
    INTERNAL_ENTRY EINA_FALSE;
    return
-      eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN);
+      efl_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN);
 }
 
 static void
@@ -108,12 +108,12 @@ _on_sub_obj_hide(void *data, const Eo_Event *event);
 static void
 _propagate_event(void *data, const Eo_Event *event);
 
-EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
                           { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del },
                           { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide });
-EO_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
                           { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del });
-EO_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
                           { EFL_EVENT_KEY_DOWN, _propagate_event },
                           { EFL_EVENT_KEY_UP, _propagate_event },
                           { EFL_EVENT_POINTER_WHEEL, _propagate_event });
@@ -150,11 +150,11 @@ _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *eo_it)
    const char *str;
 
    if (!eo_it) return;
-   if (eo_isa(eo_it, ELM_WIDGET_ITEM_CLASS))
+   if (efl_isa(eo_it, ELM_WIDGET_ITEM_CLASS))
      {
-        Elm_Widget_Item_Data *it = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+        Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
-        if (eo_isa(it->view, ELM_LAYOUT_CLASS))
+        if (efl_isa(it->view, ELM_LAYOUT_CLASS))
           str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight");
         else
           str = edje_object_data_get(it->view, "focus_highlight");
@@ -172,7 +172,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
 
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      _elm_win_focus_highlight_start(top);
 }
 
@@ -181,7 +181,7 @@ _elm_widget_focus_highlight_object_get(const Evas_Object *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
 
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      return _elm_win_focus_highlight_object_get(top);
    return NULL;
 }
@@ -191,7 +191,7 @@ elm_widget_focus_highlight_enabled_get(const Evas_Object *obj)
 {
    const Evas_Object *win = elm_widget_top_get(obj);
 
-   if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+   if (win && efl_isa(win, EFL_UI_WIN_CLASS))
      return elm_win_focus_highlight_enabled_get(win);
    return EINA_FALSE;
 }
@@ -221,7 +221,7 @@ EOLIAN static Eina_Bool
 _elm_widget_on_focus_region(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Coord *x EINA_UNUSED, Evas_Coord *y EINA_UNUSED, Evas_Coord *w EINA_UNUSED, Evas_Coord *h EINA_UNUSED)
 {
    WRN("The %s widget does not implement the \"on_focus_region\" function.",
-       eo_class_name_get(eo_class_get(obj)));
+       efl_class_name_get(efl_class_get(obj)));
 
    return EINA_FALSE;
 }
@@ -623,7 +623,7 @@ EOLIAN static void
 _elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
 {
    int r, g, b, a;
-   efl_canvas_group_member_add(eo_super(obj, MY_CLASS), child);
+   efl_canvas_group_member_add(efl_super(obj, MY_CLASS), child);
 
    if (evas_object_data_get(child, "_elm_leaveme")) return;
 
@@ -644,7 +644,7 @@ _elm_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Sm
 {
    if (!evas_object_data_get(child, "_elm_leaveme"))
       evas_object_clip_unset(child);
-   efl_canvas_group_member_del(eo_super(obj, MY_CLASS), child);
+   efl_canvas_group_member_del(efl_super(obj, MY_CLASS), child);
 }
 
 // internal funcs
@@ -727,7 +727,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
     * in all of elementary widgets */
    if (event->desc == EFL_EVENT_KEY_DOWN)
      {
-        Efl_Event_Key_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_KEY_CLASS);
+        Efl_Event_Key_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_KEY_CLASS);
         if (!ev) return;
         event_info.down.timestamp = ev->timestamp;
         event_info.down.keyname = (char*) ev->keyname;
@@ -746,7 +746,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
      }
    else if (event->desc == EFL_EVENT_KEY_UP)
      {
-        Efl_Event_Key_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_KEY_CLASS);
+        Efl_Event_Key_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_KEY_CLASS);
         if (!ev) return;
         event_info.up.timestamp = ev->timestamp;
         event_info.up.keyname = (char*) ev->keyname;
@@ -765,7 +765,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
      }
    else if (event->desc == EFL_EVENT_POINTER_WHEEL)
      {
-        Efl_Event_Pointer_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+        Efl_Event_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
         if (!ev) return;
         event_info.wheel.direction = (ev->wheel.dir != EFL_ORIENT_HORIZONTAL) ? 1 : 0;
         event_info.wheel.z = ev->wheel.z;
@@ -1124,7 +1124,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
    Eo *parent = NULL;
 
    parent = efl_parent_get(sobj);
-   if (!eo_isa(parent, ELM_WIDGET_CLASS))
+   if (!efl_isa(parent, ELM_WIDGET_CLASS))
      {
         ERR("You passed a wrong parent parameter (%p %s). "
             "Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent));
@@ -1202,7 +1202,7 @@ _elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj
              sdp->child_can_focus = EINA_TRUE;
              while (sdp->parent_obj)
                {
-                  sdp = eo_data_scope_get(sdp->parent_obj, MY_CLASS);
+                  sdp = efl_data_scope_get(sdp->parent_obj, MY_CLASS);
 
                   if (sdp->child_can_focus) break;
 
@@ -1446,7 +1446,7 @@ _elm_widget_can_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focu
           {
              o = elm_widget_parent_get(o);
              if (!o) break;
-             sd = eo_data_scope_get(o, MY_CLASS);
+             sd = efl_data_scope_get(o, MY_CLASS);
              if (!sd || sd->child_can_focus) break;
              sd->child_can_focus = EINA_TRUE;
           }
@@ -1596,7 +1596,7 @@ _elm_widget_highlight_in_theme_update(Eo *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
 
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      {
         _elm_win_focus_highlight_in_theme_update(
            top, elm_widget_highlight_in_theme_get(obj));
@@ -1656,7 +1656,7 @@ _elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd)
    if (sd->parent_obj)
      {
         Evas_Object *ret = NULL;
-        if (!eo_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL;
+        if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL;
         ret = elm_obj_widget_top_get((Eo *) sd->parent_obj);
         return ret;
      }
@@ -1753,7 +1753,7 @@ _elm_widget_event_propagate(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eva
           (!(event_flags && ((*event_flags) & EVAS_EVENT_FLAG_ON_HOLD))))
      {
         ELM_WIDGET_CHECK(parent) EINA_FALSE;
-        Elm_Widget_Smart_Data *sd = eo_data_scope_get(parent, MY_CLASS);
+        Elm_Widget_Smart_Data *sd = efl_data_scope_get(parent, MY_CLASS);
 
         Eina_Bool int_ret = EINA_FALSE;
 
@@ -3016,7 +3016,7 @@ _elm_widget_focus_steal(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *ite
      {
         o = elm_widget_parent_get(parent);
         if (!o) break;
-        sd = eo_data_scope_get(o, MY_CLASS);
+        sd = efl_data_scope_get(o, MY_CLASS);
         if (sd->disabled || sd->tree_unfocusable) return;
         if (sd->focused) break;
         parent = o;
@@ -3029,7 +3029,7 @@ _elm_widget_focus_steal(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *ite
         parent2 = elm_widget_parent_get(parent);
         if (!parent2) parent2 = elm_widget_parent2_get(parent);
         parent = parent2;
-        sd = eo_data_scope_get(parent, MY_CLASS);
+        sd = efl_data_scope_get(parent, MY_CLASS);
         if (sd) _focused_object_clear(sd);
      }
    _parent_focus(obj, item);
@@ -3063,7 +3063,7 @@ void
 _elm_widget_focus_auto_show(Evas_Object *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_show(top);
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_show(top);
 }
 
 void
@@ -3202,7 +3202,7 @@ _elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Coord x, Ev
         parent_obj = sd->parent_obj;
         child_obj = sd->obj;
         if ((!parent_obj) || (!_elm_widget_is(parent_obj))) break;
-        sd = eo_data_scope_get(parent_obj, MY_CLASS);
+        sd = efl_data_scope_get(parent_obj, MY_CLASS);
         if (!sd) break;
 
         evas_object_geometry_get(parent_obj, &px, &py, NULL, NULL);
@@ -3878,22 +3878,22 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
 EOLIAN static void
 _elm_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   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_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_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));
-   EO_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT,
+   EFL_DBG_INFO_APPEND(group, "Wid-Type", EINA_VALUE_TYPE_STRING, elm_widget_type_get(eo_obj));
+   EFL_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, elm_widget_style_get(eo_obj));
+   EFL_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT,
          (int) evas_object_layer_get(eo_obj));
-   EO_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE,
+   EFL_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE,
          evas_object_scale_get(eo_obj));
-   EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR,
+   EFL_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR,
          elm_object_focus_get(eo_obj));
-   EO_DBG_INFO_APPEND(group, "Disabled", EINA_VALUE_TYPE_CHAR,
+   EFL_DBG_INFO_APPEND(group, "Disabled", EINA_VALUE_TYPE_CHAR,
          elm_widget_disabled_get(eo_obj));
-   EO_DBG_INFO_APPEND(group, "Mirrored", EINA_VALUE_TYPE_CHAR,
+   EFL_DBG_INFO_APPEND(group, "Mirrored", EINA_VALUE_TYPE_CHAR,
          elm_widget_mirrored_get(eo_obj));
-   EO_DBG_INFO_APPEND(group, "Automatic mirroring", EINA_VALUE_TYPE_CHAR,
+   EFL_DBG_INFO_APPEND(group, "Automatic mirroring", EINA_VALUE_TYPE_CHAR,
          elm_widget_mirrored_automatic_get(eo_obj));
 }
 
@@ -3919,7 +3919,7 @@ elm_widget_type_get(const Evas_Object *obj)
 {
    API_ENTRY return NULL;
 
-   return eo_class_name_get(eo_class_get(obj));
+   return efl_class_name_get(efl_class_get(obj));
 }
 
 EAPI Eina_Bool
@@ -4062,7 +4062,7 @@ _elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSE
    if (!obj) return;
    if (!_is_focusable(obj)) return;
    top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_hide(top);
+   if (top && efl_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_hide(top);
    elm_widget_focus_steal(obj, NULL);
 }
 
@@ -4168,13 +4168,13 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
    const char *target_hl_part = NULL;
    const Evas_Object *edje_obj = NULL;
 
-   if (obj && eo_isa(obj, EDJE_OBJECT_CLASS))
+   if (obj && efl_isa(obj, EDJE_OBJECT_CLASS))
      {
         edje_obj = obj;
         if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part")))
           return;
      }
-   else if (obj && eo_isa(obj, ELM_LAYOUT_CLASS))
+   else if (obj && efl_isa(obj, ELM_LAYOUT_CLASS))
      {
         edje_obj = elm_layout_edje_get(obj);
         if (!(target_hl_part = elm_layout_data_get(obj, "focus_part")))
@@ -4437,7 +4437,7 @@ _track_obj_view_update(void *data, const Eo_Event *event)
 static void
 _track_obj_view_del(void *data, const Eo_Event *event);
 
-EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
                           { EFL_GFX_EVENT_RESIZE, _track_obj_view_update },
                           { EFL_GFX_EVENT_MOVE, _track_obj_view_update },
                           { EFL_GFX_EVENT_SHOW, _track_obj_view_update },
@@ -4491,7 +4491,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
      elm_object_signal_callback_del(item->view,
                                     wisd->emission, wisd->source,
                                     _elm_widget_item_signal_cb);
-   else if (eo_isa(item->view, EDJE_OBJECT_CLASS))
+   else if (efl_isa(item->view, EDJE_OBJECT_CLASS))
      edje_object_signal_callback_del_full(item->view,
                                           wisd->emission, wisd->source,
                                           _elm_widget_item_signal_cb, wisd);
@@ -4508,7 +4508,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
 static void
 _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_Data *item = efl_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS);
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
    if (item->del_func)
       item->del_func((void *) WIDGET_ITEM_DATA_GET(event->object), item->widget, item->eo_obj);
@@ -4545,7 +4545,7 @@ _elm_widget_item_efl_object_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
         return NULL;
      }
 
-   eo_item = efl_constructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
+   eo_item = efl_constructor(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS));
 
    EINA_MAGIC_SET(item, ELM_WIDGET_ITEM_MAGIC);
 
@@ -4592,7 +4592,7 @@ _elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
 
    EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
 
-   efl_destructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
+   efl_destructor(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS));
 }
 
 /**
@@ -4733,7 +4733,7 @@ _elm_widget_onscreen_is(Evas_Object *widget)
       parent = elm_widget_parent_get(parent);
       if (parent && !evas_object_visible_get(parent))
         return EINA_FALSE;
-      if (parent && eo_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
+      if (parent && efl_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
         {
            evas_object_geometry_get(parent, &x, &y, &w, &h);
            if (((wx < x) && (wx + ww < x)) || ((wx > x + w) && (wx + ww > x + w)) ||
@@ -4749,7 +4749,7 @@ EAPI Eina_Bool
 _elm_widget_item_onscreen_is(Elm_Object_Item *item)
 {
    Evas_Coord x, y, w, h, wx, wy, ww, wh;
-   Elm_Widget_Item_Data *id = eo_data_scope_get(item, ELM_WIDGET_ITEM_CLASS);
+   Elm_Widget_Item_Data *id = efl_data_scope_get(item, ELM_WIDGET_ITEM_CLASS);
    if (!id || !id->view) return EINA_FALSE;
 
    if (!evas_object_visible_get(id->view))
@@ -5529,12 +5529,12 @@ _elm_widget_item_signal_callback_add(Eo *eo_item,
 
    if (_elm_widget_is(item->view))
      elm_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd);
-   else if (eo_isa(item->view, EDJE_OBJECT_CLASS))
+   else if (efl_isa(item->view, EDJE_OBJECT_CLASS))
      edje_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd);
    else
      {
         WRN("The %s widget item doesn't support signal callback add!",
-            eo_class_name_get(eo_class_get(item->widget)));
+            efl_class_name_get(efl_class_get(item->widget)));
         free(wisd);
         return;
      }
@@ -5826,7 +5826,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE
    Eo *parent = NULL;
 
    sd->on_create = EINA_TRUE;
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
    parent = efl_parent_get(obj);
@@ -5845,7 +5845,7 @@ _elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED
    elm_interface_atspi_accessible_name_set(obj, NULL);
    elm_interface_atspi_accessible_translation_domain_set(obj, NULL);
    elm_interface_atspi_accessible_relationships_clear(obj);
-   efl_destructor(eo_super(obj, ELM_WIDGET_CLASS));
+   efl_destructor(efl_super(obj, ELM_WIDGET_CLASS));
    sd->on_destroy = EINA_FALSE;
 
    elm_interface_atspi_accessible_removed(obj);
@@ -5889,7 +5889,7 @@ EOLIAN static Eina_Bool
 _elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
 {
    WRN("The %s widget does not implement the \"focus_next/focus_next_manager_is\" functions.",
-       eo_class_name_get(eo_class_get(obj)));
+       efl_class_name_get(efl_class_get(obj)));
    return EINA_FALSE;
 }
 
@@ -5897,7 +5897,7 @@ static Eina_Bool
 _elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
 {
    WRN("The %s widget does not implement the \"focus_direction/focus_direction_manager_is\" functions.",
-       eo_class_name_get(eo_class_get(obj)));
+       efl_class_name_get(efl_class_get(obj)));
    return EINA_FALSE;
 }
 
@@ -5905,7 +5905,7 @@ EOLIAN static Eina_Bool
 _elm_widget_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Elm_Activate act EINA_UNUSED)
 {
    WRN("The %s widget does not implement the \"activate\" functions.",
-       eo_class_name_get(eo_class_get(obj)));
+       efl_class_name_get(efl_class_get(obj)));
    return EINA_TRUE;
 }
 
@@ -5934,7 +5934,7 @@ _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Wid
 {
    const char *ret;
    char *name;
-   name = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_WIDGET_CLASS));
+   name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_WIDGET_CLASS));
 
    if (name) return name;
 
@@ -5954,7 +5954,7 @@ _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm
    EINA_LIST_FOREACH(pd->subobjs, l, widget)
      {
         if (!elm_object_widget_check(widget)) continue;
-        if (!eo_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) continue;
+        if (!efl_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) continue;
         type = elm_interface_atspi_accessible_type_get(widget);
         if (type == ELM_ATSPI_TYPE_DISABLED) continue;
         if (type == ELM_ATSPI_TYPE_SKIPPED)
@@ -5981,7 +5981,7 @@ _elm_widget_elm_interface_atspi_accessible_parent_get(Eo *obj, Elm_Widget_Smart_
         type = elm_interface_atspi_accessible_type_get(parent);
    } while (parent && (type == ELM_ATSPI_TYPE_SKIPPED));
 
-   return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
+   return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
 }
 
 EOLIAN static Elm_Atspi_State_Set
@@ -5989,7 +5989,7 @@ _elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Sma
 {
    Elm_Atspi_State_Set states = 0;
 
-   states = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_WIDGET_CLASS));
+   states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_WIDGET_CLASS));
 
    if (evas_object_visible_get(obj))
      {
@@ -6095,7 +6095,7 @@ _elm_widget_efl_object_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const E
    pd->provider_lookup = EINA_TRUE;
 
    lookup = efl_provider_find(pd->parent_obj, klass);
-   if (!lookup) lookup = efl_provider_find(eo_super(obj, MY_CLASS), klass);
+   if (!lookup) lookup = efl_provider_find(efl_super(obj, MY_CLASS), klass);
 
    pd->provider_lookup = EINA_FALSE;
 
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index e8982ffc06..28b35492d0 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -788,7 +788,7 @@ EAPI Eina_Bool        _elm_widget_item_onscreen_is(Elm_Object_Item *item);
 
 #define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr, ...)   \
   Elm_Widget_Smart_Data *ptr;                        \
-  ptr = eo_data_scope_get(o, ELM_WIDGET_CLASS);  \
+  ptr = efl_data_scope_get(o, ELM_WIDGET_CLASS);  \
   if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
        CRI("no widget data for object %p (%s)",      \
@@ -797,7 +797,7 @@ EAPI Eina_Bool        _elm_widget_item_onscreen_is(Elm_Object_Item *item);
     }
 
 #define ELM_WIDGET_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_WIDGET_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_WIDGET_CLASS))) \
     return
 
 #define ELM_WIDGET_ITEM_RETURN_IF_ONDEL(item, ...)              \
@@ -815,7 +815,7 @@ EAPI Eina_Bool        _elm_widget_item_onscreen_is(Elm_Object_Item *item);
              return __VA_ARGS__;                                \
         }                                                       \
        if ((item)->eo_obj &&                                   \
-           eo_isa((item)->eo_obj, ELM_WIDGET_ITEM_CLASS)) break; \
+           efl_isa((item)->eo_obj, ELM_WIDGET_ITEM_CLASS)) break; \
        if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) {    \
             EINA_MAGIC_FAIL(item, ELM_WIDGET_ITEM_MAGIC);       \
             return __VA_ARGS__;                                 \
@@ -829,7 +829,7 @@ EAPI Eina_Bool        _elm_widget_item_onscreen_is(Elm_Object_Item *item);
              goto label;                                        \
         }                                                       \
        if ((item)->eo_obj &&                                    \
-           eo_isa((item)->eo_obj, ELM_WIDGET_ITEM_CLASS)) break; \
+           efl_isa((item)->eo_obj, ELM_WIDGET_ITEM_CLASS)) break; \
        if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) {    \
             EINA_MAGIC_FAIL(item, ELM_WIDGET_ITEM_MAGIC);       \
             goto label;                                         \
diff --git a/src/lib/elementary/elm_widget_actionslider.h b/src/lib/elementary/elm_widget_actionslider.h
index 6025c7be0e..ad86e1f131 100644
--- a/src/lib/elementary/elm_widget_actionslider.h
+++ b/src/lib/elementary/elm_widget_actionslider.h
@@ -39,7 +39,7 @@ struct _Elm_Actionslider_Data
  */
 
 #define ELM_ACTIONSLIDER_DATA_GET(o, sd) \
-  Elm_Actionslider_Data * sd = eo_data_scope_get(o, ELM_ACTIONSLIDER_CLASS)
+  Elm_Actionslider_Data * sd = efl_data_scope_get(o, ELM_ACTIONSLIDER_CLASS)
 
 #define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_ACTIONSLIDER_DATA_GET(o, ptr);                 \
@@ -60,7 +60,7 @@ struct _Elm_Actionslider_Data
     }
 
 #define ELM_ACTIONSLIDER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_ACTIONSLIDER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_ACTIONSLIDER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_bg.h b/src/lib/elementary/elm_widget_bg.h
index 633d9553eb..0f867ef8b1 100644
--- a/src/lib/elementary/elm_widget_bg.h
+++ b/src/lib/elementary/elm_widget_bg.h
@@ -41,7 +41,7 @@ struct _Elm_Bg_Data
  */
 
 #define ELM_BG_DATA_GET(o, sd) \
-  Elm_Bg_Data * sd = eo_data_scope_get(o, ELM_BG_CLASS)
+  Elm_Bg_Data * sd = efl_data_scope_get(o, ELM_BG_CLASS)
 
 #define ELM_BG_DATA_GET_OR_RETURN(o, ptr)            \
   ELM_BG_DATA_GET(o, ptr);                           \
@@ -62,7 +62,7 @@ struct _Elm_Bg_Data
     }
 
 #define ELM_BG_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_BG_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_BG_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_box.h b/src/lib/elementary/elm_widget_box.h
index fa321fcbf2..a41ddc1f62 100644
--- a/src/lib/elementary/elm_widget_box.h
+++ b/src/lib/elementary/elm_widget_box.h
@@ -70,7 +70,7 @@ struct _Transition_Animation_Data
  */
 
 #define ELM_BOX_DATA_GET(o, sd) \
-  Elm_Box_Data * sd = eo_data_scope_get(o, ELM_BOX_CLASS)
+  Elm_Box_Data * sd = efl_data_scope_get(o, ELM_BOX_CLASS)
 
 #define ELM_BOX_DATA_GET_OR_RETURN(o, ptr)           \
   ELM_BOX_DATA_GET(o, ptr);                          \
@@ -91,7 +91,7 @@ struct _Transition_Animation_Data
     }
 
 #define ELM_BOX_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_BOX_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_BOX_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_bubble.h b/src/lib/elementary/elm_widget_bubble.h
index 25327e2abc..7182ad3041 100644
--- a/src/lib/elementary/elm_widget_bubble.h
+++ b/src/lib/elementary/elm_widget_bubble.h
@@ -35,7 +35,7 @@ struct _Elm_Bubble_Data
  */
 
 #define ELM_BUBBLE_DATA_GET(o, sd) \
-  Elm_Bubble_Data * sd = eo_data_scope_get(o, ELM_BUBBLE_CLASS)
+  Elm_Bubble_Data * sd = efl_data_scope_get(o, ELM_BUBBLE_CLASS)
 
 #define ELM_BUBBLE_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_BUBBLE_DATA_GET(o, ptr);                       \
@@ -56,7 +56,7 @@ struct _Elm_Bubble_Data
     }
 
 #define ELM_BUBBLE_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_BUBBLE_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_BUBBLE_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_button.h b/src/lib/elementary/elm_widget_button.h
index ca67d5a0ad..d227d5eb9b 100644
--- a/src/lib/elementary/elm_widget_button.h
+++ b/src/lib/elementary/elm_widget_button.h
@@ -41,7 +41,7 @@ typedef struct _Elm_Button_Data
  */
 
 #define ELM_BUTTON_DATA_GET(o, sd) \
-  Elm_Button_Data * sd = eo_data_scope_get(o, ELM_BUTTON_CLASS)
+  Elm_Button_Data * sd = efl_data_scope_get(o, ELM_BUTTON_CLASS)
 
 #define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_BUTTON_DATA_GET(o, ptr);                       \
@@ -62,7 +62,7 @@ typedef struct _Elm_Button_Data
     }
 
 #define ELM_BUTTON_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_BUTTON_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_BUTTON_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_calendar.h b/src/lib/elementary/elm_widget_calendar.h
index f5b54a72df..e7b92ab322 100644
--- a/src/lib/elementary/elm_widget_calendar.h
+++ b/src/lib/elementary/elm_widget_calendar.h
@@ -77,10 +77,10 @@ struct _Elm_Calendar_Mark
  */
 
 #define ELM_CALENDAR_DATA_GET(o, sd) \
-  Elm_Calendar_Data * sd = eo_data_scope_get(o, ELM_CALENDAR_CLASS)
+  Elm_Calendar_Data * sd = efl_data_scope_get(o, ELM_CALENDAR_CLASS)
 
 #define ELM_CALENDAR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_CALENDAR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_CALENDAR_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_check.h b/src/lib/elementary/elm_widget_check.h
index d5cf27e85e..d26d3b2464 100644
--- a/src/lib/elementary/elm_widget_check.h
+++ b/src/lib/elementary/elm_widget_check.h
@@ -34,7 +34,7 @@ struct _Elm_Check_Data
  */
 
 #define ELM_CHECK_DATA_GET(o, sd) \
-  Elm_Check_Data * sd = eo_data_scope_get(o, ELM_CHECK_CLASS)
+  Elm_Check_Data * sd = efl_data_scope_get(o, ELM_CHECK_CLASS)
 
 #define ELM_CHECK_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_CHECK_DATA_GET(o, ptr);                        \
@@ -55,7 +55,7 @@ struct _Elm_Check_Data
     }
 
 #define ELM_CHECK_CHECK(obj)                       \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_CHECK_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_CHECK_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_clipper.h b/src/lib/elementary/elm_widget_clipper.h
index 08bb5e8d2a..39ae1956e8 100644
--- a/src/lib/elementary/elm_widget_clipper.h
+++ b/src/lib/elementary/elm_widget_clipper.h
@@ -39,7 +39,7 @@ struct _Elm_Clipper_Data
  */
 
 #define ELM_CLIPPER_DATA_GET(o, sd) \
-  Elm_Clipper_Data * sd = eo_data_scope_get(o, ELM_CLIPPER_CLASS)
+  Elm_Clipper_Data * sd = efl_data_scope_get(o, ELM_CLIPPER_CLASS)
 
 #define ELM_CLIPPER_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_CLIPPER_DATA_GET(o, ptr);                       \
@@ -60,7 +60,7 @@ struct _Elm_Clipper_Data
     }
 
 #define ELM_CLIPPER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_CLIPPER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_CLIPPER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_clock.h b/src/lib/elementary/elm_widget_clock.h
index f899cf82ab..3ca5c0e9e7 100644
--- a/src/lib/elementary/elm_widget_clock.h
+++ b/src/lib/elementary/elm_widget_clock.h
@@ -58,7 +58,7 @@ struct _Elm_Clock_Data
  */
 
 #define ELM_CLOCK_DATA_GET(o, sd) \
-  Elm_Clock_Data * sd = eo_data_scope_get(o, ELM_CLOCK_CLASS)
+  Elm_Clock_Data * sd = efl_data_scope_get(o, ELM_CLOCK_CLASS)
 
 #define ELM_CLOCK_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_CLOCK_DATA_GET(o, ptr);                        \
@@ -79,7 +79,7 @@ struct _Elm_Clock_Data
     }
 
 #define ELM_CLOCK_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_CLOCK_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_CLOCK_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_colorselector.h b/src/lib/elementary/elm_widget_colorselector.h
index cacb61ca46..943297a778 100644
--- a/src/lib/elementary/elm_widget_colorselector.h
+++ b/src/lib/elementary/elm_widget_colorselector.h
@@ -112,7 +112,7 @@ struct _Elm_Color_Name
  */
 
 #define ELM_COLORSELECTOR_DATA_GET(o, sd) \
-  Elm_Colorselector_Data * sd = eo_data_scope_get(o, ELM_COLORSELECTOR_CLASS)
+  Elm_Colorselector_Data * sd = efl_data_scope_get(o, ELM_COLORSELECTOR_CLASS)
 
 #define ELM_COLORSELECTOR_DATA_GET_OR_RETURN(o, ptr) \
   ELM_COLORSELECTOR_DATA_GET(o, ptr);                \
@@ -133,18 +133,18 @@ struct _Elm_Color_Name
     }
 
 #define ELM_COLOR_ITEM_DATA_GET(o, sd) \
-  Elm_Color_Item_Data * sd = eo_data_scope_get(o, ELM_COLOR_ITEM_CLASS)
+  Elm_Color_Item_Data * sd = efl_data_scope_get(o, ELM_COLOR_ITEM_CLASS)
 
 #define ELM_COLORSELECTOR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_COLORSELECTOR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_COLORSELECTOR_CLASS))) \
     return
 
 #define ELM_COLORSELECTOR_ITEM_CHECK(it)                       \
-  if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \
     return
 
 #define ELM_COLORSELECTOR_ITEM_CHECK_OR_RETURN(it, ...)        \
-  if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 #endif
diff --git a/src/lib/elementary/elm_widget_combobox.h b/src/lib/elementary/elm_widget_combobox.h
index 205096a4c8..fa0de30e52 100644
--- a/src/lib/elementary/elm_widget_combobox.h
+++ b/src/lib/elementary/elm_widget_combobox.h
@@ -47,7 +47,7 @@ struct _Elm_Combobox_Data
  */
 
 #define ELM_COMBOBOX_DATA_GET(o, sd) \
-  Elm_Combobox_Data * sd = eo_data_scope_get(o, ELM_COMBOBOX_CLASS)
+  Elm_Combobox_Data * sd = efl_data_scope_get(o, ELM_COMBOBOX_CLASS)
 
 #define ELM_COMBOBOX_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_COMBOBOX_DATA_GET(o, ptr);                     \
@@ -68,7 +68,7 @@ struct _Elm_Combobox_Data
     }
 
 #define ELM_COMBOBOX_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_COMBOBOX_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_COMBOBOX_CLASS))) \
     return
 
 #define ELM_COMBOBOX_ITEM_CHECK(it)                         \
diff --git a/src/lib/elementary/elm_widget_conform.h b/src/lib/elementary/elm_widget_conform.h
index d54dc876a0..41f90c17d8 100644
--- a/src/lib/elementary/elm_widget_conform.h
+++ b/src/lib/elementary/elm_widget_conform.h
@@ -70,7 +70,7 @@ enum _Conformant_Part_Type
  */
 
 #define ELM_CONFORMANT_DATA_GET(o, sd) \
-  Elm_Conformant_Data * sd = eo_data_scope_get(o, ELM_CONFORMANT_CLASS)
+  Elm_Conformant_Data * sd = efl_data_scope_get(o, ELM_CONFORMANT_CLASS)
 
 #define ELM_CONFORMANT_DATA_GET_OR_RETURN(o, ptr)    \
   ELM_CONFORMANT_DATA_GET(o, ptr);                   \
@@ -91,7 +91,7 @@ enum _Conformant_Part_Type
     }
 
 #define ELM_CONFORMANT_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_CONFORMANT_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_CONFORMANT_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_ctxpopup.h b/src/lib/elementary/elm_widget_ctxpopup.h
index 25af380781..e82144b636 100644
--- a/src/lib/elementary/elm_widget_ctxpopup.h
+++ b/src/lib/elementary/elm_widget_ctxpopup.h
@@ -67,7 +67,7 @@ struct _Elm_Ctxpopup_Data
  */
 
 #define ELM_CTXPOPUP_DATA_GET(o, sd) \
-  Elm_Ctxpopup_Data * sd = eo_data_scope_get(o, ELM_CTXPOPUP_CLASS)
+  Elm_Ctxpopup_Data * sd = efl_data_scope_get(o, ELM_CTXPOPUP_CLASS)
 
 #define ELM_CTXPOPUP_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_CTXPOPUP_DATA_GET(o, ptr);                     \
@@ -88,7 +88,7 @@ struct _Elm_Ctxpopup_Data
     }
 
 #define ELM_CTXPOPUP_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_CTXPOPUP_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_CTXPOPUP_CLASS))) \
     return
 
 #define ELM_CTXPOPUP_ITEM_CHECK_OR_RETURN(it, ...)                 \
@@ -96,6 +96,6 @@ struct _Elm_Ctxpopup_Data
   ELM_CTXPOPUP_CHECK(it->base->widget) __VA_ARGS__;
 
 #define ELM_CTXPOPUP_ITEM_DATA_GET(o, sd) \
-  Elm_Ctxpopup_Item_Data *sd = eo_data_scope_get(o, ELM_CTXPOPUP_ITEM_CLASS)
+  Elm_Ctxpopup_Item_Data *sd = efl_data_scope_get(o, ELM_CTXPOPUP_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_datetime.h b/src/lib/elementary/elm_widget_datetime.h
index 7d9600c775..8e735848ac 100644
--- a/src/lib/elementary/elm_widget_datetime.h
+++ b/src/lib/elementary/elm_widget_datetime.h
@@ -100,7 +100,7 @@ struct _Format_Map
  */
 
 #define ELM_DATETIME_DATA_GET(o, sd) \
-  Elm_Datetime_Data * sd = eo_data_scope_get(o, ELM_DATETIME_CLASS)
+  Elm_Datetime_Data * sd = efl_data_scope_get(o, ELM_DATETIME_CLASS)
 
 #define ELM_DATETIME_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_DATETIME_DATA_GET(o, ptr);                     \
@@ -121,7 +121,7 @@ struct _Format_Map
     }
 
 #define ELM_DATETIME_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_DATETIME_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_DATETIME_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_dayselector.h b/src/lib/elementary/elm_widget_dayselector.h
index 7dca70c2b5..544a162244 100644
--- a/src/lib/elementary/elm_widget_dayselector.h
+++ b/src/lib/elementary/elm_widget_dayselector.h
@@ -48,7 +48,7 @@ struct _Elm_Dayselector_Item_Data
  */
 
 #define ELM_DAYSELECTOR_DATA_GET(o, sd) \
-  Elm_Dayselector_Data * sd = eo_data_scope_get(o, ELM_DAYSELECTOR_CLASS)
+  Elm_Dayselector_Data * sd = efl_data_scope_get(o, ELM_DAYSELECTOR_CLASS)
 
 #define ELM_DAYSELECTOR_DATA_GET_OR_RETURN(o, ptr)   \
   ELM_DAYSELECTOR_DATA_GET(o, ptr);                  \
@@ -69,10 +69,10 @@ struct _Elm_Dayselector_Item_Data
     }
 
 #define ELM_DAYSELECTOR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_DAYSELECTOR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_DAYSELECTOR_CLASS))) \
     return
 
 #define ELM_DAYSELECTOR_ITEM_DATA_GET(o, sd) \
-  Elm_Dayselector_Item_Data * sd = eo_data_scope_get(o, ELM_DAYSELECTOR_ITEM_CLASS)
+  Elm_Dayselector_Item_Data * sd = efl_data_scope_get(o, ELM_DAYSELECTOR_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_diskselector.h b/src/lib/elementary/elm_widget_diskselector.h
index b391af6db3..37a1ecc3e8 100644
--- a/src/lib/elementary/elm_widget_diskselector.h
+++ b/src/lib/elementary/elm_widget_diskselector.h
@@ -71,7 +71,7 @@ struct _Elm_Diskselector_Item_Data
  */
 
 #define ELM_DISKSELECTOR_DATA_GET(o, sd) \
-  Elm_Diskselector_Data * sd = eo_data_scope_get(o, ELM_DISKSELECTOR_CLASS)
+  Elm_Diskselector_Data * sd = efl_data_scope_get(o, ELM_DISKSELECTOR_CLASS)
 
 #define ELM_DISKSELECTOR_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_DISKSELECTOR_DATA_GET(o, ptr);                 \
@@ -92,7 +92,7 @@ struct _Elm_Diskselector_Item_Data
     }
 
 #define ELM_DISKSELECTOR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_DISKSELECTOR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_DISKSELECTOR_CLASS))) \
     return
 
 #define ELM_DISKSELECTOR_ITEM_CHECK(it)                     \
@@ -105,10 +105,10 @@ struct _Elm_Diskselector_Item_Data
 
 #define ELM_DISKSELECTOR_ITEM_CHECK_OR_GOTO(it, label)         \
   ELM_WIDGET_ITEM_CHECK_OR_GOTO(it->base, label); \
-  if (!it->base->widget || !eo_isa((it->base->widget), ELM_DISKSELECTOR_CLASS)) \
+  if (!it->base->widget || !efl_isa((it->base->widget), ELM_DISKSELECTOR_CLASS)) \
            goto label;
 
 #define ELM_DISKSELECTOR_ITEM_DATA_GET(o, sd) \
-  Elm_Diskselector_Item_Data* sd = eo_data_scope_get(o, ELM_DISKSELECTOR_ITEM_CLASS)
+  Elm_Diskselector_Item_Data* sd = efl_data_scope_get(o, ELM_DISKSELECTOR_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_entry.h b/src/lib/elementary/elm_widget_entry.h
index f544d9df43..e3edb8fd56 100644
--- a/src/lib/elementary/elm_widget_entry.h
+++ b/src/lib/elementary/elm_widget_entry.h
@@ -154,7 +154,7 @@ typedef enum _Length_Unit
  */
 
 #define ELM_ENTRY_DATA_GET(o, sd) \
-  Elm_Entry_Data * sd = eo_data_scope_get(o, ELM_ENTRY_CLASS)
+  Elm_Entry_Data * sd = efl_data_scope_get(o, ELM_ENTRY_CLASS)
 
 #define ELM_ENTRY_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_ENTRY_DATA_GET(o, ptr);                        \
@@ -175,7 +175,7 @@ typedef enum _Length_Unit
     }
 
 #define ELM_ENTRY_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_ENTRY_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_ENTRY_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_fileselector.h b/src/lib/elementary/elm_widget_fileselector.h
index aa167ca7af..458e42b638 100644
--- a/src/lib/elementary/elm_widget_fileselector.h
+++ b/src/lib/elementary/elm_widget_fileselector.h
@@ -162,7 +162,7 @@ struct _Elm_Fileselector_Filter
  */
 
 #define ELM_FILESELECTOR_DATA_GET(o, sd) \
-  Elm_Fileselector_Data * sd = eo_data_scope_get(o, ELM_FILESELECTOR_CLASS)
+  Elm_Fileselector_Data * sd = efl_data_scope_get(o, ELM_FILESELECTOR_CLASS)
 
 #define ELM_FILESELECTOR_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_FILESELECTOR_DATA_GET(o, ptr);                 \
@@ -183,7 +183,7 @@ struct _Elm_Fileselector_Filter
     }
 
 #define ELM_FILESELECTOR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_FILESELECTOR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_FILESELECTOR_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_fileselector_button.h b/src/lib/elementary/elm_widget_fileselector_button.h
index 23a15f6ab4..edf6c15a6f 100644
--- a/src/lib/elementary/elm_widget_fileselector_button.h
+++ b/src/lib/elementary/elm_widget_fileselector_button.h
@@ -58,7 +58,7 @@ struct _Elm_Fileselector_Button_Data
  */
 
 #define ELM_FILESELECTOR_BUTTON_DATA_GET(o, sd) \
-  Elm_Fileselector_Button_Data * sd = eo_data_scope_get(o, ELM_FILESELECTOR_BUTTON_CLASS)
+  Elm_Fileselector_Button_Data * sd = efl_data_scope_get(o, ELM_FILESELECTOR_BUTTON_CLASS)
 
 #define ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(o, ptr) \
   ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr);                \
@@ -79,7 +79,7 @@ struct _Elm_Fileselector_Button_Data
     }
 
 #define ELM_FILESELECTOR_BUTTON_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_FILESELECTOR_BUTTON_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_FILESELECTOR_BUTTON_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_fileselector_entry.h b/src/lib/elementary/elm_widget_fileselector_entry.h
index 5c59dfef9b..50691b2487 100644
--- a/src/lib/elementary/elm_widget_fileselector_entry.h
+++ b/src/lib/elementary/elm_widget_fileselector_entry.h
@@ -41,7 +41,7 @@ struct _Elm_Fileselector_Entry_Data
 
 
 #define ELM_FILESELECTOR_ENTRY_DATA_GET(o, sd) \
-  Elm_Fileselector_Entry_Data * sd = eo_data_scope_get(o, ELM_FILESELECTOR_ENTRY_CLASS)
+  Elm_Fileselector_Entry_Data * sd = efl_data_scope_get(o, ELM_FILESELECTOR_ENTRY_CLASS)
 
 #define ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(o, ptr) \
   ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr);                \
@@ -62,7 +62,7 @@ struct _Elm_Fileselector_Entry_Data
     }
 
 #define ELM_FILESELECTOR_ENTRY_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_FILESELECTOR_ENTRY_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_FILESELECTOR_ENTRY_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_flipselector.h b/src/lib/elementary/elm_widget_flipselector.h
index 1b8b865cff..2e348abbc2 100644
--- a/src/lib/elementary/elm_widget_flipselector.h
+++ b/src/lib/elementary/elm_widget_flipselector.h
@@ -53,7 +53,7 @@ struct _Elm_Flipselector_Item_Data
 };
 
 #define ELM_FLIPSELECTOR_DATA_GET(o, sd) \
-  Elm_Flipselector_Data * sd = eo_data_scope_get(o, ELM_FLIPSELECTOR_CLASS)
+  Elm_Flipselector_Data * sd = efl_data_scope_get(o, ELM_FLIPSELECTOR_CLASS)
 
 #define ELM_FLIPSELECTOR_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_FLIPSELECTOR_DATA_GET(o, ptr);                 \
@@ -74,18 +74,18 @@ struct _Elm_Flipselector_Item_Data
     }
 
 #define ELM_FLIPSELECTOR_ITEM_DATA_GET(o, sd) \
-  Elm_Flipselector_Item_Data * sd = eo_data_scope_get(o, ELM_FLIPSELECTOR_ITEM_CLASS)
+  Elm_Flipselector_Item_Data * sd = efl_data_scope_get(o, ELM_FLIPSELECTOR_ITEM_CLASS)
 
 #define ELM_FLIPSELECTOR_CHECK(obj)                          \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_FLIPSELECTOR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_FLIPSELECTOR_CLASS))) \
     return
 
 #define ELM_FLIPSELECTOR_ITEM_CHECK(it)                     \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \
     return
 
 #define ELM_FLIPSELECTOR_ITEM_CHECK_OR_RETURN(it, ...)                 \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 /**
diff --git a/src/lib/elementary/elm_widget_gengrid.h b/src/lib/elementary/elm_widget_gengrid.h
index 586400f5c8..20df266658 100644
--- a/src/lib/elementary/elm_widget_gengrid.h
+++ b/src/lib/elementary/elm_widget_gengrid.h
@@ -178,10 +178,10 @@ struct _Elm_Gengrid_Pan_Data
 #define GG_IT(_it) (_it->item)
 
 #define ELM_GENGRID_DATA_GET(o, sd) \
-  Elm_Gengrid_Data * sd = eo_data_scope_get(o, ELM_GENGRID_CLASS)
+  Elm_Gengrid_Data * sd = efl_data_scope_get(o, ELM_GENGRID_CLASS)
 
 #define ELM_GENGRID_PAN_DATA_GET(o, sd) \
-  Elm_Gengrid_Pan_Data * sd = eo_data_scope_get(o, ELM_GENGRID_PAN_CLASS)
+  Elm_Gengrid_Pan_Data * sd = efl_data_scope_get(o, ELM_GENGRID_PAN_CLASS)
 
 #define ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd) \
   Elm_Gengrid_Data * sd = GG_IT(it)->wsd
@@ -205,7 +205,7 @@ struct _Elm_Gengrid_Pan_Data
     }
 
 #define ELM_GENGRID_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_GENGRID_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_GENGRID_CLASS))) \
     return
 
 #define ELM_GENGRID_ITEM_CHECK(it)                          \
@@ -218,10 +218,10 @@ struct _Elm_Gengrid_Pan_Data
 
 #define ELM_GENGRID_ITEM_CHECK_OR_GOTO(it, label)              \
   ELM_WIDGET_ITEM_CHECK_OR_GOTO(it->base, label); \
-  if (!it->base->widget || !eo_isa                              \
+  if (!it->base->widget || !efl_isa                              \
         ((it->base->widget), ELM_GENGRID_CLASS)) goto label;
 
 #define ELM_GENGRID_ITEM_DATA_GET(o, sd) \
-  Elm_Gen_Item* sd = eo_data_scope_get(o, ELM_GENGRID_ITEM_CLASS)
+  Elm_Gen_Item* sd = efl_data_scope_get(o, ELM_GENGRID_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_genlist.h b/src/lib/elementary/elm_widget_genlist.h
index 393f2a9321..f0cc097411 100644
--- a/src/lib/elementary/elm_widget_genlist.h
+++ b/src/lib/elementary/elm_widget_genlist.h
@@ -322,13 +322,13 @@ struct _Elm_Genlist_Filter
 #define GL_IT(_it) (_it->item)
 
 #define ELM_GENLIST_DATA_GET(o, sd) \
-  Elm_Genlist_Data * sd = eo_data_scope_get(o, ELM_GENLIST_CLASS)
+  Elm_Genlist_Data * sd = efl_data_scope_get(o, ELM_GENLIST_CLASS)
 
 #define ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd) \
   Elm_Genlist_Data * sd = GL_IT(it)->wsd
 
 #define ELM_GENLIST_PAN_DATA_GET(o, sd) \
-  Elm_Genlist_Pan_Data * sd = eo_data_scope_get(o, ELM_GENLIST_PAN_CLASS)
+  Elm_Genlist_Pan_Data * sd = efl_data_scope_get(o, ELM_GENLIST_PAN_CLASS)
 
 #define ELM_GENLIST_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_GENLIST_DATA_GET(o, ptr);                      \
@@ -349,7 +349,7 @@ struct _Elm_Genlist_Filter
     }
 
 #define ELM_GENLIST_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_GENLIST_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_GENLIST_CLASS))) \
     return
 
 #define ELM_GENLIST_ITEM_CHECK(it)                          \
@@ -362,10 +362,10 @@ struct _Elm_Genlist_Filter
 
 #define ELM_GENLIST_ITEM_CHECK_OR_GOTO(it, label)              \
   ELM_WIDGET_ITEM_CHECK_OR_GOTO(it->base, label); \
-  if (!it->base->widget || !eo_isa                              \
+  if (!it->base->widget || !efl_isa                              \
         ((it->base->widget), ELM_GENLIST_CLASS)) goto label;
 
 #define ELM_GENLIST_ITEM_DATA_GET(o, sd) \
-  Elm_Gen_Item* sd = eo_data_scope_get(o, ELM_GENLIST_ITEM_CLASS)
+  Elm_Gen_Item* sd = efl_data_scope_get(o, ELM_GENLIST_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_glview.h b/src/lib/elementary/elm_widget_glview.h
index 07bf8cb3ba..3ad104f616 100644
--- a/src/lib/elementary/elm_widget_glview.h
+++ b/src/lib/elementary/elm_widget_glview.h
@@ -54,7 +54,7 @@ struct _Elm_Glview_Data
  */
 
 #define ELM_GLVIEW_DATA_GET(o, sd) \
-  Elm_Glview_Data * sd = eo_data_scope_get(o, ELM_GLVIEW_CLASS)
+  Elm_Glview_Data * sd = efl_data_scope_get(o, ELM_GLVIEW_CLASS)
 
 #define ELM_GLVIEW_DATA_GET_OR_RETURN(o, ptr)   \
   ELM_GLVIEW_DATA_GET(o, ptr);                  \
@@ -75,7 +75,7 @@ struct _Elm_Glview_Data
     }
 
 #define ELM_GLVIEW_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_GLVIEW_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_GLVIEW_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_grid.h b/src/lib/elementary/elm_widget_grid.h
index f6467559ea..52427deef4 100644
--- a/src/lib/elementary/elm_widget_grid.h
+++ b/src/lib/elementary/elm_widget_grid.h
@@ -25,7 +25,7 @@
  */
 
 #define ELM_GRID_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_GRID_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_GRID_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_hover.h b/src/lib/elementary/elm_widget_hover.h
index 1b77fcc5c1..25fbe25a23 100644
--- a/src/lib/elementary/elm_widget_hover.h
+++ b/src/lib/elementary/elm_widget_hover.h
@@ -53,7 +53,7 @@ struct _Elm_Hover_Data
  */
 
 #define ELM_HOVER_DATA_GET(o, sd) \
-  Elm_Hover_Data * sd = eo_data_scope_get(o, ELM_HOVER_CLASS)
+  Elm_Hover_Data * sd = efl_data_scope_get(o, ELM_HOVER_CLASS)
 
 #define ELM_HOVER_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_HOVER_DATA_GET(o, ptr);                        \
@@ -74,7 +74,7 @@ struct _Elm_Hover_Data
     }
 
 #define ELM_HOVER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_HOVER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_HOVER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_hoversel.h b/src/lib/elementary/elm_widget_hoversel.h
index d8441aa529..ccc1d7475b 100644
--- a/src/lib/elementary/elm_widget_hoversel.h
+++ b/src/lib/elementary/elm_widget_hoversel.h
@@ -64,7 +64,7 @@ struct _Elm_Hoversel_Item_Data
  */
 
 #define ELM_HOVERSEL_DATA_GET(o, sd) \
-  Elm_Hoversel_Data * sd = eo_data_scope_get(o, ELM_HOVERSEL_CLASS)
+  Elm_Hoversel_Data * sd = efl_data_scope_get(o, ELM_HOVERSEL_CLASS)
 
 #define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_HOVERSEL_DATA_GET(o, ptr);                     \
@@ -85,18 +85,18 @@ struct _Elm_Hoversel_Item_Data
     }
 
 #define ELM_HOVERSEL_CHECK(obj)                          \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_HOVERSEL_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_HOVERSEL_CLASS))) \
     return
 
 #define ELM_HOVERSEL_ITEM_DATA_GET(o, sd) \
-  Elm_Hoversel_Item_Data *sd = eo_data_scope_get(o, ELM_HOVERSEL_ITEM_CLASS)
+  Elm_Hoversel_Item_Data *sd = efl_data_scope_get(o, ELM_HOVERSEL_ITEM_CLASS)
 
 #define ELM_HOVERSEL_ITEM_CHECK(it)                           \
-  if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \
     return
 
 #define ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it, ...)         \
-  if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 #endif
diff --git a/src/lib/elementary/elm_widget_icon.h b/src/lib/elementary/elm_widget_icon.h
index ab1e7f1ea8..210cfd12e6 100644
--- a/src/lib/elementary/elm_widget_icon.h
+++ b/src/lib/elementary/elm_widget_icon.h
@@ -61,7 +61,7 @@ struct _Elm_Icon_Data
  */
 
 #define ELM_ICON_DATA_GET(o, sd) \
-  Elm_Icon_Data * sd = eo_data_scope_get(o, ELM_ICON_CLASS)
+  Elm_Icon_Data * sd = efl_data_scope_get(o, ELM_ICON_CLASS)
 
 #define ELM_ICON_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_ICON_DATA_GET(o, ptr);                         \
@@ -82,7 +82,7 @@ struct _Elm_Icon_Data
     }
 
 #define ELM_ICON_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_ICON_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_ICON_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_index.h b/src/lib/elementary/elm_widget_index.h
index 9c59be530c..5b6befff99 100644
--- a/src/lib/elementary/elm_widget_index.h
+++ b/src/lib/elementary/elm_widget_index.h
@@ -77,7 +77,7 @@ struct _Elm_Index_Omit
  * @}
  */
 #define ELM_INDEX_DATA_GET(o, sd) \
-  Elm_Index_Data * sd = eo_data_scope_get(o, ELM_INDEX_CLASS)
+  Elm_Index_Data * sd = efl_data_scope_get(o, ELM_INDEX_CLASS)
 
 #define ELM_INDEX_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_INDEX_DATA_GET(o, ptr);                        \
@@ -98,18 +98,18 @@ struct _Elm_Index_Omit
     }
 
 #define ELM_INDEX_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_INDEX_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_INDEX_CLASS))) \
     return
 
 #define ELM_INDEX_ITEM_CHECK(it)                            \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_INDEX_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_INDEX_ITEM_CLASS))) \
     return
 
 #define ELM_INDEX_ITEM_CHECK_OR_RETURN(it, ...)                        \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_INDEX_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_INDEX_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 #define ELM_INDEX_ITEM_DATA_GET(o, sd) \
-  Elm_Index_Item_Data *sd = eo_data_scope_get(o, ELM_INDEX_ITEM_CLASS)
+  Elm_Index_Item_Data *sd = efl_data_scope_get(o, ELM_INDEX_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_inwin.h b/src/lib/elementary/elm_widget_inwin.h
index ae9ba0376d..3e3beb3e7f 100644
--- a/src/lib/elementary/elm_widget_inwin.h
+++ b/src/lib/elementary/elm_widget_inwin.h
@@ -33,7 +33,7 @@ struct _Elm_Inwin_Smart_Data
  */
 
 #define ELM_INWIN_DATA_GET(o, sd) \
-  Elm_Inwin_Smart_Data * sd = eo_data_scope_get(o, ELM_INWIN_CLASS)
+  Elm_Inwin_Smart_Data * sd = efl_data_scope_get(o, ELM_INWIN_CLASS)
 
 #define ELM_INWIN_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_INWIN_DATA_GET(o, ptr);                        \
@@ -54,7 +54,7 @@ struct _Elm_Inwin_Smart_Data
     }
 
 #define ELM_INWIN_CHECK(obj)                                  \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_INWIN_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_INWIN_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_label.h b/src/lib/elementary/elm_widget_label.h
index e2a02d2341..e9927f57a5 100644
--- a/src/lib/elementary/elm_widget_label.h
+++ b/src/lib/elementary/elm_widget_label.h
@@ -32,7 +32,7 @@ struct _Elm_Label_Data
 };
 
 #define ELM_LABEL_DATA_GET(o, sd) \
-  Elm_Label_Data * sd = eo_data_scope_get(o, ELM_LABEL_CLASS)
+  Elm_Label_Data * sd = efl_data_scope_get(o, ELM_LABEL_CLASS)
 
 #define ELM_LABEL_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_LABEL_DATA_GET(o, ptr);                        \
@@ -53,7 +53,7 @@ struct _Elm_Label_Data
     }
 
 #define ELM_LABEL_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_LABEL_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_LABEL_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h
index ded10f3d67..b4a2ed5384 100644
--- a/src/lib/elementary/elm_widget_layout.h
+++ b/src/lib/elementary/elm_widget_layout.h
@@ -70,10 +70,10 @@ typedef struct _Elm_Layout_Smart_Data
  */
 
 #define ELM_LAYOUT_DATA_GET(o, sd) \
-  Elm_Layout_Smart_Data * sd = eo_data_scope_get(o, ELM_LAYOUT_CLASS)
+  Elm_Layout_Smart_Data * sd = efl_data_scope_get(o, ELM_LAYOUT_CLASS)
 
 #define ELM_LAYOUT_CHECK(obj)                            \
-  if (EINA_UNLIKELY(!eo_isa(obj, ELM_LAYOUT_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(obj, ELM_LAYOUT_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_list.h b/src/lib/elementary/elm_widget_list.h
index 5feaa4ee72..aeba701d57 100644
--- a/src/lib/elementary/elm_widget_list.h
+++ b/src/lib/elementary/elm_widget_list.h
@@ -92,7 +92,7 @@ struct _Elm_List_Item_Data
  */
 
 #define ELM_LIST_DATA_GET(o, sd) \
-  Elm_List_Data * sd = eo_data_scope_get(o, ELM_LIST_CLASS)
+  Elm_List_Data * sd = efl_data_scope_get(o, ELM_LIST_CLASS)
 
 #define ELM_LIST_DATA_GET_FROM_ITEM(it, sd) \
   ELM_LIST_DATA_GET(WIDGET(it), sd)
@@ -116,7 +116,7 @@ struct _Elm_List_Item_Data
     }
 
 #define ELM_LIST_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_LIST_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_LIST_CLASS))) \
     return
 
 #define ELM_LIST_ITEM_CHECK(it)                             \
@@ -138,6 +138,6 @@ struct _Elm_List_Item_Data
     }
 
 #define ELM_LIST_ITEM_DATA_GET(o, sd) \
-  Elm_List_Item_Data* sd = eo_data_scope_get(o, ELM_LIST_ITEM_CLASS)
+  Elm_List_Item_Data* sd = efl_data_scope_get(o, ELM_LIST_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_map.h b/src/lib/elementary/elm_widget_map.h
index b9e96eafe8..4e2da1b89e 100644
--- a/src/lib/elementary/elm_widget_map.h
+++ b/src/lib/elementary/elm_widget_map.h
@@ -504,10 +504,10 @@ struct _Elm_Map_Pan_Data
  */
 
 #define ELM_MAP_DATA_GET(o, sd) \
-  Elm_Map_Data * sd = eo_data_scope_get(o, ELM_MAP_CLASS)
+  Elm_Map_Data * sd = efl_data_scope_get(o, ELM_MAP_CLASS)
 
 #define ELM_MAP_PAN_DATA_GET(o, sd) \
-  Elm_Map_Pan_Data * sd = eo_data_scope_get(o, ELM_MAP_PAN_CLASS)
+  Elm_Map_Pan_Data * sd = efl_data_scope_get(o, ELM_MAP_PAN_CLASS)
 
 #define ELM_MAP_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_MAP_DATA_GET(o, ptr);                     \
@@ -528,7 +528,7 @@ struct _Elm_Map_Pan_Data
     }
 
 #define ELM_MAP_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_MAP_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_MAP_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_mapbuf.h b/src/lib/elementary/elm_widget_mapbuf.h
index bf905a9763..c6742dd2eb 100644
--- a/src/lib/elementary/elm_widget_mapbuf.h
+++ b/src/lib/elementary/elm_widget_mapbuf.h
@@ -47,7 +47,7 @@ struct _Elm_Mapbuf_Data
  */
 
 #define ELM_MAPBUF_DATA_GET(o, sd) \
-  Elm_Mapbuf_Data * sd = eo_data_scope_get(o, ELM_MAPBUF_CLASS)
+  Elm_Mapbuf_Data * sd = efl_data_scope_get(o, ELM_MAPBUF_CLASS)
 
 #define ELM_MAPBUF_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_MAPBUF_DATA_GET(o, ptr);                       \
@@ -68,7 +68,7 @@ struct _Elm_Mapbuf_Data
     }
 
 #define ELM_MAPBUF_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_MAPBUF_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_MAPBUF_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_menu.h b/src/lib/elementary/elm_widget_menu.h
index 73f6a28bea..f60fc59b3c 100644
--- a/src/lib/elementary/elm_widget_menu.h
+++ b/src/lib/elementary/elm_widget_menu.h
@@ -68,7 +68,7 @@ struct _Elm_Menu_Item_Data
  */
 
 #define ELM_MENU_DATA_GET(o, sd) \
-  Elm_Menu_Data * sd = eo_data_scope_get(o, ELM_MENU_CLASS)
+  Elm_Menu_Data * sd = efl_data_scope_get(o, ELM_MENU_CLASS)
 
 #define ELM_MENU_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_MENU_DATA_GET(o, ptr);                         \
@@ -89,18 +89,18 @@ struct _Elm_Menu_Item_Data
     }
 
 #define ELM_MENU_ITEM_DATA_GET(o, sd) \
-  Elm_Menu_Item_Data *sd = eo_data_scope_get(o, ELM_MENU_ITEM_CLASS)
+  Elm_Menu_Item_Data *sd = efl_data_scope_get(o, ELM_MENU_ITEM_CLASS)
 
 #define ELM_MENU_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_MENU_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_MENU_CLASS))) \
     return
 
 #define ELM_MENU_ITEM_CHECK(it)                             \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_MENU_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_MENU_ITEM_CLASS))) \
     return
 
 #define ELM_MENU_ITEM_CHECK_OR_RETURN(it, ...)             \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_MENU_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_MENU_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 
diff --git a/src/lib/elementary/elm_widget_multibuttonentry.h b/src/lib/elementary/elm_widget_multibuttonentry.h
index 87323ea16c..d996a438e2 100644
--- a/src/lib/elementary/elm_widget_multibuttonentry.h
+++ b/src/lib/elementary/elm_widget_multibuttonentry.h
@@ -115,7 +115,7 @@ struct _Elm_Multibuttonentry_Data
  */
 
 #define ELM_MULTIBUTTONENTRY_DATA_GET(o, sd) \
-  Elm_Multibuttonentry_Data *sd = eo_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS);
+  Elm_Multibuttonentry_Data *sd = efl_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS);
 
 #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(o, ptr) \
   ELM_MULTIBUTTONENTRY_DATA_GET(o, ptr);                \
@@ -127,7 +127,7 @@ struct _Elm_Multibuttonentry_Data
     }
 
 #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
-  Elm_Multibuttonentry_Data * ptr = eo_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS); \
+  Elm_Multibuttonentry_Data * ptr = efl_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS); \
   if (EINA_UNLIKELY(!ptr))                                       \
     {                                                            \
        CRI("No widget data for object %p (%s)",                  \
@@ -136,18 +136,18 @@ struct _Elm_Multibuttonentry_Data
     }
 
 #define ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(o, sd) \
-  Elm_Multibuttonentry_Item_Data *sd = eo_data_scope_get(o, ELM_MULTIBUTTONENTRY_ITEM_CLASS)
+  Elm_Multibuttonentry_Item_Data *sd = efl_data_scope_get(o, ELM_MULTIBUTTONENTRY_ITEM_CLASS)
 
 #define ELM_MULTIBUTTONENTRY_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_MULTIBUTTONENTRY_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_MULTIBUTTONENTRY_CLASS))) \
     return
 
 #define ELM_MULTIBUTTONENTRY_ITEM_CHECK(it)                 \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_MULTIBUTTONENTRY_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_MULTIBUTTONENTRY_ITEM_CLASS))) \
     return
 
 #define ELM_MULTIBUTTONENTRY_ITEM_CHECK_OR_RETURN(it, ...)             \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_MULTIBUTTONENTRY_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_MULTIBUTTONENTRY_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 #endif
diff --git a/src/lib/elementary/elm_widget_naviframe.h b/src/lib/elementary/elm_widget_naviframe.h
index 249bf08973..95ce2630ad 100644
--- a/src/lib/elementary/elm_widget_naviframe.h
+++ b/src/lib/elementary/elm_widget_naviframe.h
@@ -98,7 +98,7 @@ struct _Elm_Naviframe_Text_Item_Pair
  */
 
 #define ELM_NAVIFRAME_DATA_GET(o, sd) \
-  Elm_Naviframe_Data * sd = eo_data_scope_get(o, ELM_NAVIFRAME_CLASS)
+  Elm_Naviframe_Data * sd = efl_data_scope_get(o, ELM_NAVIFRAME_CLASS)
 
 #define ELM_NAVIFRAME_DATA_GET_OR_RETURN(o, ptr)     \
   ELM_NAVIFRAME_DATA_GET(o, ptr);                    \
@@ -119,18 +119,18 @@ struct _Elm_Naviframe_Text_Item_Pair
     }
 
 #define ELM_NAVIFRAME_CHECK(obj)                                 \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_NAVIFRAME_CLASS)))    \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_NAVIFRAME_CLASS)))    \
     return
 
 #define ELM_NAVIFRAME_ITEM_CHECK(it)                        \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_NAVIFRAME_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_NAVIFRAME_ITEM_CLASS))) \
     return
 
 #define ELM_NAVIFRAME_ITEM_CHECK_OR_RETURN(it, ...)        \
-  if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_NAVIFRAME_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((it->base->eo_obj), ELM_NAVIFRAME_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 #define ELM_NAVIFRAME_ITEM_DATA_GET(o, sd) \
-  Elm_Naviframe_Item_Data *sd = eo_data_scope_get(o, ELM_NAVIFRAME_ITEM_CLASS)
+  Elm_Naviframe_Item_Data *sd = efl_data_scope_get(o, ELM_NAVIFRAME_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_notify.h b/src/lib/elementary/elm_widget_notify.h
index e9ddab9dda..6d570a5748 100644
--- a/src/lib/elementary/elm_widget_notify.h
+++ b/src/lib/elementary/elm_widget_notify.h
@@ -43,7 +43,7 @@ struct _Elm_Notify_Data
  */
 
 #define ELM_NOTIFY_DATA_GET(o, sd) \
-  Elm_Notify_Data * sd = eo_data_scope_get(o, ELM_NOTIFY_CLASS)
+  Elm_Notify_Data * sd = efl_data_scope_get(o, ELM_NOTIFY_CLASS)
 
 #define ELM_NOTIFY_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_NOTIFY_DATA_GET(o, ptr);                       \
@@ -64,7 +64,7 @@ struct _Elm_Notify_Data
     }
 
 #define ELM_NOTIFY_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_NOTIFY_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_NOTIFY_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_panel.h b/src/lib/elementary/elm_widget_panel.h
index 1072408a27..a558335e0f 100644
--- a/src/lib/elementary/elm_widget_panel.h
+++ b/src/lib/elementary/elm_widget_panel.h
@@ -52,7 +52,7 @@ struct _Elm_Panel_Data
  */
 
 #define ELM_PANEL_DATA_GET(o, sd) \
-  Elm_Panel_Data * sd = eo_data_scope_get(o, ELM_PANEL_CLASS)
+  Elm_Panel_Data * sd = efl_data_scope_get(o, ELM_PANEL_CLASS)
 
 #define ELM_PANEL_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PANEL_DATA_GET(o, ptr);                        \
@@ -73,7 +73,7 @@ struct _Elm_Panel_Data
     }
 
 #define ELM_PANEL_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PANEL_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PANEL_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_panes.h b/src/lib/elementary/elm_widget_panes.h
index 6528354c27..47ac2d6114 100644
--- a/src/lib/elementary/elm_widget_panes.h
+++ b/src/lib/elementary/elm_widget_panes.h
@@ -50,7 +50,7 @@ struct _Elm_Panes_Data
  */
 
 #define ELM_PANES_DATA_GET(o, sd) \
-  Elm_Panes_Data * sd = eo_data_scope_get(o, ELM_PANES_CLASS)
+  Elm_Panes_Data * sd = efl_data_scope_get(o, ELM_PANES_CLASS)
 
 #define ELM_PANES_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PANES_DATA_GET(o, ptr);                        \
@@ -71,7 +71,7 @@ struct _Elm_Panes_Data
     }
 
 #define ELM_PANES_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PANES_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PANES_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_photo.h b/src/lib/elementary/elm_widget_photo.h
index a4d151f3bb..e6b5b769d5 100644
--- a/src/lib/elementary/elm_widget_photo.h
+++ b/src/lib/elementary/elm_widget_photo.h
@@ -49,7 +49,7 @@ struct _Elm_Photo_Data
  */
 
 #define ELM_PHOTO_DATA_GET(o, sd) \
-  Elm_Photo_Data * sd = eo_data_scope_get(o, ELM_PHOTO_CLASS)
+  Elm_Photo_Data * sd = efl_data_scope_get(o, ELM_PHOTO_CLASS)
 
 #define ELM_PHOTO_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PHOTO_DATA_GET(o, ptr);                        \
@@ -70,7 +70,7 @@ struct _Elm_Photo_Data
     }
 
 #define ELM_PHOTO_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PHOTO_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PHOTO_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_photocam.h b/src/lib/elementary/elm_widget_photocam.h
index 8c03e59f5a..297ce5ed9b 100644
--- a/src/lib/elementary/elm_widget_photocam.h
+++ b/src/lib/elementary/elm_widget_photocam.h
@@ -142,10 +142,10 @@ struct _Elm_Photocam_Pan_Data
  */
 
 #define ELM_PHOTOCAM_DATA_GET(o, sd) \
-  Elm_Photocam_Data * sd = eo_data_scope_get(o, ELM_PHOTOCAM_CLASS)
+  Elm_Photocam_Data * sd = efl_data_scope_get(o, ELM_PHOTOCAM_CLASS)
 
 #define ELM_PHOTOCAM_PAN_DATA_GET(o, sd) \
-  Elm_Photocam_Pan_Data * sd = eo_data_scope_get(o, ELM_PHOTOCAM_PAN_CLASS)
+  Elm_Photocam_Pan_Data * sd = efl_data_scope_get(o, ELM_PHOTOCAM_PAN_CLASS)
 
 #define ELM_PHOTOCAM_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_PHOTOCAM_DATA_GET(o, ptr);                     \
@@ -166,7 +166,7 @@ struct _Elm_Photocam_Pan_Data
     }
 
 #define ELM_PHOTOCAM_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PHOTOCAM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PHOTOCAM_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_player.h b/src/lib/elementary/elm_widget_player.h
index fd71ba4ca0..6f2ab427e4 100644
--- a/src/lib/elementary/elm_widget_player.h
+++ b/src/lib/elementary/elm_widget_player.h
@@ -52,7 +52,7 @@ struct _Elm_Player_Data
  */
 
 #define ELM_PLAYER_DATA_GET(o, sd) \
-  Elm_Player_Data * sd = eo_data_scope_get(o, ELM_PLAYER_CLASS)
+  Elm_Player_Data * sd = efl_data_scope_get(o, ELM_PLAYER_CLASS)
 
 #define ELM_PLAYER_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_PLAYER_DATA_GET(o, ptr);                       \
@@ -73,7 +73,7 @@ struct _Elm_Player_Data
     }
 
 #define ELM_PLAYER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PLAYER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PLAYER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_plug.h b/src/lib/elementary/elm_widget_plug.h
index 3f534b5375..4ab72ef4ff 100644
--- a/src/lib/elementary/elm_widget_plug.h
+++ b/src/lib/elementary/elm_widget_plug.h
@@ -24,7 +24,7 @@
  */
 
 #define ELM_PLUG_DATA_GET(o, sd) \
-     Elm_Plug_Smart_Data * sd = eo_data_scope_get(o, ELM_PLUG_CLASS)
+     Elm_Plug_Smart_Data * sd = efl_data_scope_get(o, ELM_PLUG_CLASS)
 
 #define ELM_PLUG_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_PLUG_DATA_GET(o, ptr);                         \
@@ -45,7 +45,7 @@
     }
 
 #define ELM_PLUG_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PLUG_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PLUG_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_popup.h b/src/lib/elementary/elm_widget_popup.h
index 27e9a59bd5..f11c268531 100644
--- a/src/lib/elementary/elm_widget_popup.h
+++ b/src/lib/elementary/elm_widget_popup.h
@@ -79,7 +79,7 @@ struct _Action_Area_Data
  */
 
 #define ELM_POPUP_DATA_GET(o, sd) \
-  Elm_Popup_Data * sd = eo_data_scope_get(o, ELM_POPUP_CLASS)
+  Elm_Popup_Data * sd = efl_data_scope_get(o, ELM_POPUP_CLASS)
 
 #define ELM_POPUP_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_POPUP_DATA_GET(o, ptr);                        \
@@ -100,7 +100,7 @@ struct _Action_Area_Data
     }
 
 #define ELM_POPUP_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_POPUP_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_POPUP_CLASS))) \
     return
 
 #define ELM_POPUP_ITEM_CHECK(it)                            \
@@ -112,6 +112,6 @@ struct _Action_Area_Data
   ELM_POPUP_CHECK(it->base->widget) __VA_ARGS__;
 
 #define ELM_POPUP_ITEM_DATA_GET(o, sd) \
-  Elm_Popup_Item_Data* sd = eo_data_scope_get(o, ELM_POPUP_ITEM_CLASS)
+  Elm_Popup_Item_Data* sd = efl_data_scope_get(o, ELM_POPUP_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_prefs.h b/src/lib/elementary/elm_widget_prefs.h
index b1347671f8..4b5f1263ec 100644
--- a/src/lib/elementary/elm_widget_prefs.h
+++ b/src/lib/elementary/elm_widget_prefs.h
@@ -96,7 +96,7 @@ extern const Eina_Hash *elm_prefs_item_type_widgets_map;
 extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
 
 #define ELM_PREFS_DATA_GET(o, sd) \
-  Elm_Prefs_Data * sd = eo_data_scope_get(o, ELM_PREFS_CLASS)
+  Elm_Prefs_Data * sd = efl_data_scope_get(o, ELM_PREFS_CLASS)
 
 #define ELM_PREFS_ENTRY(o, sd)                                              \
   if (EINA_UNLIKELY(!sd->data_file || !sd->page))                           \
@@ -125,7 +125,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
     }
 
 #define ELM_PREFS_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PREFS_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PREFS_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_progressbar.h b/src/lib/elementary/elm_widget_progressbar.h
index 8176bb4670..0ebec8a254 100644
--- a/src/lib/elementary/elm_widget_progressbar.h
+++ b/src/lib/elementary/elm_widget_progressbar.h
@@ -54,7 +54,7 @@ struct _Elm_Progress_Status
  */
 
 #define ELM_PROGRESSBAR_DATA_GET(o, sd) \
-  Elm_Progressbar_Data * sd = eo_data_scope_get(o, ELM_PROGRESSBAR_CLASS)
+  Elm_Progressbar_Data * sd = efl_data_scope_get(o, ELM_PROGRESSBAR_CLASS)
 
 #define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr)   \
   ELM_PROGRESSBAR_DATA_GET(o, ptr);                  \
@@ -75,7 +75,7 @@ struct _Elm_Progress_Status
     }
 
 #define ELM_PROGRESSBAR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_PROGRESSBAR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PROGRESSBAR_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_radio.h b/src/lib/elementary/elm_widget_radio.h
index 0243164310..b183aaa481 100644
--- a/src/lib/elementary/elm_widget_radio.h
+++ b/src/lib/elementary/elm_widget_radio.h
@@ -46,7 +46,7 @@ struct _Elm_Radio_Data
  */
 
 #define ELM_RADIO_DATA_GET(o, sd) \
-  Elm_Radio_Data * sd = eo_data_scope_get(o, ELM_RADIO_CLASS)
+  Elm_Radio_Data * sd = efl_data_scope_get(o, ELM_RADIO_CLASS)
 
 #define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_RADIO_DATA_GET(o, ptr);                        \
@@ -67,7 +67,7 @@ struct _Elm_Radio_Data
     }
 
 #define ELM_RADIO_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_RADIO_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_RADIO_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_route.h b/src/lib/elementary/elm_widget_route.h
index 6c54f05f66..6eaf39c1e6 100644
--- a/src/lib/elementary/elm_widget_route.h
+++ b/src/lib/elementary/elm_widget_route.h
@@ -57,7 +57,7 @@ struct Segment
  */
 
 #define ELM_ROUTE_DATA_GET(o, sd) \
-  Elm_Route_Data * sd = eo_data_scope_get(o, ELM_ROUTE_CLASS)
+  Elm_Route_Data * sd = efl_data_scope_get(o, ELM_ROUTE_CLASS)
 
 #define ELM_ROUTE_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_ROUTE_DATA_GET(o, ptr);                        \
@@ -78,7 +78,7 @@ struct Segment
     }
 
 #define ELM_ROUTE_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_ROUTE_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_ROUTE_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_scroller.h b/src/lib/elementary/elm_widget_scroller.h
index 6e6875dc31..29ec6bd99c 100644
--- a/src/lib/elementary/elm_widget_scroller.h
+++ b/src/lib/elementary/elm_widget_scroller.h
@@ -44,7 +44,7 @@ struct _Elm_Scroller_Data
  */
 
 #define ELM_SCROLLER_DATA_GET(o, sd) \
-  Elm_Scroller_Data * sd = eo_data_scope_get(o, ELM_SCROLLER_CLASS)
+  Elm_Scroller_Data * sd = efl_data_scope_get(o, ELM_SCROLLER_CLASS)
 
 #define ELM_SCROLLER_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_SCROLLER_DATA_GET(o, ptr);                     \
@@ -65,7 +65,7 @@ struct _Elm_Scroller_Data
     }
 
 #define ELM_SCROLLER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_SCROLLER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_SCROLLER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_segment_control.h b/src/lib/elementary/elm_widget_segment_control.h
index fcee8a7a99..79bdf79f0a 100644
--- a/src/lib/elementary/elm_widget_segment_control.h
+++ b/src/lib/elementary/elm_widget_segment_control.h
@@ -50,7 +50,7 @@ struct _Elm_Segment_Control_Item_Data
  */
 
 #define ELM_SEGMENT_CONTROL_DATA_GET(o, sd) \
-  Elm_Segment_Control_Data * sd = eo_data_scope_get(o, ELM_SEGMENT_CONTROL_CLASS)
+  Elm_Segment_Control_Data * sd = efl_data_scope_get(o, ELM_SEGMENT_CONTROL_CLASS)
 
 #define ELM_SEGMENT_CONTROL_DATA_GET_OR_RETURN(o, ptr) \
   ELM_SEGMENT_CONTROL_DATA_GET(o, ptr);                \
@@ -71,18 +71,18 @@ struct _Elm_Segment_Control_Item_Data
     }
 
 #define ELM_SEGMENT_CONTROL_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_SEGMENT_CONTROL_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_SEGMENT_CONTROL_CLASS))) \
     return
 
 #define ELM_SEGMENT_ITEM_DATA_GET(o, sd) \
-  Elm_Segment_Control_Item_Data *sd = eo_data_scope_get(o, ELM_SEGMENT_CONTROL_ITEM_CLASS)
+  Elm_Segment_Control_Item_Data *sd = efl_data_scope_get(o, ELM_SEGMENT_CONTROL_ITEM_CLASS)
 
 #define ELM_SEGMENT_CONTROL_ITEM_CHECK(it)                  \
- if (EINA_UNLIKELY(!eo_isa((it)->base->eo_obj, ELM_SEGMENT_CONTROL_ITEM_CLASS)))   \
+ if (EINA_UNLIKELY(!efl_isa((it)->base->eo_obj, ELM_SEGMENT_CONTROL_ITEM_CLASS)))   \
     return
 
 #define ELM_SEGMENT_CONTROL_ITEM_CHECK_OR_RETURN(it, ...)    \
- if (EINA_UNLIKELY(!eo_isa((it)->base->eo_obj, ELM_SEGMENT_CONTROL_ITEM_CLASS)))    \
+ if (EINA_UNLIKELY(!efl_isa((it)->base->eo_obj, ELM_SEGMENT_CONTROL_ITEM_CLASS)))    \
     return __VA_ARGS__;
 
 #endif
diff --git a/src/lib/elementary/elm_widget_separator.h b/src/lib/elementary/elm_widget_separator.h
index 2b0d44c96a..7351abd9d6 100644
--- a/src/lib/elementary/elm_widget_separator.h
+++ b/src/lib/elementary/elm_widget_separator.h
@@ -34,7 +34,7 @@ struct _Elm_Separator_Data
  */
 
 #define ELM_SEPARATOR_DATA_GET(o, sd) \
-  Elm_Separator_Data * sd = eo_data_scope_get(o, ELM_SEPARATOR_CLASS)
+  Elm_Separator_Data * sd = efl_data_scope_get(o, ELM_SEPARATOR_CLASS)
 
 #define ELM_SEPARATOR_DATA_GET_OR_RETURN(o, ptr)     \
   ELM_SEPARATOR_DATA_GET(o, ptr);                    \
@@ -55,7 +55,7 @@ struct _Elm_Separator_Data
     }
 
 #define ELM_SEPARATOR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_SEPARATOR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_SEPARATOR_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_slider.h b/src/lib/elementary/elm_widget_slider.h
index 6e136e6a9d..ee23efa194 100644
--- a/src/lib/elementary/elm_widget_slider.h
+++ b/src/lib/elementary/elm_widget_slider.h
@@ -64,7 +64,7 @@ struct _Elm_Slider_Data
  */
 
 #define ELM_SLIDER_DATA_GET(o, sd) \
-  Elm_Slider_Data * sd = eo_data_scope_get(o, ELM_SLIDER_CLASS)
+  Elm_Slider_Data * sd = efl_data_scope_get(o, ELM_SLIDER_CLASS)
 
 #define ELM_SLIDER_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_SLIDER_DATA_GET(o, ptr);                       \
@@ -85,7 +85,7 @@ struct _Elm_Slider_Data
     }
 
 #define ELM_SLIDER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_SLIDER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_SLIDER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_slideshow.h b/src/lib/elementary/elm_widget_slideshow.h
index 71e8fddd34..e1226a4770 100644
--- a/src/lib/elementary/elm_widget_slideshow.h
+++ b/src/lib/elementary/elm_widget_slideshow.h
@@ -65,7 +65,7 @@ struct _Elm_Slideshow_Data
  */
 
 #define ELM_SLIDESHOW_DATA_GET(o, sd) \
-  Elm_Slideshow_Data * sd = eo_data_scope_get(o, ELM_SLIDESHOW_CLASS)
+  Elm_Slideshow_Data * sd = efl_data_scope_get(o, ELM_SLIDESHOW_CLASS)
 
 #define ELM_SLIDESHOW_DATA_GET_OR_RETURN(o, ptr)     \
   ELM_SLIDESHOW_DATA_GET(o, ptr);                    \
@@ -86,18 +86,18 @@ struct _Elm_Slideshow_Data
     }
 
 #define ELM_SLIDESHOW_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_SLIDESHOW_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_SLIDESHOW_CLASS))) \
     return
 
 #define ELM_SLIDESHOW_ITEM_CHECK(obj)                          \
-  if (EINA_UNLIKELY(!eo_isa(EO_OBJ(obj), ELM_SLIDESHOW_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(EO_OBJ(obj), ELM_SLIDESHOW_ITEM_CLASS))) \
     return
 
 #define ELM_SLIDESHOW_ITEM_CHECK_OR_RETURN(obj, ...)           \
-  if (EINA_UNLIKELY(!eo_isa(EO_OBJ(obj), ELM_SLIDESHOW_ITEM_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa(EO_OBJ(obj), ELM_SLIDESHOW_ITEM_CLASS))) \
     return __VA_ARGS__;
 
 #define ELM_SLIDESHOW_ITEM_DATA_GET(o, sd) \
-  Elm_Slideshow_Item_Data *sd = eo_data_scope_get(o, ELM_SLIDESHOW_ITEM_CLASS)
+  Elm_Slideshow_Item_Data *sd = efl_data_scope_get(o, ELM_SLIDESHOW_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_spinner.h b/src/lib/elementary/elm_widget_spinner.h
index 390c63b7da..0ffb86c903 100644
--- a/src/lib/elementary/elm_widget_spinner.h
+++ b/src/lib/elementary/elm_widget_spinner.h
@@ -64,7 +64,7 @@ struct _Elm_Spinner_Special_Value
  */
 
 #define ELM_SPINNER_DATA_GET(o, sd) \
-  Elm_Spinner_Data * sd = eo_data_scope_get(o, ELM_SPINNER_CLASS)
+  Elm_Spinner_Data * sd = efl_data_scope_get(o, ELM_SPINNER_CLASS)
 
 #define ELM_SPINNER_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_SPINNER_DATA_GET(o, ptr);                      \
@@ -85,7 +85,7 @@ struct _Elm_Spinner_Special_Value
     }
 
 #define ELM_SPINNER_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_SPINNER_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_SPINNER_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_table.h b/src/lib/elementary/elm_widget_table.h
index f446b75ebe..e5c599f432 100644
--- a/src/lib/elementary/elm_widget_table.h
+++ b/src/lib/elementary/elm_widget_table.h
@@ -25,7 +25,7 @@
  */
 
 #define ELM_TABLE_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_TABLE_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_TABLE_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_thumb.h b/src/lib/elementary/elm_widget_thumb.h
index c79285cd90..d7aeee798a 100644
--- a/src/lib/elementary/elm_widget_thumb.h
+++ b/src/lib/elementary/elm_widget_thumb.h
@@ -72,7 +72,7 @@ struct _Elm_Thumb_Data
  */
 
 #define ELM_THUMB_DATA_GET(o, sd) \
-  Elm_Thumb_Data * sd = eo_data_scope_get(o, ELM_THUMB_CLASS)
+  Elm_Thumb_Data * sd = efl_data_scope_get(o, ELM_THUMB_CLASS)
 
 #define ELM_THUMB_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_THUMB_DATA_GET(o, ptr);                        \
@@ -93,7 +93,7 @@ struct _Elm_Thumb_Data
     }
 
 #define ELM_THUMB_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_THUMB_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_THUMB_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_widget_toolbar.h b/src/lib/elementary/elm_widget_toolbar.h
index 15d9e23775..9ea98aba63 100644
--- a/src/lib/elementary/elm_widget_toolbar.h
+++ b/src/lib/elementary/elm_widget_toolbar.h
@@ -95,7 +95,7 @@ struct _Elm_Toolbar_Item_Data
  */
 
 #define ELM_TOOLBAR_DATA_GET(o, sd) \
-  Elm_Toolbar_Data * sd = eo_data_scope_get(o, ELM_TOOLBAR_CLASS)
+  Elm_Toolbar_Data * sd = efl_data_scope_get(o, ELM_TOOLBAR_CLASS)
 
 #define ELM_TOOLBAR_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_TOOLBAR_DATA_GET(o, ptr);                      \
@@ -116,7 +116,7 @@ struct _Elm_Toolbar_Item_Data
     }
 
 #define ELM_TOOLBAR_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_TOOLBAR_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_TOOLBAR_CLASS))) \
     return
 
 #define ELM_TOOLBAR_ITEM_CHECK(it)                          \
@@ -129,9 +129,9 @@ struct _Elm_Toolbar_Item_Data
 
 #define ELM_TOOLBAR_ITEM_CHECK_OR_GOTO(it, label)              \
   ELM_WIDGET_ITEM_CHECK_OR_GOTO(it->base, label); \
-  if (!it->base->widget || !eo_isa ((it->base->widget), ELM_TOOLBAR_CLASS)) goto label;
+  if (!it->base->widget || !efl_isa ((it->base->widget), ELM_TOOLBAR_CLASS)) goto label;
 
 #define ELM_TOOLBAR_ITEM_DATA_GET(o, sd) \
-  Elm_Toolbar_Item_Data *sd = eo_data_scope_get(o, ELM_TOOLBAR_ITEM_CLASS)
+  Elm_Toolbar_Item_Data *sd = efl_data_scope_get(o, ELM_TOOLBAR_ITEM_CLASS)
 
 #endif
diff --git a/src/lib/elementary/elm_widget_web.h b/src/lib/elementary/elm_widget_web.h
index f71617e076..5fc6bd8def 100644
--- a/src/lib/elementary/elm_widget_web.h
+++ b/src/lib/elementary/elm_widget_web.h
@@ -39,7 +39,7 @@ typedef struct _Elm_Web_Callback_Proxy_Context Elm_Web_Callback_Proxy_Context;
  */
 
 #define ELM_WEB_DATA_GET(o, sd) \
-  Elm_Web_Data * sd = eo_data_scope_get(o, ELM_WEB_CLASS)
+  Elm_Web_Data * sd = efl_data_scope_get(o, ELM_WEB_CLASS)
 
 #define ELM_WEB_DATA_GET_OR_RETURN(o, ptr)           \
   ELM_WEB_DATA_GET(o, ptr);                          \
@@ -60,7 +60,7 @@ typedef struct _Elm_Web_Callback_Proxy_Context Elm_Web_Callback_Proxy_Context;
     }
 
 #define ELM_WEB_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!eo_isa((obj), ELM_WEB_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), ELM_WEB_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index a2d6b7a1a0..f25ba35129 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -440,7 +440,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
         Evas_Object *top;
 
         top = elm_widget_top_get(cur->owner);
-        if ((top) && (eo_isa(top, EFL_UI_WIN_CLASS)))
+        if ((top) && (efl_isa(top, EFL_UI_WIN_CLASS)))
           {
 #ifdef HAVE_ELEMENTARY_X
              cur->x.win = elm_win_xwindow_get(top);
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index dee012f89d..f5c54251a3 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -507,7 +507,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
    /* win reports its screen position for x/y;
     * reset to 0 since we expect canvas coords here
     */
-   if (eo_isa(tt->eventarea, EFL_UI_WIN_CLASS))
+   if (efl_isa(tt->eventarea, EFL_UI_WIN_CLASS))
      ox = oy = 0;
    TTDBG("EVENTAREA:  ox=%d,oy=%d,ow=%d,oh=%d\n", ox, oy, ow, oh);
 
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index 346523fb07..273bb9acc4 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -576,9 +576,9 @@ emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst)
 }
 
 void
-emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
+emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
 {
-   EMOTION_ENGINE_INSTANCE_CALL(inst, video_data_size_get, w, h);
+   EMOTION_ENGINE_INSTANCE_CALL(inst, videfl_data_size_get, w, h);
 }
 
 Eina_Bool
diff --git a/src/lib/emotion/emotion_modules.h b/src/lib/emotion/emotion_modules.h
index 0ff2065fe3..eb9af156ea 100644
--- a/src/lib/emotion/emotion_modules.h
+++ b/src/lib/emotion/emotion_modules.h
@@ -91,7 +91,7 @@ struct _Emotion_Engine
    int            (*seekable) (void *ef);
    void           (*frame_done) (void *ef);
    Emotion_Format (*format_get) (void *ef);
-   void           (*video_data_size_get) (void *ef, int *w, int *h);
+   void           (*videfl_data_size_get) (void *ef, int *w, int *h);
    int            (*yuv_rows_get) (void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
    int            (*bgra_data_get) (void *ef, unsigned char **bgra_data);
    void           (*event_feed) (void *ef, int event);
diff --git a/src/lib/emotion/emotion_private.h b/src/lib/emotion/emotion_private.h
index e50a2a8753..cb66c6a628 100644
--- a/src/lib/emotion/emotion_private.h
+++ b/src/lib/emotion/emotion_private.h
@@ -51,7 +51,7 @@ Eina_Bool      emotion_engine_instance_audio_handled(Emotion_Engine_Instance *in
 Eina_Bool      emotion_engine_instance_seekable(Emotion_Engine_Instance *inst);
 void           emotion_engine_instance_frame_done(Emotion_Engine_Instance *inst);
 Emotion_Format emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst);
-void           emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
+void           emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
 Eina_Bool      emotion_engine_instance_yuv_rows_get(const Emotion_Engine_Instance *inst, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
 Eina_Bool      emotion_engine_instance_bgra_data_get(const Emotion_Engine_Instance *inst, unsigned char **bgra_data);
 void           emotion_engine_instance_event_feed(Emotion_Engine_Instance *inst, int event);
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index c01e9d1286..f9302e5016 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -24,22 +24,22 @@
 #define E_SMART_OBJ_GET(smart, o, type) \
      { \
         if (!o) return; \
-        if (!eo_isa(o, MY_CLASS)) { \
+        if (!efl_isa(o, MY_CLASS)) { \
              ERR("Tried calling on a non-emotion object."); \
              return; \
         } \
-        smart = eo_data_scope_get(o, MY_CLASS); \
+        smart = efl_data_scope_get(o, MY_CLASS); \
         if (!smart) return; \
      }
 
 #define E_SMART_OBJ_GET_RETURN(smart, o, type, ret) \
    { \
       if (!o) return ret; \
-      if (!eo_isa(o, MY_CLASS)) { \
+      if (!efl_isa(o, MY_CLASS)) { \
            ERR("Tried calling on a non-emotion object."); \
            return ret; \
       } \
-      smart = eo_data_scope_get(o, MY_CLASS); \
+      smart = efl_data_scope_get(o, MY_CLASS); \
       if (!smart) return ret; \
    }
 
@@ -238,14 +238,14 @@ EAPI Evas_Object *
 emotion_object_add(Evas *evas)
 {
    Evas_Object *e;
-   e = eo_add(MY_CLASS, evas);
+   e = efl_add(MY_CLASS, evas);
    return e;
 }
 
 EOLIAN static Eo *
 _emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, E_OBJ_NAME);
 
    return obj;
@@ -1777,7 +1777,7 @@ _pixels_get(void *data, Evas_Object *obj)
 
    sd = data;
    if (!sd->engine_instance) return;
-   emotion_engine_instance_video_data_size_get(sd->engine_instance, &w, &h);
+   emotion_engine_instance_videfl_data_size_get(sd->engine_instance, &w, &h);
    w = (w >> 1) << 1;
    h = (h >> 1) << 1;
 
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 6183f04dcc..fe3cbee2b0 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -125,54 +125,54 @@ typedef Eo Efl_Object;
 #ifdef EFL_BETA_API_SUPPORT
 
 /**
- * @var _eo_class_creation_lock
+ * @var _efl_class_creation_lock
  * This variable is used for locking purposes in the class_get function
- * defined in #EO_DEFINE_CLASS.
+ * defined in #EFL_DEFINE_CLASS.
  * This is just to work around the fact that we need to init locks before
  * using them.
  * Don't touch it if you don't know what you are doing.
  * @internal
  */
-EAPI extern Eina_Spinlock _eo_class_creation_lock;
+EAPI extern Eina_Spinlock _efl_class_creation_lock;
 
 /**
- * @var _eo_init_generation
+ * @var _efl_object_init_generation
  * This variable stores the current eo init generation. That is, how many times
  * we have completed full init/shutdown cycles. Starts at 1 and incremeted on
  * every call to shutdown that actually shuts down eo.
  * @internal
  */
-EAPI extern unsigned int _eo_init_generation;
+EAPI extern unsigned int _efl_object_init_generation;
 
 /**
  * @internal
  * An enum representing the possible types of an Op.
  */
-enum _Eo_Op_Type
+enum _Efl_Object_Op_Type
 {
-   EO_OP_TYPE_INVALID = -1, /**< Invalid op. */
-   EO_OP_TYPE_REGULAR = 0, /**< Regular op. */
-   EO_OP_TYPE_CLASS, /**< Class op - a class op. Like static in Java/C++. */
-   EO_OP_TYPE_REGULAR_OVERRIDE, /**< Regular op override (previously defined) */
-   EO_OP_TYPE_CLASS_OVERRIDE, /**< Class op override (previously defined) */
+   EFL_OBJECT_OP_TYPE_INVALID = -1, /**< Invalid op. */
+   EFL_OBJECT_OP_TYPE_REGULAR = 0, /**< Regular op. */
+   EFL_OBJECT_OP_TYPE_CLASS, /**< Class op - a class op. Like static in Java/C++. */
+   EFL_OBJECT_OP_TYPE_REGULAR_OVERRIDE, /**< Regular op override (previously defined) */
+   EFL_OBJECT_OP_TYPE_CLASS_OVERRIDE, /**< Class op override (previously defined) */
 };
 
 /**
  * @internal
- * @typedef Eo_Op_Type
- * A convenience typedef for #_Eo_Op_Type.
+ * @typedef Efl_Object_Op_Type
+ * A convenience typedef for #_Efl_Object_Op_Type.
  */
-typedef enum _Eo_Op_Type Eo_Op_Type;
+typedef enum _Efl_Object_Op_Type Efl_Object_Op_Type;
 
 /**
- * @typedef Eo_Del_Intercept
+ * @typedef Efl_Del_Intercept
  *
  * A function to be called on object deletion/destruction instead of normal
  * destruction taking place.
  *
  * @param obj_id The object needing destruction
  */
-typedef void (*Eo_Del_Intercept) (Eo *obj_id);
+typedef void (*Efl_Del_Intercept) (Eo *obj_id);
 
 #include "efl_object_override.eo.h"
 #include "efl_object.eo.h"
@@ -185,10 +185,10 @@ typedef void (*Eo_Del_Intercept) (Eo *obj_id);
  */
 
 /**
- * @var EO_DBG_INFO_TYPE
+ * @var EFL_DBG_INFO_TYPE
  * The Eina_Value_Type for the debug info.
  */
-EAPI extern const Eina_Value_Type *EO_DBG_INFO_TYPE;
+EAPI extern const Eina_Value_Type *EFL_DBG_INFO_TYPE;
 
 /**
  * Creates a list inside debug info list.
@@ -197,13 +197,13 @@ EAPI extern const Eina_Value_Type *EO_DBG_INFO_TYPE;
  * @return the new list
  */
 static inline Efl_Dbg_Info *
-EO_DBG_INFO_LIST_APPEND(Efl_Dbg_Info *list, const char *name)
+EFL_DBG_INFO_LIST_APPEND(Efl_Dbg_Info *list, const char *name)
 {
    Efl_Dbg_Info *tmp = (Efl_Dbg_Info *)calloc(1, sizeof(*tmp));
 
    if (!tmp) return NULL;
    tmp->name = eina_stringshare_add(name);
-   eina_value_list_setup(&(tmp->value), EO_DBG_INFO_TYPE);
+   eina_value_list_setup(&(tmp->value), EFL_DBG_INFO_TYPE);
    if (list)
      {
         eina_value_list_pappend(&(list->value), tmp);
@@ -212,14 +212,14 @@ EO_DBG_INFO_LIST_APPEND(Efl_Dbg_Info *list, const char *name)
 }
 
 /**
- * @def EO_DBG_INFO_APPEND
+ * @def EFL_DBG_INFO_APPEND
  * Creates a new debug info into a list
  * @param[in] LIST list where to append (Efl_Dbg_Info *)
  * @param[in] NAME name of the parameter (const char *)
  * @param[in] TYPE type of the parameter (Eina_Value_Type *)
  * @param[in] VALUE value of the parameter
  */
-#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE, VALUE) \
+#define EFL_DBG_INFO_APPEND(LIST, NAME, TYPE, VALUE) \
 do { \
    Efl_Dbg_Info *List = LIST; \
    if (List) \
@@ -238,23 +238,23 @@ do { \
  * Frees the Efl_Dbg_Info tree. (The whole tree recursively).
  * @param[in] info The tree to delete.
  */
-EAPI void eo_dbg_info_free(Efl_Dbg_Info *info);
+EAPI void efl_dbg_info_free(Efl_Dbg_Info *info);
 
 /**
  * @}
  */
 
 /**
- * @typedef Eo_Op
+ * @typedef Efl_Object_Op
  * The Eo operation type id.
  */
-typedef unsigned int Eo_Op;
+typedef unsigned int Efl_Object_Op;
 
 /**
- * @def EO_NOOP
- * A special #Eo_Op meaning "No operation".
+ * @def EFL_NOOP
+ * A special #Efl_Object_Op meaning "No operation".
  */
-#define EO_NOOP ((Eo_Op) 0)
+#define EFL_NOOP ((Efl_Object_Op) 0)
 
 /**
  * @addtogroup Eo_Events Eo's Event Handling
@@ -309,18 +309,18 @@ typedef unsigned int Eo_Op;
  */
 
 /**
- * @def EO_DEFINE_CLASS(class_get_func_name, class_desc, parent_class, ...)
+ * @def EFL_DEFINE_CLASS(class_get_func_name, class_desc, parent_class, ...)
  * A convenience macro to be used for creating the class_get function. This
  * macro is fairly simple but should still be used as it'll let us improve
  * things easily.
  * @param class_get_func_name the name of the wanted class_get function name.
  * @param class_desc the class description.
- * @param parent_class The parent class for the function. Look at eo_class_new() for more information.
- * @param ... List of extensions. Look at eo_class_new() for more information.
+ * @param parent_class The parent class for the function. Look at efl_class_new() for more information.
+ * @param ... List of extensions. Look at efl_class_new() for more information.
  *
  * You must use this macro if you want thread safety in class creation.
  */
-#define EO_DEFINE_CLASS(class_get_func_name, class_desc, parent_class, ...) \
+#define EFL_DEFINE_CLASS(class_get_func_name, class_desc, parent_class, ...) \
 const Efl_Class * \
 class_get_func_name(void) \
 { \
@@ -329,14 +329,14 @@ class_get_func_name(void) \
    static Eina_Spinlock _my_lock; \
    static const Efl_Class * volatile _my_class = NULL; \
    static unsigned int _my_init_generation = 1; \
-   if (EINA_UNLIKELY(_eo_init_generation != _my_init_generation)) \
+   if (EINA_UNLIKELY(_efl_object_init_generation != _my_init_generation)) \
      { \
-        _my_class = NULL; /* It's freed in eo_shutdown(). */ \
+        _my_class = NULL; /* It's freed in efl_object_shutdown(). */ \
         lk_init = 0; \
      } \
    if (EINA_LIKELY(!!_my_class)) return _my_class; \
    \
-   eina_spinlock_take(&_eo_class_creation_lock); \
+   eina_spinlock_take(&_efl_class_creation_lock); \
    if (!lk_init) \
       eina_spinlock_new(&_my_lock); \
    if (lk_init < 2) eina_spinlock_take(&_my_lock); \
@@ -345,19 +345,19 @@ class_get_func_name(void) \
    else \
      { \
         if (lk_init < 2) eina_spinlock_release(&_my_lock); \
-        eina_spinlock_release(&_eo_class_creation_lock); \
+        eina_spinlock_release(&_efl_class_creation_lock); \
         return _my_class; \
      } \
-   eina_spinlock_release(&_eo_class_creation_lock); \
+   eina_spinlock_release(&_efl_class_creation_lock); \
    _tmp_parent_class = parent_class; \
-   _my_class = eo_class_new(class_desc, _tmp_parent_class, __VA_ARGS__); \
-   _my_init_generation = _eo_init_generation; \
+   _my_class = efl_class_new(class_desc, _tmp_parent_class, __VA_ARGS__); \
+   _my_init_generation = _efl_object_init_generation; \
    eina_spinlock_release(&_my_lock); \
    \
-   eina_spinlock_take(&_eo_class_creation_lock); \
+   eina_spinlock_take(&_efl_class_creation_lock); \
    eina_spinlock_free(&_my_lock); \
    lk_init = 2; \
-   eina_spinlock_release(&_eo_class_creation_lock); \
+   eina_spinlock_release(&_efl_class_creation_lock); \
    return _my_class; \
 }
 
@@ -367,10 +367,10 @@ class_get_func_name(void) \
  */
 enum _Efl_Class_Type
 {
-   EO_CLASS_TYPE_REGULAR = 0, /**< Regular class. */
-   EO_CLASS_TYPE_REGULAR_NO_INSTANT, /**< Regular non instant-able class. */
-   EO_CLASS_TYPE_INTERFACE, /**< Interface */
-   EO_CLASS_TYPE_MIXIN /**< Mixin */
+   EFL_CLASS_TYPE_REGULAR = 0, /**< Regular class. */
+   EFL_CLASS_TYPE_REGULAR_NO_INSTANT, /**< Regular non instant-able class. */
+   EFL_CLASS_TYPE_INTERFACE, /**< Interface */
+   EFL_CLASS_TYPE_MIXIN /**< Mixin */
 };
 
 /**
@@ -389,33 +389,33 @@ typedef struct _Efl_Op_Description
 {
    void *api_func;         /**< The EAPI function offering this op. (The name of the func on windows) */
    void *func;             /**< The static function to call for the op. */
-   Eo_Op_Type op_type;     /**< The type of the Op. */
+   Efl_Object_Op_Type op_type;     /**< The type of the Op. */
 } Efl_Op_Description;
 
 /**
- * @struct _Eo_Ops
+ * @struct _Efl_Object_Ops
  *
  * This struct holds the ops and the size of the ops.
- * Please use the #EO_CLASS_DESCRIPTION_OPS macro when populating it.
+ * Please use the #EFL_CLASS_DESCRIPTION_OPS macro when populating it.
  */
-typedef struct _Eo_Ops
+typedef struct _Efl_Object_Ops
 {
    const Efl_Op_Description *descs; /**< The op descriptions array of size count. */
    size_t count; /**< Number of op descriptions. */
-} Eo_Ops;
+} Efl_Object_Ops;
 
 /**
  * @struct _Efl_Class_Description
  * This struct holds the description of a class.
- * This description should be passed to eo_class_new.
- * Please use the #EO_CLASS_DESCRIPTION_OPS macro when populating it.
+ * This description should be passed to efl_class_new.
+ * Please use the #EFL_CLASS_DESCRIPTION_OPS macro when populating it.
  */
 struct _Efl_Class_Description
 {
    unsigned int version; /**< The current version of eo, use #EO_VERSION */
    const char *name; /**< The name of the class. */
    Efl_Class_Type type; /**< The type of the class. */
-   Eo_Ops ops;  /**< The ops description, should be filled using #EO_CLASS_DESCRIPTION_OPS (later sorted by Eo). */
+   Efl_Object_Ops ops;  /**< The ops description, should be filled using #EFL_CLASS_DESCRIPTION_OPS (later sorted by Eo). */
    const Efl_Event_Description **events; /**< The event descriptions for this class. */
    size_t data_size; /**< The size of data (private + protected + public) this class needs per object. */
    void (*class_constructor)(Efl_Class *klass); /**< The constructor of the class. */
@@ -435,12 +435,12 @@ typedef struct _Efl_Class_Description Efl_Class_Description;
  * @param ... A NULL terminated list of extensions (interfaces, mixins and the classes of any composite objects).
  * @return The new class's handle on success, or NULL otherwise.
  *
- * You should use #EO_DEFINE_CLASS. It'll provide thread safety and other
+ * You should use #EFL_DEFINE_CLASS. It'll provide thread safety and other
  * features easily.
  *
- * @see #EO_DEFINE_CLASS
+ * @see #EFL_DEFINE_CLASS
  */
-EAPI const Efl_Class *eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...);
+EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...);
 
 /**
  * @brief Override Eo functions of this object.
@@ -453,34 +453,34 @@ EAPI const Efl_Class *eo_class_new(const Efl_Class_Description *desc, const Efl_
  * on the stack.
  *
  * You are only allowed to override functions that are defined in the
- * class or any of its interfaces (that is, eo_isa returning true).
+ * class or any of its interfaces (that is, efl_isa returning true).
  *
  * If @p ops is #NULL, this will revert the @p obj to its original class
  * without any function overrides.
  *
  * It is not possible to override a function table of an object when it's
- * already been overridden. Call eo_override(obj, NULL) first if you really
+ * already been overridden. Call efl_object_override(obj, NULL) first if you really
  * need to do that.
  */
-EAPI Eina_Bool eo_override(Eo *obj, const Eo_Ops *ops);
+EAPI Eina_Bool efl_object_override(Eo *obj, const Efl_Object_Ops *ops);
 
 /**
- * @brief Define an array of override functions for @ref eo_override
- * @param ops A name for the Eo_Ops local variable to define
- * @param ... A comma separated list of Eo_Op overrides, using
- *            #EO_OP_FUNC_OVERRIDE or #EO_OP_CLASS_FUNC_OVERRIDE
+ * @brief Define an array of override functions for @ref efl_object_override
+ * @param ops A name for the Efl_Object_Ops local variable to define
+ * @param ... A comma separated list of Efl_Object_Op overrides, using
+ *            #EFL_OBJECT_OP_FUNC_OVERRIDE or #EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE
  *
  * This can be used as follows:
  * @code
- * EO_OVERRIDE_OPS_DEFINE(ops, EO_OP_FUNC_OVERRIDE(public_func, _my_func));
- * eo_override(obj, &ops);
+ * EFL_OBJECT_OVERRIDE_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC_OVERRIDE(public_func, _my_func));
+ * efl_object_override(obj, &ops);
  * @endcode
  *
- * @see eo_override
+ * @see efl_object_override
  */
-#define EO_OVERRIDE_OPS_DEFINE(ops, ...) \
+#define EFL_OBJECT_OVERRIDE_OPS_DEFINE(ops, ...) \
    const Efl_Op_Description _##ops##_descs[] = { __VA_ARGS__ }; \
-   const Eo_Ops ops = { _##ops##_descs, EINA_C_ARRAY_LENGTH(_##ops##_descs) }
+   const Efl_Object_Ops ops = { _##ops##_descs, EINA_C_ARRAY_LENGTH(_##ops##_descs) }
 
 /**
  * @brief Check if an object "is a" klass.
@@ -490,16 +490,16 @@ EAPI Eina_Bool eo_override(Eo *obj, const Eo_Ops *ops);
  *
  * Notice: This function does not support composite objects.
  */
-EAPI Eina_Bool eo_isa(const Eo *obj, const Efl_Class *klass);
+EAPI Eina_Bool efl_isa(const Eo *obj, const Efl_Class *klass);
 
 /**
  * @brief Gets the name of the passed class.
  * @param klass the class to work on.
  * @return The class's name.
  *
- * @see eo_class_get()
+ * @see efl_class_get()
  */
-EAPI const char *eo_class_name_get(const Efl_Class *klass);
+EAPI const char *efl_class_name_get(const Efl_Class *klass);
 
 /**
  * @}
@@ -511,175 +511,175 @@ EAPI const char *eo_class_name_get(const Efl_Class *klass);
  *
  * @see eo_shutfown()
  */
-EAPI Eina_Bool eo_init(void);
+EAPI Eina_Bool efl_object_init(void);
 
 /**
  * @brief Shutdown the eo subsystem
  * @return @c EINA_TRUE if eo is init, @c EINA_FALSE otherwise.
  *
- * @see eo_init()
+ * @see efl_object_init()
  */
-EAPI Eina_Bool eo_shutdown(void);
+EAPI Eina_Bool efl_object_shutdown(void);
 
 // Helpers macro to help populating #Efl_Class_Description.
-#define EO_CLASS_DESCRIPTION_NOOPS() { NULL, 0}
-#define EO_CLASS_DESCRIPTION_OPS(op_descs) { op_descs, EINA_C_ARRAY_LENGTH(op_descs) }
+#define EFL_CLASS_DESCRIPTION_NOOPS() { NULL, 0}
+#define EFL_CLASS_DESCRIPTION_OPS(op_descs) { op_descs, EINA_C_ARRAY_LENGTH(op_descs) }
 
 // to fetch internal function and object data at once
-typedef struct _Eo_Op_Call_Data
+typedef struct _Efl_Object_Op_Call_Data
 {
    Eo *eo_id;
    _Eo_Object *obj;
    void     *func;
    void     *data;
-} Eo_Op_Call_Data;
+} Efl_Object_Op_Call_Data;
 
-#define EO_CALL_CACHE_SIZE 1
+#define EFL_OBJECT_CALL_CACHE_SIZE 1
 
-typedef struct _Eo_Call_Cache_Index
+typedef struct _Efl_Object_Call_Cache_Index
 {
    const void       *klass;
-} Eo_Call_Cache_Index;
+} Efl_Object_Call_Cache_Index;
 
-typedef struct _Eo_Call_Cache_Entry
+typedef struct _Efl_Object_Call_Cache_Entry
 {
    const void       *func;
-} Eo_Call_Cache_Entry;
+} Efl_Object_Call_Cache_Entry;
 
-typedef struct _Eo_Call_Cache_Off
+typedef struct _Efl_Object_Call_Cache_Off
 {
    int               off;
-} Eo_Call_Cache_Off;
+} Efl_Object_Call_Cache_Off;
 
-typedef struct _Eo_Call_Cache
+typedef struct _Efl_Object_Call_Cache
 {
-#if EO_CALL_CACHE_SIZE > 0
-   Eo_Call_Cache_Index index[EO_CALL_CACHE_SIZE];
-   Eo_Call_Cache_Entry entry[EO_CALL_CACHE_SIZE];
-   Eo_Call_Cache_Off   off  [EO_CALL_CACHE_SIZE];
-# if EO_CALL_CACHE_SIZE > 1
+#if EFL_OBJECT_CALL_CACHE_SIZE > 0
+   Efl_Object_Call_Cache_Index index[EFL_OBJECT_CALL_CACHE_SIZE];
+   Efl_Object_Call_Cache_Entry entry[EFL_OBJECT_CALL_CACHE_SIZE];
+   Efl_Object_Call_Cache_Off   off  [EFL_OBJECT_CALL_CACHE_SIZE];
+# if EFL_OBJECT_CALL_CACHE_SIZE > 1
    int                 next_slot;
 # endif
 #endif
-   Eo_Op               op;
+   Efl_Object_Op               op;
    unsigned int        generation;
-} Eo_Call_Cache;
+} Efl_Object_Call_Cache;
 
-// to pass the internal function call to EO_FUNC_BODY (as Func parameter)
-#define EO_FUNC_CALL(...) __VA_ARGS__
+// to pass the internal function call to EFL_FUNC_BODY (as Func parameter)
+#define EFL_FUNC_CALL(...) __VA_ARGS__
 
 #ifndef _WIN32
-# define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) Name)
+# define EFL_FUNC_COMMON_OP_FUNC(Name) ((const void *) Name)
 #else
-# define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) #Name)
+# define EFL_FUNC_COMMON_OP_FUNC(Name) ((const void *) #Name)
 #endif
 
 // cache OP id, get real fct and object data then do the call
-#define EO_FUNC_COMMON_OP(Obj, Name, DefRet)                                 \
-     static Eo_Call_Cache ___cache; /* static 0 by default */           \
-     Eo_Op_Call_Data ___call;                                           \
-     if (EINA_UNLIKELY((___cache.op == EO_NOOP) ||                      \
-                       (___cache.generation != _eo_init_generation)))   \
+#define EFL_FUNC_COMMON_OP(Obj, Name, DefRet)                                 \
+     static Efl_Object_Call_Cache ___cache; /* static 0 by default */           \
+     Efl_Object_Op_Call_Data ___call;                                           \
+     if (EINA_UNLIKELY((___cache.op == EFL_NOOP) ||                      \
+                       (___cache.generation != _efl_object_init_generation)))   \
        {                                                                \
-          ___cache.op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \
-          if (___cache.op == EO_NOOP) return DefRet;                    \
-          ___cache.generation = _eo_init_generation;                    \
+          ___cache.op = _efl_object_api_op_id_get(EFL_FUNC_COMMON_OP_FUNC(Name)); \
+          if (___cache.op == EFL_NOOP) return DefRet;                    \
+          ___cache.generation = _efl_object_init_generation;                    \
        }                                                                \
-     if (!_eo_call_resolve((Eo *) Obj, #Name, &___call, &___cache,                  \
+     if (!_efl_object_call_resolve((Eo *) Obj, #Name, &___call, &___cache,                  \
                            __FILE__, __LINE__)) return DefRet;          \
      _Eo_##Name##_func _func_ = (_Eo_##Name##_func) ___call.func;       \
 
-#define _EO_API_BEFORE_HOOK
-#define _EO_API_AFTER_HOOK
-#define _EO_API_CALL_HOOK(x) x
+#define _EFL_OBJECT_API_BEFORE_HOOK
+#define _EFL_OBJECT_API_AFTER_HOOK
+#define _EFL_OBJECT_API_CALL_HOOK(x) x
 
 // to define an EAPI function
-#define _EO_FUNC_BODY(Name, ObjType, Ret, DefRet) \
+#define _EFL_OBJECT_FUNC_BODY(Name, ObjType, Ret, DefRet) \
   Ret                                                                   \
   Name(ObjType obj)                                                            \
   {                                                                     \
      typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data);            \
      Ret _r;                                                            \
-     EO_FUNC_COMMON_OP(obj, Name, DefRet);                                   \
-     _EO_API_BEFORE_HOOK                                                       \
-     _r = _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data));     \
-     _eo_call_end(&___call); \
-     _EO_API_AFTER_HOOK                                                       \
+     EFL_FUNC_COMMON_OP(obj, Name, DefRet);                                   \
+     _EFL_OBJECT_API_BEFORE_HOOK                                                       \
+     _r = _EFL_OBJECT_API_CALL_HOOK(_func_(___call.eo_id, ___call.data));     \
+     _efl_object_call_end(&___call); \
+     _EFL_OBJECT_API_AFTER_HOOK                                                       \
      return _r;                                                         \
   }
 
-#define _EO_VOID_FUNC_BODY(Name, ObjType)                               \
+#define _EFL_OBJECT_VOID_FUNC_BODY(Name, ObjType)                               \
   void									\
   Name(ObjType obj)                                                            \
   {                                                                     \
      typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data);           \
-     EO_FUNC_COMMON_OP(obj, Name, );                                         \
-     _EO_API_BEFORE_HOOK                                                       \
-     _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data));          \
-     _eo_call_end(&___call);                                            \
-     _EO_API_AFTER_HOOK                                                       \
+     EFL_FUNC_COMMON_OP(obj, Name, );                                         \
+     _EFL_OBJECT_API_BEFORE_HOOK                                                       \
+     _EFL_OBJECT_API_CALL_HOOK(_func_(___call.eo_id, ___call.data));          \
+     _efl_object_call_end(&___call);                                            \
+     _EFL_OBJECT_API_AFTER_HOOK                                                       \
   }
 
-#define _EO_FUNC_BODYV(Name, ObjType, Ret, DefRet, Arguments, ...)      \
+#define _EFL_OBJECT_FUNC_BODYV(Name, ObjType, Ret, DefRet, Arguments, ...)      \
   Ret                                                                   \
   Name(ObjType obj, __VA_ARGS__)                                                     \
   {                                                                     \
      typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data, __VA_ARGS__); \
      Ret _r;                                                            \
-     EO_FUNC_COMMON_OP(obj, Name, DefRet);                                   \
-     _EO_API_BEFORE_HOOK                                                       \
-     _r = _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data, Arguments)); \
-     _eo_call_end(&___call); \
-     _EO_API_AFTER_HOOK                                                        \
+     EFL_FUNC_COMMON_OP(obj, Name, DefRet);                                   \
+     _EFL_OBJECT_API_BEFORE_HOOK                                                       \
+     _r = _EFL_OBJECT_API_CALL_HOOK(_func_(___call.eo_id, ___call.data, Arguments)); \
+     _efl_object_call_end(&___call); \
+     _EFL_OBJECT_API_AFTER_HOOK                                                        \
      return _r;                                                         \
   }
 
-#define _EO_VOID_FUNC_BODYV(Name, ObjType, Arguments, ...)              \
+#define _EFL_OBJECT_VOID_FUNC_BODYV(Name, ObjType, Arguments, ...)              \
   void                                                                  \
   Name(ObjType obj, __VA_ARGS__)                                                     \
   {                                                                     \
      typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data, __VA_ARGS__); \
-     EO_FUNC_COMMON_OP(obj, Name, );                                         \
-     _EO_API_BEFORE_HOOK                                                       \
-     _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data, Arguments)); \
-     _eo_call_end(&___call); \
-     _EO_API_AFTER_HOOK                                                        \
+     EFL_FUNC_COMMON_OP(obj, Name, );                                         \
+     _EFL_OBJECT_API_BEFORE_HOOK                                                       \
+     _EFL_OBJECT_API_CALL_HOOK(_func_(___call.eo_id, ___call.data, Arguments)); \
+     _efl_object_call_end(&___call); \
+     _EFL_OBJECT_API_AFTER_HOOK                                                        \
   }
 
-#define EO_FUNC_BODY(Name, Ret, DefRet) _EO_FUNC_BODY(Name, Eo *, Ret, DefRet)
-#define EO_VOID_FUNC_BODY(Name) _EO_VOID_FUNC_BODY(Name, Eo *)
-#define EO_FUNC_BODYV(Name, Ret, DefRet, Arguments, ...) _EO_FUNC_BODYV(Name, Eo *, Ret, DefRet, EO_FUNC_CALL(Arguments), __VA_ARGS__)
-#define EO_VOID_FUNC_BODYV(Name, Arguments, ...) _EO_VOID_FUNC_BODYV(Name, Eo *, EO_FUNC_CALL(Arguments), __VA_ARGS__)
+#define EFL_FUNC_BODY(Name, Ret, DefRet) _EFL_OBJECT_FUNC_BODY(Name, Eo *, Ret, DefRet)
+#define EFL_VOID_FUNC_BODY(Name) _EFL_OBJECT_VOID_FUNC_BODY(Name, Eo *)
+#define EFL_FUNC_BODYV(Name, Ret, DefRet, Arguments, ...) _EFL_OBJECT_FUNC_BODYV(Name, Eo *, Ret, DefRet, EFL_FUNC_CALL(Arguments), __VA_ARGS__)
+#define EFL_VOID_FUNC_BODYV(Name, Arguments, ...) _EFL_OBJECT_VOID_FUNC_BODYV(Name, Eo *, EFL_FUNC_CALL(Arguments), __VA_ARGS__)
 
-#define EO_FUNC_BODY_CONST(Name, Ret, DefRet) _EO_FUNC_BODY(Name, const Eo *, Ret, DefRet)
-#define EO_VOID_FUNC_BODY_CONST(Name) _EO_VOID_FUNC_BODY(Name, const Eo *)
-#define EO_FUNC_BODYV_CONST(Name, Ret, DefRet, Arguments, ...) _EO_FUNC_BODYV(Name, const Eo *, Ret, DefRet, EO_FUNC_CALL(Arguments), __VA_ARGS__)
-#define EO_VOID_FUNC_BODYV_CONST(Name, Arguments, ...) _EO_VOID_FUNC_BODYV(Name, const Eo *, EO_FUNC_CALL(Arguments), __VA_ARGS__)
+#define EFL_FUNC_BODY_CONST(Name, Ret, DefRet) _EFL_OBJECT_FUNC_BODY(Name, const Eo *, Ret, DefRet)
+#define EFL_VOID_FUNC_BODY_CONST(Name) _EFL_OBJECT_VOID_FUNC_BODY(Name, const Eo *)
+#define EFL_FUNC_BODYV_CONST(Name, Ret, DefRet, Arguments, ...) _EFL_OBJECT_FUNC_BODYV(Name, const Eo *, Ret, DefRet, EFL_FUNC_CALL(Arguments), __VA_ARGS__)
+#define EFL_VOID_FUNC_BODYV_CONST(Name, Arguments, ...) _EFL_OBJECT_VOID_FUNC_BODYV(Name, const Eo *, EFL_FUNC_CALL(Arguments), __VA_ARGS__)
 
 #ifndef _WIN32
-# define _EO_OP_API_ENTRY(a) (void*)a
+# define _EFL_OBJECT_OP_API_ENTRY(a) (void*)a
 #else
-# define _EO_OP_API_ENTRY(a) #a
+# define _EFL_OBJECT_OP_API_ENTRY(a) #a
 #endif
 
-#define EO_OP_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), (void*)_private, EO_OP_TYPE_REGULAR }
-#define EO_OP_CLASS_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), (void*)_private, EO_OP_TYPE_CLASS }
-#define EO_OP_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), (void*)_private, EO_OP_TYPE_REGULAR_OVERRIDE }
-#define EO_OP_CLASS_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), (void*)_private, EO_OP_TYPE_CLASS_OVERRIDE }
+#define EFL_OBJECT_OP_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private, EFL_OBJECT_OP_TYPE_REGULAR }
+#define EFL_OBJECT_OP_CLASS_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private, EFL_OBJECT_OP_TYPE_CLASS }
+#define EFL_OBJECT_OP_FUNC_OVERRIDE(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private, EFL_OBJECT_OP_TYPE_REGULAR_OVERRIDE }
+#define EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private, EFL_OBJECT_OP_TYPE_CLASS_OVERRIDE }
 
 // returns the OP id corresponding to the given api_func
-EAPI Eo_Op _eo_api_op_id_get(const void *api_func);
+EAPI Efl_Object_Op _efl_object_api_op_id_get(const void *api_func);
 
 // gets the real function pointer and the object data
-EAPI Eina_Bool _eo_call_resolve(Eo *obj, const char *func_name, Eo_Op_Call_Data *call, Eo_Call_Cache *callcache, const char *file, int line);
+EAPI Eina_Bool _efl_object_call_resolve(Eo *obj, const char *func_name, Efl_Object_Op_Call_Data *call, Efl_Object_Call_Cache *callcache, const char *file, int line);
 
 // end of the eo call barrier, unref the obj
-EAPI void _eo_call_end(Eo_Op_Call_Data *call);
+EAPI void _efl_object_call_end(Efl_Object_Op_Call_Data *call);
 
-// end of the eo_add. Calls finalize among others
-EAPI Eo * _eo_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback);
+// end of the efl_add. Calls finalize among others
+EAPI Eo * _efl_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback);
 
-EAPI Eo *eo_super(const Eo *obj, const Efl_Class *cur_klass);
+EAPI Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass);
 
 /*****************************************************************************/
 
@@ -688,39 +688,39 @@ EAPI Eo *eo_super(const Eo *obj, const Efl_Class *cur_klass);
  * @param obj The object to work on
  * @return The object's class.
  *
- * @see eo_class_name_get()
+ * @see efl_class_name_get()
  */
-EAPI const Efl_Class *eo_class_get(const Eo *obj);
+EAPI const Efl_Class *efl_class_get(const Eo *obj);
 
-EAPI Eo *_eo_self_get(void);
+EAPI Eo *_efl_self_get(void);
 
 /* Check if GCC compatible (both GCC and clang define this) */
 #if defined(__GNUC__) && !defined(_EO_ADD_FALLBACK_FORCE)
 
-# define eo_self __eo_self
+# define efl_self __efl_self
 
-# define _eo_add_common(klass, parent, is_ref, ...) \
+# define _efl_add_common(klass, parent, is_ref, ...) \
    ({ \
-     Eo * const __eo_self = _eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_FALSE); \
+     Eo * const __efl_self = _efl_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_FALSE); \
      (void) ((void)0, ##__VA_ARGS__);                                   \
-     (Eo *) _eo_add_end(eo_self, is_ref, EINA_FALSE); \
+     (Eo *) _efl_add_end(efl_self, is_ref, EINA_FALSE); \
     })
 
 #else
 
-# define eo_self _eo_self_get()
+# define efl_self _efl_self_get()
 
-# define _eo_add_common(klass, parent, is_ref, ...) \
+# define _efl_add_common(klass, parent, is_ref, ...) \
    ( \
-     _eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_TRUE), \
+     _efl_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_TRUE), \
      ##__VA_ARGS__, \
-     (Eo *) _eo_add_end(eo_self, is_ref, EINA_TRUE) \
+     (Eo *) _efl_add_end(efl_self, is_ref, EINA_TRUE) \
    )
 
 #endif
 
 /**
- * @def eo_add
+ * @def efl_add
  * @brief Create a new object and call its constructor(If it exits).
  *
  * The object returned by this function will always have 1 ref
@@ -728,36 +728,36 @@ EAPI Eo *_eo_self_get(void);
  * not.
  * If the object is created using this function, then it would
  * automatically gets deleted when the parent object is deleted.
- * There is no need to call eo_unref on the child. This is convenient
+ * There is no need to call efl_unref on the child. This is convenient
  * in C.
  *
- * If you want a more "consistent" behaviour, take a look at #eo_add_ref.
+ * If you want a more "consistent" behaviour, take a look at #efl_add_ref.
  *
  * @param klass the class of the object to create.
  * @param parent the parent to set to the object.
  * @param ... The ops to run.
  * @return An handle to the new object on success, NULL otherwise.
  */
-#define eo_add(klass, parent, ...) _eo_add_common(klass, parent, EINA_FALSE, ##__VA_ARGS__)
+#define efl_add(klass, parent, ...) _efl_add_common(klass, parent, EINA_FALSE, ##__VA_ARGS__)
 
 /**
- * @def eo_add_ref
+ * @def efl_add_ref
  * @brief Create a new object and call its constructor(If it exists).
  *
  * The object returned by this function has 1 ref for itself, 1 ref from the
  * parent (if exists) and possible other refs if were added during construction.
  * If a child object is created using this, then it won't get deleted
  * when the parent object is deleted until you manually remove the ref
- * by calling eo_unref().
+ * by calling efl_unref().
  *
  * @param klass the class of the object to create.
  * @param parent the parent to set to the object.
  * @param ... The ops to run.
  * @return An handle to the new object on success, NULL otherwise.
  */
-#define eo_add_ref(klass, parent, ...) _eo_add_common(klass, parent, EINA_TRUE, ##__VA_ARGS__)
+#define efl_add_ref(klass, parent, ...) _efl_add_common(klass, parent, EINA_TRUE, ##__VA_ARGS__)
 
-EAPI Eo * _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback);
+EAPI Eo * _efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback);
 
 /**
  * @brief Get a pointer to the data of an object for a specific class.
@@ -767,24 +767,24 @@ EAPI Eo * _eo_add_internal_start(const char *file, int line, const Efl_Class *kl
  * @param klass the klass associated with the data.
  * @return a pointer to the data.
  *
- * @see eo_data_ref()
- * @see eo_data_unref()
+ * @see efl_data_ref()
+ * @see efl_data_unref()
  */
-EAPI void *eo_data_scope_get(const Eo *obj, const Efl_Class *klass);
+EAPI void *efl_data_scope_get(const Eo *obj, const Efl_Class *klass);
 
 /**
- * @def eo_data_xref(obj, klass, ref_obj)
+ * @def efl_data_xref(obj, klass, ref_obj)
  * Use this macro if you want to associate a referencer object.
- * Convenience macro around eo_data_xref_internal()
+ * Convenience macro around efl_data_xref_internal()
  */
-#define eo_data_xref(obj, klass, ref_obj) eo_data_xref_internal(__FILE__, __LINE__, obj, klass, ref_obj)
+#define efl_data_xref(obj, klass, ref_obj) efl_data_xref_internal(__FILE__, __LINE__, obj, klass, ref_obj)
 
 /**
- * @def eo_data_ref(obj, klass)
+ * @def efl_data_ref(obj, klass)
  * Use this macro if you don't want to associate a referencer object.
- * Convenience macro around eo_data_xref_internal()
+ * Convenience macro around efl_data_xref_internal()
  */
-#define eo_data_ref(obj, klass) eo_data_xref_internal(__FILE__, __LINE__, obj, klass, (const Eo *)obj)
+#define efl_data_ref(obj, klass) efl_data_xref_internal(__FILE__, __LINE__, obj, klass, (const Eo *)obj)
 
 /**
  * @brief Get a pointer to the data of an object for a specific class and
@@ -796,25 +796,25 @@ EAPI void *eo_data_scope_get(const Eo *obj, const Efl_Class *klass);
  * @param line the call's line number.
  * @return a pointer to the data.
  *
- * @see eo_data_xunref_internal()
+ * @see efl_data_xunref_internal()
  */
-EAPI void *eo_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj);
+EAPI void *efl_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj);
 
 /**
- * @def eo_data_xunref(obj, data, ref_obj)
- * Use this function if you used eo_data_xref to reference the data.
- * Convenience macro around eo_data_xunref_internal()
- * @see eo_data_xref()
+ * @def efl_data_xunref(obj, data, ref_obj)
+ * Use this function if you used efl_data_xref to reference the data.
+ * Convenience macro around efl_data_xunref_internal()
+ * @see efl_data_xref()
  */
-#define eo_data_xunref(obj, data, ref_obj) eo_data_xunref_internal(obj, data, ref_obj)
+#define efl_data_xunref(obj, data, ref_obj) efl_data_xunref_internal(obj, data, ref_obj)
 
 /**
- * @def eo_data_unref(obj, data)
- * Use this function if you used eo_data_ref to reference the data.
- * Convenience macro around eo_data_unref_internal()
- * @see eo_data_ref()
+ * @def efl_data_unref(obj, data)
+ * Use this function if you used efl_data_ref to reference the data.
+ * Convenience macro around efl_data_unref_internal()
+ * @see efl_data_ref()
  */
-#define eo_data_unref(obj, data) eo_data_xunref_internal(obj, data, obj)
+#define efl_data_unref(obj, data) efl_data_xunref_internal(obj, data, obj)
 
 /**
  * @brief Decrement the object data reference count by 1.
@@ -823,9 +823,9 @@ EAPI void *eo_data_xref_internal(const char *file, int line, const Eo *obj, cons
  * @param file the call's filename.
  * @param line the call's line number.
  *
- * @see eo_data_xref_internal()
+ * @see efl_data_xref_internal()
  */
-EAPI void eo_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj);
+EAPI void efl_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj);
 
 /**
  * @brief Increment the object's reference count by 1.
@@ -833,35 +833,35 @@ EAPI void eo_data_xunref_internal(const Eo *obj, void *data, const Eo *ref_obj);
  * @return The object passed.
  *
  * It's very easy to get a refcount leak and start leaking memory because
- * of a forgotten unref or an extra ref. That is why there are eo_xref
- * and eo_xunref that will make debugging easier in such a case.
+ * of a forgotten unref or an extra ref. That is why there are efl_xref
+ * and efl_xunref that will make debugging easier in such a case.
  * Therefor, these functions should only be used in small scopes, i.e at the
  * start of some section in which the object may get freed, or if you know
  * what you are doing.
  *
- * @see eo_unref()
- * @see eo_ref_get()
+ * @see efl_unref()
+ * @see efl_ref_get()
  */
-EAPI Eo *eo_ref(const Eo *obj);
+EAPI Eo *efl_ref(const Eo *obj);
 
 /**
  * @brief Decrement the object's reference count by 1 and free it if needed.
  * @param obj the object to work on.
  *
- * @see eo_ref()
- * @see eo_ref_get()
+ * @see efl_ref()
+ * @see efl_ref_get()
  */
-EAPI void eo_unref(const Eo *obj);
+EAPI void efl_unref(const Eo *obj);
 
 /**
  * @brief Return the ref count of the object passed.
  * @param obj the object to work on.
  * @return the ref count of the object.
  *
- * @see eo_ref()
- * @see eo_unref()
+ * @see efl_ref()
+ * @see efl_unref()
  */
-EAPI int eo_ref_get(const Eo *obj);
+EAPI int efl_ref_get(const Eo *obj);
 
 /**
  * @brief Set a deletion interceptor function
@@ -889,10 +889,10 @@ EAPI int eo_ref_get(const Eo *obj);
  * "real deletion".
  * 
  * @see efl_del_intercept_get()
- * @see eo_unref()
+ * @see efl_unref()
  * @see efl_del()
  */
-EAPI void efl_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func);
+EAPI void efl_del_intercept_set(Eo *obj, Efl_Del_Intercept del_intercept_func);
 
 /**
  * @brief Get the deletion interceptor function
@@ -909,14 +909,14 @@ EAPI void efl_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func);
  * 
  * @see efl_del_intercept_set()
  */
-EAPI Eo_Del_Intercept efl_del_intercept_get(const Eo *obj);
+EAPI Efl_Del_Intercept efl_del_intercept_get(const Eo *obj);
 
 /**
- * @def eo_xref(obj, ref_obj)
- * Convenience macro around eo_xref_internal()
- * @see eo_xref()
+ * @def efl_xref(obj, ref_obj)
+ * Convenience macro around efl_xref_internal()
+ * @see efl_xref()
  */
-#define eo_xref(obj, ref_obj) eo_xref_internal(__FILE__, __LINE__, obj, ref_obj)
+#define efl_xref(obj, ref_obj) efl_xref_internal(__FILE__, __LINE__, obj, ref_obj)
 
 /**
  * @brief Increment the object's reference count by 1 (and associate the ref with ref_obj)
@@ -926,13 +926,13 @@ EAPI Eo_Del_Intercept efl_del_intercept_get(const Eo *obj);
  * @param line the call's line number.
  * @return The object passed (obj)
  *
- * People should not use this function, use #eo_xref instead.
+ * People should not use this function, use #efl_xref instead.
  * A compile flag my make it and eobj_xunref() behave the same as eobj_ref()
  * and eobj_unref() respectively. So this should be used wherever possible.
  *
- * @see eo_xunref()
+ * @see efl_xunref()
  */
-EAPI Eo *eo_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj);
+EAPI Eo *efl_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj);
 
 /**
  * @brief Decrement the object's reference count by 1 and free it if needed. Will free the ref associated with ref_obj).
@@ -941,40 +941,40 @@ EAPI Eo *eo_xref_internal(const char *file, int line, Eo *obj, const Eo *ref_obj
  *
  * This function only enforces the checks for object association. I.e don't rely
  * on it. If such enforces are compiled out, this function behaves the same as
- * eo_unref().
+ * efl_unref().
  *
- * @see eo_xref_internal()
+ * @see efl_xref_internal()
  */
-EAPI void eo_xunref(Eo *obj, const Eo *ref_obj);
+EAPI void efl_xunref(Eo *obj, const Eo *ref_obj);
 
 /**
  * @brief Enable or disable the manual free feature.
  * @param obj the object to work on.
  * @param manual_free indicates if the free is manual (EINA_TRUE) or automatic (EINA_FALSE).
  *
- * The developer is in charge to call the function eo_manual_free to free the memory allocated for this object.
+ * The developer is in charge to call the function efl_manual_free to free the memory allocated for this object.
  *
  * Do not use, unless you really know what you are doing. It's used by Evas
  * because evas wants to keep its private data available even after the object
  * is deleted. Setting this to true makes Eo destruct the object but not free
  * the private data or the object itself.
  *
- * @see eo_manual_free()
+ * @see efl_manual_free()
  */
-EAPI void eo_manual_free_set(Eo *obj, Eina_Bool manual_free);
+EAPI void efl_manual_free_set(Eo *obj, Eina_Bool manual_free);
 
 /**
  * @brief Frees the object.
  * @param obj the object to work on.
  * This function must be called by the developer if the function
- * eo_manual_free_set has been called before with the parameter EINA_TRUE.
+ * efl_manual_free_set has been called before with the parameter EINA_TRUE.
  * An error will be printed if this function is called when the manual
  * free option is not set to EINA_TRUE or the number of refs is not 0.
  * @return EINA_TRUE if successfully freed. EINA_FALSE otherwise.
  *
- * @see eo_manual_free_set()
+ * @see efl_manual_free_set()
  */
-EAPI Eina_Bool eo_manual_free(Eo *obj);
+EAPI Eina_Bool efl_manual_free(Eo *obj);
 
 /**
  * @brief Checks if the object was already descructed (only relevant for manual_free objects).
@@ -983,9 +983,9 @@ EAPI Eina_Bool eo_manual_free(Eo *obj);
  * freed). It should only be used with objects that are supposed to be manually
  * freed, but not yet freed (but possibly destructed).
  *
- * @see eo_manual_free_set()
+ * @see efl_manual_free_set()
  */
-EAPI Eina_Bool eo_destructed_is(const Eo *obj);
+EAPI Eina_Bool efl_destructed_is(const Eo *obj);
 
 /**
  * @addtogroup Efl_Class_Class Eo's Class class.
@@ -1011,28 +1011,28 @@ EAPI Eina_Bool eo_destructed_is(const Eo *obj);
 typedef void (*efl_key_data_free_func)(void *);
 
 /**
- * @def eo_weak_ref
+ * @def efl_weak_ref
  * @brief Reference a pointer to an Eo object
  * @param wref the pointer to use for the weak ref
  *
- * @see eo_weak_unref
+ * @see efl_weak_unref
  * @see efl_wref_add
  */
-#define eo_weak_ref(wref)			   \
+#define efl_weak_ref(wref)			   \
   do {						   \
     if (*wref) efl_wref_add(*wref, wref);  \
   } while (0)
 
 /**
- * @def eo_weak_unref
+ * @def efl_weak_unref
  * @brief Unreference a pointer to an Eo object
  * @param wref the pointer to use for the weak unref
  *
- * @see eo_weak_ref
+ * @see efl_weak_ref
  * @see efl_wref_del
  * @see efl_wref_del_safe
  */
-#define eo_weak_unref(wref)			   \
+#define efl_weak_unref(wref)			   \
   do {						   \
     if (*wref) efl_wref_del(*wref, wref);  \
   } while (0)
@@ -1044,7 +1044,7 @@ typedef void (*efl_key_data_free_func)(void *);
  *
  * @see #efl_wref_del
  */
-#define efl_wref_del_safe(wref) eo_weak_unref(wref)
+#define efl_wref_del_safe(wref) efl_weak_unref(wref)
 
 /**
  * @addtogroup Eo_Events Eo's Event Handling
@@ -1060,27 +1060,27 @@ typedef void (*efl_key_data_free_func)(void *);
 EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name);
 
 /**
- * @def EO_CALLBACK_PRIORITY_BEFORE
+ * @def EFL_CALLBACK_PRIORITY_BEFORE
  * Slightly more prioritized than default.
  */
-#define EO_CALLBACK_PRIORITY_BEFORE -100
+#define EFL_CALLBACK_PRIORITY_BEFORE -100
 /**
- * @def EO_CALLBACK_PRIORITY_DEFAULT
+ * @def EFL_CALLBACK_PRIORITY_DEFAULT
  * Default callback priority level
  */
-#define EO_CALLBACK_PRIORITY_DEFAULT 0
+#define EFL_CALLBACK_PRIORITY_DEFAULT 0
 /**
- * @def EO_CALLBACK_PRIORITY_AFTER
+ * @def EFL_CALLBACK_PRIORITY_AFTER
  * Slightly less prioritized than default.
  */
-#define EO_CALLBACK_PRIORITY_AFTER 100
+#define EFL_CALLBACK_PRIORITY_AFTER 100
 
 /**
  * Helper for creating global callback arrays.
  * The problem is on windows where you can't declare a static array with
  * external symbols in it, because the addresses are only known at runtime.
  */
-#define EO_CALLBACKS_ARRAY_DEFINE(Name, ...)                            \
+#define EFL_CALLBACKS_ARRAY_DEFINE(Name, ...)                            \
   static Efl_Callback_Array_Item *                                       \
   Name(void)                                                            \
   {                                                                     \
@@ -1110,7 +1110,7 @@ EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(c
  */
 #define efl_event_callback_add(obj, desc, cb, data) \
    efl_event_callback_priority_add(obj, desc, \
-         EO_CALLBACK_PRIORITY_DEFAULT, cb, data)
+         EFL_CALLBACK_PRIORITY_DEFAULT, cb, data)
 
 /**
  * @def efl_event_callback_array_add(obj, desc, cb, data)
@@ -1124,7 +1124,7 @@ EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(c
  */
 #define efl_event_callback_array_add(obj, array, data) \
    efl_event_callback_array_priority_add(obj, array, \
-         EO_CALLBACK_PRIORITY_DEFAULT, data)
+         EFL_CALLBACK_PRIORITY_DEFAULT, data)
 
 /**
  * @}
@@ -1140,8 +1140,8 @@ EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(c
 
 
    /* Private for EFL internal use only. Do not use these! */
-EAPI int ___eo_ref2_get(const Eo *obj_id);
-EAPI void ___eo_ref2_reset(const Eo *obj_id);
+EAPI int ___efl_ref2_get(const Eo *obj_id);
+EAPI void ___efl_ref2_reset(const Eo *obj_id);
 
 #endif
 
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 112cd3103f..9104a9e499 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -16,18 +16,18 @@
 #include "efl_object_override.eo.c"
 
 #define EO_CLASS_IDS_FIRST 1
-#define EO_OP_IDS_FIRST 1
+#define EFL_OBJECT_OP_IDS_FIRST 1
 
-/* Used inside the class_get functions of classes, see #EO_DEFINE_CLASS */
-EAPI Eina_Spinlock _eo_class_creation_lock;
-EAPI unsigned int _eo_init_generation = 1;
+/* Used inside the class_get functions of classes, see #EFL_DEFINE_CLASS */
+EAPI Eina_Spinlock _efl_class_creation_lock;
+EAPI unsigned int _efl_object_init_generation = 1;
 int _eo_log_dom = -1;
 
 static _Efl_Class **_eo_classes = NULL;
 static Eo_Id _eo_classes_last_id = 0;
 static Eo_Id _eo_classes_alloc = 0;
-static int _eo_init_count = 0;
-static Eo_Op _eo_ops_last_id = 0;
+static int _efl_object_init_count = 0;
+static Efl_Object_Op _eo_ops_last_id = 0;
 static Eina_Hash *_ops_storage = NULL;
 static Eina_Spinlock _ops_storage_lock;
 
@@ -35,9 +35,9 @@ static size_t _eo_sz = 0;
 static size_t _eo_class_sz = 0;
 
 static void _eo_condtor_reset(_Eo_Object *obj);
-static inline void *_eo_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass);
-static inline void *_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_Class *klass, const _Eo_Object *ref_obj);
-static inline void _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj);
+static inline void *_efl_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass);
+static inline void *_efl_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_Class *klass, const _Eo_Object *ref_obj);
+static inline void _efl_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj);
 
 /* Start of Dich */
 
@@ -69,7 +69,7 @@ _vtable_chain_alloc(Dich_Chain1 *chain1)
 static inline void
 _vtable_copy_all(Eo_Vtable *dst, const Eo_Vtable *src)
 {
-   Eo_Op i;
+   Efl_Object_Op i;
    const Dich_Chain1 *sc1 = src->chain;
    Dich_Chain1 *dc1 = dst->chain;
    for (i = 0 ; i < src->size ; i++, sc1++, dc1++)
@@ -94,7 +94,7 @@ _vtable_copy_all(Eo_Vtable *dst, const Eo_Vtable *src)
 }
 
 static inline const op_type_funcs *
-_vtable_func_get(const Eo_Vtable *vtable, Eo_Op op)
+_vtable_func_get(const Eo_Vtable *vtable, Efl_Object_Op op)
 {
    size_t idx1 = DICH_CHAIN1(op);
    if (EINA_UNLIKELY(idx1 >= vtable->size))
@@ -107,7 +107,7 @@ _vtable_func_get(const Eo_Vtable *vtable, Eo_Op op)
 
 /* XXX: Only used for a debug message below. Doesn't matter that it's slow. */
 static const _Efl_Class *
-_eo_op_class_get(Eo_Op op)
+_eo_op_class_get(Efl_Object_Op op)
 {
    _Efl_Class **itr = _eo_classes;
    int mid, max, min;
@@ -130,7 +130,7 @@ _eo_op_class_get(Eo_Op op)
 }
 
 static inline Eina_Bool
-_vtable_func_set(Eo_Vtable *vtable, const _Efl_Class *klass, Eo_Op op, eo_op_func_type func)
+_vtable_func_set(Eo_Vtable *vtable, const _Efl_Class *klass, Efl_Object_Op op, eo_op_func_type func)
 {
    op_type_funcs *fsrc;
    size_t idx1 = DICH_CHAIN1(op);
@@ -222,7 +222,7 @@ _eo_op_desc_name_get(const Efl_Op_Description *desc)
 }
 
 static inline const op_type_funcs *
-_eo_kls_itr_next(const _Efl_Class *orig_kls, const _Efl_Class *cur_klass, Eo_Op op)
+_eo_kls_itr_next(const _Efl_Class *orig_kls, const _Efl_Class *cur_klass, Efl_Object_Op op)
 {
    const _Efl_Class **kls_itr = NULL;
 
@@ -255,7 +255,7 @@ static const _Efl_Class *_super_class = NULL;
 static Eina_Spinlock _super_class_lock;
 
 EAPI Eo *
-eo_super(const Eo *obj, const Efl_Class *cur_klass)
+efl_super(const Eo *obj, const Efl_Class *cur_klass)
 {
    EO_CLASS_POINTER_RETURN_VAL(cur_klass, klass, NULL);
 
@@ -267,7 +267,7 @@ eo_super(const Eo *obj, const Efl_Class *cur_klass)
 }
 
 EAPI Eina_Bool
-_eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Call_Cache *cache, const char *file, int line)
+_efl_object_call_resolve(Eo *eo_id, const char *func_name, Efl_Object_Op_Call_Data *call, Efl_Object_Call_Cache *cache, const char *file, int line)
 {
    const _Efl_Class *klass, *inputklass, *main_klass;
    const _Efl_Class *cur_klass = NULL;
@@ -303,7 +303,7 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal
         if (_obj_is_override(obj) && cur_klass &&
               (_eo_class_id_get(cur_klass) == EFL_OBJECT_OVERRIDE_CLASS))
           {
-             /* Doing a eo_super(obj, EFL_OBJECT_OVERRIDE_CLASS) should result in calling
+             /* Doing a efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS) should result in calling
               * as if it's a normal class. */
              vtable = &klass->vtable;
              cur_klass = NULL;
@@ -312,7 +312,7 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal
         is_override = _obj_is_override(obj) && (cur_klass == NULL);
 
         call->obj = obj;
-        _eo_ref(_obj);
+        _efl_ref(_obj);
      }
    else
      {
@@ -347,13 +347,13 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal
      }
    else
      {
-# if EO_CALL_CACHE_SIZE > 0
+# if EFL_OBJECT_CALL_CACHE_SIZE > 0
         if (!is_override)
           {
-# if EO_CALL_CACHE_SIZE > 1
+# if EFL_OBJECT_CALL_CACHE_SIZE > 1
              int i;
 
-             for (i = 0; i < EO_CALL_CACHE_SIZE; i++)
+             for (i = 0; i < EFL_OBJECT_CALL_CACHE_SIZE; i++)
 # else
                 const int i = 0;
 # endif
@@ -384,13 +384,13 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal
 
         if (is_obj)
           {
-             call->data = _eo_data_scope_get(obj, func->src);
+             call->data = _efl_data_scope_get(obj, func->src);
           }
 
-# if EO_CALL_CACHE_SIZE > 0
+# if EFL_OBJECT_CALL_CACHE_SIZE > 0
         if (!cur_klass && !is_override)
           {
-# if EO_CALL_CACHE_SIZE > 1
+# if EFL_OBJECT_CALL_CACHE_SIZE > 1
              const int slot = cache->next_slot;
 # else
              const int slot = 0;
@@ -398,8 +398,8 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal
              cache->index[slot].klass = (const void *)inputklass;
              cache->entry[slot].func = (const void *)func;
              cache->off[slot].off = (int)((long)((char *)call->data - (char *)obj));
-# if EO_CALL_CACHE_SIZE > 1
-             cache->next_slot = (slot + 1) % EO_CALL_CACHE_SIZE;
+# if EFL_OBJECT_CALL_CACHE_SIZE > 1
+             cache->next_slot = (slot + 1) % EFL_OBJECT_CALL_CACHE_SIZE;
 # endif
           }
 #endif
@@ -435,12 +435,12 @@ end:
              if (EINA_LIKELY(func->func && func->src))
                {
                   call->eo_id = _eo_obj_id_get(emb_obj);
-                  call->obj = _eo_ref(emb_obj);
+                  call->obj = _efl_ref(emb_obj);
                   call->func = func->func;
-                  call->data = _eo_data_scope_get(emb_obj, func->src);
+                  call->data = _efl_data_scope_get(emb_obj, func->src);
 
                   /* We reffed it above, but no longer need/use it. */
-                  _eo_unref(obj);
+                  _efl_unref(obj);
 
                   return EINA_TRUE;
                }
@@ -466,11 +466,11 @@ end:
 }
 
 EAPI void
-_eo_call_end(Eo_Op_Call_Data *call)
+_efl_object_call_end(Efl_Object_Op_Call_Data *call)
 {
    if (EINA_LIKELY(!!call->obj))
      {
-        _eo_unref(call->obj);
+        _efl_unref(call->obj);
      }
 }
 
@@ -533,18 +533,18 @@ _eo_api_desc_get(const void *api_func, const _Efl_Class *klass, const _Efl_Class
    return NULL;
 }
 
-EAPI Eo_Op
-_eo_api_op_id_get(const void *api_func)
+EAPI Efl_Object_Op
+_efl_object_api_op_id_get(const void *api_func)
 {
    eina_spinlock_take(&_ops_storage_lock);
 #ifndef _WIN32
-   Eo_Op op = (uintptr_t) eina_hash_find(_ops_storage, &api_func);
+   Efl_Object_Op op = (uintptr_t) eina_hash_find(_ops_storage, &api_func);
 #else
-   Eo_Op op = (uintptr_t) eina_hash_find(_ops_storage, api_func);
+   Efl_Object_Op op = (uintptr_t) eina_hash_find(_ops_storage, api_func);
 #endif
    eina_spinlock_release(&_ops_storage_lock);
 
-   if (op == EO_NOOP)
+   if (op == EFL_NOOP)
      {
         ERR("Unable to resolve op for api func %p", api_func);
      }
@@ -555,7 +555,7 @@ _eo_api_op_id_get(const void *api_func)
 /* klass is the klass we are working on. hierarchy_klass is the class whe should
  * use when validating. */
 static Eina_Bool
-_eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hierarchy_klass, const _Efl_Class *klass, Eina_Bool override_only)
+_eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Class *hierarchy_klass, const _Efl_Class *klass, Eina_Bool override_only)
 {
    unsigned int i;
    int op_id;
@@ -573,7 +573,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hier
    last_api_func = NULL;
    for (i = 0, op_desc = op_descs; i < ops->count; i++, op_desc++)
      {
-        Eo_Op op = EO_NOOP;
+        Efl_Object_Op op = EFL_NOOP;
 
         if (op_desc->api_func == NULL)
           {
@@ -582,7 +582,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hier
              return EINA_FALSE;
           }
 
-        if ((op_desc->op_type == EO_OP_TYPE_REGULAR) || (op_desc->op_type == EO_OP_TYPE_CLASS))
+        if ((op_desc->op_type == EFL_OBJECT_OP_TYPE_REGULAR) || (op_desc->op_type == EFL_OBJECT_OP_TYPE_CLASS))
           {
              if (override_only)
                {
@@ -608,7 +608,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hier
 
              op_id++;
           }
-        else if ((op_desc->op_type == EO_OP_TYPE_REGULAR_OVERRIDE) || (op_desc->op_type == EO_OP_TYPE_CLASS_OVERRIDE))
+        else if ((op_desc->op_type == EFL_OBJECT_OP_TYPE_REGULAR_OVERRIDE) || (op_desc->op_type == EFL_OBJECT_OP_TYPE_CLASS_OVERRIDE))
           {
              const Efl_Op_Description *api_desc;
              if (override_only)
@@ -627,12 +627,12 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hier
                   return EINA_FALSE;
                }
 
-             op = _eo_api_op_id_get(op_desc->api_func);
+             op = _efl_object_api_op_id_get(op_desc->api_func);
           }
 
-        if (op == EO_NOOP)
+        if (op == EFL_NOOP)
           {
-             ERR("Class '%s': Invalid op 'EO_NOOP' (%p->%p '%s').",
+             ERR("Class '%s': Invalid op 'EFL_NOOP' (%p->%p '%s').",
                  klass->desc->name, op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc));
              return EINA_FALSE;
           }
@@ -649,14 +649,14 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hier
 }
 
 EAPI Eo *
-_eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref EINA_UNUSED, Eina_Bool is_fallback)
+_efl_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref EINA_UNUSED, Eina_Bool is_fallback)
 {
    _Eo_Object *obj;
    Eo_Stack_Frame *fptr = NULL;
 
    if (is_fallback)
      {
-        fptr = _eo_add_fallback_stack_push(NULL);
+        fptr = _efl_add_fallback_stack_push(NULL);
      }
 
    EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, NULL);
@@ -666,7 +666,7 @@ _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo
         EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, NULL);
      }
 
-   if (EINA_UNLIKELY(klass->desc->type != EO_CLASS_TYPE_REGULAR))
+   if (EINA_UNLIKELY(klass->desc->type != EFL_CLASS_TYPE_REGULAR))
      {
         ERR("in %s:%d: Class '%s' is not instantiate-able. Aborting.", file, line, klass->desc->name);
         return NULL;
@@ -697,9 +697,9 @@ _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo
 
    _eo_condtor_reset(obj);
 
-   eo_ref(eo_id);
+   efl_ref(eo_id);
 
-   /* Reference for the parent if is_ref is done in _eo_add_end */
+   /* Reference for the parent if is_ref is done in _efl_add_end */
    efl_parent_set(eo_id, parent_id);
 
    /* eo_id can change here. Freeing is done on the resolved object. */
@@ -710,7 +710,7 @@ _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo
             klass->desc->name);
 
         /* We have two refs at this point. */
-        _eo_unref(obj);
+        _efl_unref(obj);
         efl_del((Eo *) obj->header.id);
         return NULL;
      }
@@ -718,10 +718,10 @@ _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo
      {
         EO_OBJ_POINTER_RETURN_VAL(eo_id, new_obj, NULL);
         /* We have two refs at this point. */
-        _eo_unref(obj);
+        _efl_unref(obj);
         efl_del((Eo *) obj->header.id);
 
-        _eo_ref(new_obj);
+        _efl_ref(new_obj);
      }
 
    if (is_fallback)
@@ -733,7 +733,7 @@ _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo
 }
 
 static Eo *
-_eo_add_internal_end(Eo *eo_id, Eo *finalized_id)
+_efl_add_internal_end(Eo *eo_id, Eo *finalized_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL);
 
@@ -764,30 +764,30 @@ _eo_add_internal_end(Eo *eo_id, Eo *finalized_id)
 
    obj->finalized = EINA_TRUE;
 
-   _eo_unref(obj);
+   _efl_unref(obj);
 
    return (Eo *)eo_id;
 
 cleanup:
-   _eo_unref(obj);
+   _efl_unref(obj);
    efl_del((Eo *) obj->header.id);
    return NULL;
 }
 
 EAPI Eo *
-_eo_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
+_efl_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
 {
    Eo *ret = efl_finalize(eo_id);
-   ret = _eo_add_internal_end(eo_id, ret);
+   ret = _efl_add_internal_end(eo_id, ret);
 
    if (is_ref && efl_parent_get(eo_id))
      {
-        eo_ref(eo_id);
+        efl_ref(eo_id);
      }
 
    if (is_fallback)
      {
-        _eo_add_fallback_stack_pop();
+        _efl_add_fallback_stack_pop();
      }
 
    return ret;
@@ -796,7 +796,7 @@ _eo_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
 /*****************************************************************************/
 
 EAPI const Efl_Class *
-eo_class_get(const Eo *eo_id)
+efl_class_get(const Eo *eo_id)
 {
    if (_eo_is_a_class(eo_id))
      {
@@ -810,7 +810,7 @@ eo_class_get(const Eo *eo_id)
 }
 
 EAPI const char *
-eo_class_name_get(const Efl_Class *eo_id)
+efl_class_name_get(const Efl_Class *eo_id)
 {
    const _Efl_Class *klass;
 
@@ -906,7 +906,7 @@ _eo_class_mro_add(Eina_List *mro, const _Efl_Class *klass)
         for (extn_itr = klass->extensions ; *extn_itr ; extn_itr++)
           {
              const _Efl_Class *extn = *extn_itr;
-             if (extn->desc->type == EO_CLASS_TYPE_MIXIN)
+             if (extn->desc->type == EFL_CLASS_TYPE_MIXIN)
                mro = _eo_class_mro_add(mro, extn);
           }
      }
@@ -927,7 +927,7 @@ _eo_class_mro_init(const Efl_Class_Description *desc, const _Efl_Class *parent,
    /* Add MIXINS extensions. */
    EINA_LIST_FOREACH(extensions, extn_itr, extn)
      {
-        if (extn->desc->type != EO_CLASS_TYPE_MIXIN)
+        if (extn->desc->type != EFL_CLASS_TYPE_MIXIN)
           continue;
 
         mro = _eo_class_mro_add(mro, extn);
@@ -939,7 +939,7 @@ _eo_class_mro_init(const Efl_Class_Description *desc, const _Efl_Class *parent,
         Eina_List *itr = extn_pos;
         EINA_LIST_FOREACH(extensions, extn_itr, extn)
           {
-             if (extn->desc->type != EO_CLASS_TYPE_MIXIN)
+             if (extn->desc->type != EFL_CLASS_TYPE_MIXIN)
                 continue;
 
              /* Get the first one after the extension. */
@@ -1061,7 +1061,7 @@ _eo_classes_expand(void)
 }
 
 EAPI const Efl_Class *
-eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
+efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
 {
    _Efl_Class *klass;
    va_list p_list;
@@ -1081,7 +1081,7 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
 #endif
 
    /* Check restrictions on Interface types. */
-   if (desc->type == EO_CLASS_TYPE_INTERFACE)
+   if (desc->type == EFL_CLASS_TYPE_INTERFACE)
      {
         EINA_SAFETY_ON_FALSE_RETURN_VAL(!desc->data_size, NULL);
      }
@@ -1092,20 +1092,20 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
         /* Verify the inheritance is allowed. */
         switch (desc->type)
           {
-           case EO_CLASS_TYPE_REGULAR:
-           case EO_CLASS_TYPE_REGULAR_NO_INSTANT:
-              if ((parent->desc->type != EO_CLASS_TYPE_REGULAR) &&
-                    (parent->desc->type != EO_CLASS_TYPE_REGULAR_NO_INSTANT))
+           case EFL_CLASS_TYPE_REGULAR:
+           case EFL_CLASS_TYPE_REGULAR_NO_INSTANT:
+              if ((parent->desc->type != EFL_CLASS_TYPE_REGULAR) &&
+                    (parent->desc->type != EFL_CLASS_TYPE_REGULAR_NO_INSTANT))
                 {
                    ERR("Regular classes ('%s') aren't allowed to inherit from non-regular classes ('%s').",
                        desc->name, parent->desc->name);
                    return NULL;
                 }
               break;
-           case EO_CLASS_TYPE_INTERFACE:
-           case EO_CLASS_TYPE_MIXIN:
-              if ((parent->desc->type != EO_CLASS_TYPE_INTERFACE) &&
-                    (parent->desc->type != EO_CLASS_TYPE_MIXIN))
+           case EFL_CLASS_TYPE_INTERFACE:
+           case EFL_CLASS_TYPE_MIXIN:
+              if ((parent->desc->type != EFL_CLASS_TYPE_INTERFACE) &&
+                    (parent->desc->type != EFL_CLASS_TYPE_MIXIN))
                 {
                    ERR("Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').",
                        desc->name, parent->desc->name);
@@ -1130,10 +1130,10 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
              extn = _eo_class_pointer_get((Efl_Class *)extn_id);
              switch (extn->desc->type)
                {
-                case EO_CLASS_TYPE_REGULAR_NO_INSTANT:
-                case EO_CLASS_TYPE_REGULAR:
-                case EO_CLASS_TYPE_INTERFACE:
-                case EO_CLASS_TYPE_MIXIN:
+                case EFL_CLASS_TYPE_REGULAR_NO_INSTANT:
+                case EFL_CLASS_TYPE_REGULAR:
+                case EFL_CLASS_TYPE_INTERFACE:
+                case EFL_CLASS_TYPE_MIXIN:
                    extn_list = eina_list_append(extn_list, extn);
                    break;
                }
@@ -1176,13 +1176,13 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
         mixins = NULL;
         EINA_LIST_FOREACH(mro, itr, kls_itr)
           {
-             if ((kls_itr) && (kls_itr->desc->type == EO_CLASS_TYPE_MIXIN) &&
+             if ((kls_itr) && (kls_itr->desc->type == EFL_CLASS_TYPE_MIXIN) &&
                    (kls_itr->desc->data_size > 0))
                mixins = eina_list_append(mixins, kls_itr);
           }
 
         mixins_sz = sizeof(Eo_Extension_Data_Offset) * (eina_list_count(mixins) + 1);
-        if ((desc->type == EO_CLASS_TYPE_MIXIN) && (desc->data_size > 0))
+        if ((desc->type == EFL_CLASS_TYPE_MIXIN) && (desc->data_size > 0))
           mixins_sz += sizeof(Eo_Extension_Data_Offset);
 
         DBG("Finished building Mixins list for class '%s'", desc->name);
@@ -1213,7 +1213,7 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
 
    mro = eina_list_remove(mro, NULL);
    mro = eina_list_prepend(mro, klass);
-   if ((desc->type == EO_CLASS_TYPE_MIXIN) && (desc->data_size > 0))
+   if ((desc->type == EFL_CLASS_TYPE_MIXIN) && (desc->data_size > 0))
      mixins = eina_list_prepend(mixins, klass);
 
    /* Copy the extensions and free the list */
@@ -1243,7 +1243,7 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
      }
 
    size_t extn_data_off = klass->data_offset;
-   if (klass->desc->type != EO_CLASS_TYPE_MIXIN)
+   if (klass->desc->type != EFL_CLASS_TYPE_MIXIN)
       extn_data_off += EO_ALIGN_SIZE(klass->desc->data_size);
 
    /* Feed the mixins data offsets and free the mixins list. */
@@ -1321,11 +1321,11 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
      {
         Eo_Id new_id;
 
-        eina_spinlock_take(&_eo_class_creation_lock);
+        eina_spinlock_take(&_efl_class_creation_lock);
         new_id = (_eo_classes_last_id + 1) | MASK_CLASS_TAG;
         _eo_classes_expand();
         _eo_classes[_UNMASK_ID(new_id) - 1] = klass;
-        eina_spinlock_release(&_eo_class_creation_lock);
+        eina_spinlock_release(&_efl_class_creation_lock);
 
         klass->header.id = new_id;
      }
@@ -1338,7 +1338,7 @@ eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
 }
 
 EAPI Eina_Bool
-eo_override(Eo *eo_id, const Eo_Ops *ops)
+efl_object_override(Eo *eo_id, const Efl_Object_Ops *ops)
 {
    EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE);
    EO_CLASS_POINTER_RETURN_VAL(EFL_OBJECT_OVERRIDE_CLASS, klass, EINA_FALSE);
@@ -1377,7 +1377,7 @@ eo_override(Eo *eo_id, const Eo_Ops *ops)
 }
 
 EAPI Eina_Bool
-eo_isa(const Eo *eo_id, const Efl_Class *klass_id)
+efl_isa(const Eo *eo_id, const Efl_Class *klass_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE);
    EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EINA_FALSE);
@@ -1390,9 +1390,9 @@ eo_isa(const Eo *eo_id, const Efl_Class *klass_id)
 }
 
 EAPI Eo *
-eo_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
+efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
 {
-   eo_ref(obj_id);
+   efl_ref(obj_id);
 
 #ifdef EO_DEBUG
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, obj_id);
@@ -1413,7 +1413,7 @@ eo_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
 }
 
 EAPI void
-eo_xunref(Eo *obj_id, const Eo *ref_obj_id)
+efl_xunref(Eo *obj_id, const Eo *ref_obj_id)
 {
    EO_OBJ_POINTER_RETURN(obj_id, obj);
 #ifdef EO_DEBUG
@@ -1437,24 +1437,24 @@ eo_xunref(Eo *obj_id, const Eo *ref_obj_id)
 #else
    (void) ref_obj_id;
 #endif
-   eo_unref(obj_id);
+   efl_unref(obj_id);
 }
 
 EAPI Eo *
-eo_ref(const Eo *obj_id)
+efl_ref(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, (Eo *)obj_id);
 
    ++(obj->user_refcount);
    if (EINA_UNLIKELY(obj->user_refcount == 1))
      {
-        _eo_ref(obj);
+        _efl_ref(obj);
      }
    return (Eo *)obj_id;
 }
 
 EAPI void
-eo_unref(const Eo *obj_id)
+efl_unref(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN(obj_id, obj);
 
@@ -1467,12 +1467,12 @@ eo_unref(const Eo *obj_id)
              return;
           }
 
-        _eo_unref(obj);
+        _efl_unref(obj);
      }
 }
 
 EAPI int
-eo_ref_get(const Eo *obj_id)
+efl_ref_get(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0);
 
@@ -1480,7 +1480,7 @@ eo_ref_get(const Eo *obj_id)
 }
 
 EAPI int
-___eo_ref2_get(const Eo *obj_id)
+___efl_ref2_get(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, 0);
 
@@ -1488,7 +1488,7 @@ ___eo_ref2_get(const Eo *obj_id)
 }
 
 EAPI void
-___eo_ref2_reset(const Eo *obj_id)
+___efl_ref2_reset(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN(obj_id, obj);
    obj->refcount = 0;
@@ -1496,14 +1496,14 @@ ___eo_ref2_reset(const Eo *obj_id)
 
 
 EAPI void
-efl_del_intercept_set(Eo *obj_id, Eo_Del_Intercept del_intercept_func)
+efl_del_intercept_set(Eo *obj_id, Efl_Del_Intercept del_intercept_func)
 {
    EO_OBJ_POINTER_RETURN(obj_id, obj);
 
    obj->del_intercept = del_intercept_func;
 }
 
-EAPI Eo_Del_Intercept
+EAPI Efl_Del_Intercept
 efl_del_intercept_get(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
@@ -1525,20 +1525,20 @@ _eo_condtor_done(Eo *obj_id)
 }
 
 static inline void *
-_eo_data_scope_safe_get(const _Eo_Object *obj, const _Efl_Class *klass)
+_efl_data_scope_safe_get(const _Eo_Object *obj, const _Efl_Class *klass)
 {
    if (EINA_LIKELY(klass->desc->data_size > 0))
      {
-        return _eo_data_scope_get(obj, klass);
+        return _efl_data_scope_get(obj, klass);
      }
 
    return NULL;
 }
 
 static inline void *
-_eo_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass)
+_efl_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass)
 {
-   if (EINA_LIKELY(klass->desc->type != EO_CLASS_TYPE_MIXIN))
+   if (EINA_LIKELY(klass->desc->type != EFL_CLASS_TYPE_MIXIN))
      return ((char *) obj) + klass->data_offset;
 
    if (EINA_UNLIKELY(klass->desc->data_size == 0))
@@ -1564,12 +1564,12 @@ _eo_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass)
 }
 
 static inline void *
-_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_Class *klass, const _Eo_Object *ref_obj)
+_efl_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_Class *klass, const _Eo_Object *ref_obj)
 {
    void *data = NULL;
    if (klass != NULL)
      {
-        data = _eo_data_scope_safe_get(obj, klass);
+        data = _efl_data_scope_safe_get(obj, klass);
         if (data == NULL) return NULL;
      }
 #ifdef EO_DEBUG
@@ -1589,7 +1589,7 @@ _eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_C
 }
 
 static inline void
-_eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
+_efl_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
 {
 #ifdef EO_DEBUG
    const _Efl_Class *klass = obj->klass;
@@ -1634,7 +1634,7 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
 }
 
 EAPI void *
-eo_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id)
+efl_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id)
 {
    void *ret;
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
@@ -1648,7 +1648,7 @@ eo_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id)
      }
 #endif
 
-   ret = _eo_data_scope_safe_get(obj, klass);
+   ret = _efl_data_scope_safe_get(obj, klass);
 
 #ifdef EO_DEBUG
    if (!ret && (klass->desc->data_size == 0))
@@ -1661,7 +1661,7 @@ eo_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id)
 }
 
 EAPI void *
-eo_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Class *klass_id, const Eo *ref_obj_id)
+efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Class *klass_id, const Eo *ref_obj_id)
 {
    void *ret;
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
@@ -1681,7 +1681,7 @@ eo_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Cl
 #endif
      }
 
-   ret = _eo_data_xref_internal(file, line, obj, klass, ref_obj);
+   ret = _efl_data_xref_internal(file, line, obj, klass, ref_obj);
 
 #ifdef EO_DEBUG
    if (klass && !ret && (klass->desc->data_size == 0))
@@ -1694,18 +1694,18 @@ eo_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Cl
 }
 
 EAPI void
-eo_data_xunref_internal(const Eo *obj_id, void *data, const Eo *ref_obj_id)
+efl_data_xunref_internal(const Eo *obj_id, void *data, const Eo *ref_obj_id)
 {
    EO_OBJ_POINTER_RETURN(obj_id, obj);
    EO_OBJ_POINTER_RETURN(ref_obj_id, ref_obj);
-   _eo_data_xunref_internal(obj, data, ref_obj);
+   _efl_data_xunref_internal(obj, data, ref_obj);
 }
 
 EAPI Eina_Bool
-eo_init(void)
+efl_object_init(void)
 {
    const char *log_dom = "eo";
-   if (_eo_init_count++ > 0)
+   if (_efl_object_init_count++ > 0)
      return EINA_TRUE;
 
    eina_init();
@@ -1715,7 +1715,7 @@ eo_init(void)
 
    _eo_classes = NULL;
    _eo_classes_last_id = EO_CLASS_IDS_FIRST - 1;
-   _eo_ops_last_id = EO_OP_IDS_FIRST;
+   _eo_ops_last_id = EFL_OBJECT_OP_IDS_FIRST;
    _eo_log_dom = eina_log_domain_register(log_dom, EINA_COLOR_LIGHTBLUE);
    if (_eo_log_dom < 0)
      {
@@ -1723,7 +1723,7 @@ eo_init(void)
         return EINA_FALSE;
      }
 
-   if (!eina_spinlock_new(&_eo_class_creation_lock))
+   if (!eina_spinlock_new(&_efl_class_creation_lock))
      {
         EINA_LOG_ERR("Could not init lock.");
         return EINA_FALSE;
@@ -1759,7 +1759,7 @@ eo_init(void)
    _eo_class_isa_func(NULL, NULL, NULL);
 #endif
 
-   _eo_add_fallback_init();
+   _efl_add_fallback_init();
 
    eina_log_timing(_eo_log_dom,
                    EINA_LOG_STATE_STOP,
@@ -1772,19 +1772,19 @@ eo_init(void)
 }
 
 EAPI Eina_Bool
-eo_shutdown(void)
+efl_object_shutdown(void)
 {
    size_t i;
    _Efl_Class **cls_itr = _eo_classes + _eo_classes_last_id - 1;
 
-   if (--_eo_init_count > 0)
+   if (--_efl_object_init_count > 0)
      return EINA_TRUE;
 
    eina_log_timing(_eo_log_dom,
                    EINA_LOG_STATE_START,
                    EINA_LOG_STATE_SHUTDOWN);
 
-   _eo_add_fallback_shutdown();
+   _efl_add_fallback_shutdown();
 
    for (i = 0 ; i < _eo_classes_last_id ; i++, cls_itr--)
      {
@@ -1792,29 +1792,29 @@ eo_shutdown(void)
           eo_class_free(*cls_itr);
      }
 
-   eina_spinlock_take(&_eo_class_creation_lock);
+   eina_spinlock_take(&_efl_class_creation_lock);
    _eo_classes_release();
-   eina_spinlock_release(&_eo_class_creation_lock);
+   eina_spinlock_release(&_efl_class_creation_lock);
 
    eina_hash_free(_ops_storage);
 
    eina_spinlock_free(&_super_class_lock);
    eina_spinlock_free(&_ops_storage_lock);
-   eina_spinlock_free(&_eo_class_creation_lock);
+   eina_spinlock_free(&_efl_class_creation_lock);
 
    _eo_free_ids_tables();
 
    eina_log_domain_unregister(_eo_log_dom);
    _eo_log_dom = -1;
 
-   ++_eo_init_generation;
+   ++_efl_object_init_generation;
 
    eina_shutdown();
    return EINA_FALSE;
 }
 
 EAPI Eina_Bool
-eo_destructed_is(const Eo *obj_id)
+efl_destructed_is(const Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE);
 
@@ -1822,20 +1822,20 @@ eo_destructed_is(const Eo *obj_id)
 }
 
 EAPI void
-eo_manual_free_set(Eo *obj_id, Eina_Bool manual_free)
+efl_manual_free_set(Eo *obj_id, Eina_Bool manual_free)
 {
    EO_OBJ_POINTER_RETURN(obj_id, obj);
    obj->manual_free = manual_free;
 }
 
 EAPI Eina_Bool
-eo_manual_free(Eo *obj_id)
+efl_manual_free(Eo *obj_id)
 {
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE);
 
    if (EINA_FALSE == obj->manual_free)
      {
-        ERR("Tried to manually free the object %p while the option has not been set; see eo_manual_free_set for more information.", obj);
+        ERR("Tried to manually free the object %p while the option has not been set; see efl_manual_free_set for more information.", obj);
         return EINA_FALSE;
      }
 
diff --git a/src/lib/eo/eo_add_fallback.c b/src/lib/eo/eo_add_fallback.c
index 6d714d677f..7973fee6ee 100644
--- a/src/lib/eo/eo_add_fallback.c
+++ b/src/lib/eo/eo_add_fallback.c
@@ -15,14 +15,14 @@
 
 // 1024 entries == 16k or 32k (32 or 64bit) for eo call stack. that's 1023
 // imbricated/recursive calls it can handle before barfing. i'd say that's ok
-#define EO_CALL_STACK_DEPTH_MIN 1024
+#define EFL_OBJECT_CALL_STACK_DEPTH_MIN 1024
 
-typedef struct _Eo_Call_Stack {
+typedef struct _Efl_Object_Call_Stack {
    Eo_Stack_Frame *frames;
    Eo_Stack_Frame *frame_ptr;
-} Eo_Call_Stack;
+} Efl_Object_Call_Stack;
 
-#define EO_CALL_STACK_SIZE (EO_CALL_STACK_DEPTH_MIN * sizeof(Eo_Stack_Frame))
+#define EFL_OBJECT_CALL_STACK_SIZE (EFL_OBJECT_CALL_STACK_DEPTH_MIN * sizeof(Eo_Stack_Frame))
 
 static Eina_TLS _eo_call_stack_key = 0;
 
@@ -63,16 +63,16 @@ _eo_call_stack_mem_free(void *ptr, size_t size)
 #endif
 }
 
-static Eo_Call_Stack *
+static Efl_Object_Call_Stack *
 _eo_call_stack_create()
 {
-   Eo_Call_Stack *stack;
+   Efl_Object_Call_Stack *stack;
 
-   stack = calloc(1, sizeof(Eo_Call_Stack));
+   stack = calloc(1, sizeof(Efl_Object_Call_Stack));
    if (!stack)
      return NULL;
 
-   stack->frames = _eo_call_stack_mem_alloc(EO_CALL_STACK_SIZE);
+   stack->frames = _eo_call_stack_mem_alloc(EFL_OBJECT_CALL_STACK_SIZE);
    if (!stack->frames)
      {
         free(stack);
@@ -88,24 +88,24 @@ _eo_call_stack_create()
 static void
 _eo_call_stack_free(void *ptr)
 {
-   Eo_Call_Stack *stack = (Eo_Call_Stack *) ptr;
+   Efl_Object_Call_Stack *stack = (Efl_Object_Call_Stack *) ptr;
 
    if (!stack) return;
 
    if (stack->frames)
-     _eo_call_stack_mem_free(stack->frames, EO_CALL_STACK_SIZE);
+     _eo_call_stack_mem_free(stack->frames, EFL_OBJECT_CALL_STACK_SIZE);
 
    free(stack);
 }
 
-static Eo_Call_Stack *main_loop_stack = NULL;
+static Efl_Object_Call_Stack *main_loop_stack = NULL;
 
-#define _EO_CALL_STACK_GET() ((EINA_LIKELY(eina_main_loop_is())) ? main_loop_stack : _eo_call_stack_get_thread())
+#define _EFL_OBJECT_CALL_STACK_GET() ((EINA_LIKELY(eina_main_loop_is())) ? main_loop_stack : _eo_call_stack_get_thread())
 
-static inline Eo_Call_Stack *
+static inline Efl_Object_Call_Stack *
 _eo_call_stack_get_thread(void)
 {
-   Eo_Call_Stack *stack = eina_tls_get(_eo_call_stack_key);
+   Efl_Object_Call_Stack *stack = eina_tls_get(_eo_call_stack_key);
 
    if (stack) return stack;
 
@@ -116,18 +116,18 @@ _eo_call_stack_get_thread(void)
 }
 
 EAPI Eo *
-_eo_self_get(void)
+_efl_self_get(void)
 {
-   return _EO_CALL_STACK_GET()->frame_ptr->obj;
+   return _EFL_OBJECT_CALL_STACK_GET()->frame_ptr->obj;
 }
 
 Eo_Stack_Frame *
-_eo_add_fallback_stack_push(Eo *obj)
+_efl_add_fallback_stack_push(Eo *obj)
 {
-   Eo_Call_Stack *stack = _EO_CALL_STACK_GET();
-   if (stack->frame_ptr == (stack->frames + EO_CALL_STACK_DEPTH_MIN))
+   Efl_Object_Call_Stack *stack = _EFL_OBJECT_CALL_STACK_GET();
+   if (stack->frame_ptr == (stack->frames + EFL_OBJECT_CALL_STACK_DEPTH_MIN))
      {
-        CRI("eo_add fallback stack overflow.");
+        CRI("efl_add fallback stack overflow.");
      }
 
    stack->frame_ptr++;
@@ -137,12 +137,12 @@ _eo_add_fallback_stack_push(Eo *obj)
 }
 
 Eo_Stack_Frame *
-_eo_add_fallback_stack_pop(void)
+_efl_add_fallback_stack_pop(void)
 {
-   Eo_Call_Stack *stack = _EO_CALL_STACK_GET();
+   Efl_Object_Call_Stack *stack = _EFL_OBJECT_CALL_STACK_GET();
    if (stack->frame_ptr == stack->frames)
      {
-        CRI("eo_add fallback stack underflow.");
+        CRI("efl_add fallback stack underflow.");
      }
 
    stack->frame_ptr--;
@@ -151,7 +151,7 @@ _eo_add_fallback_stack_pop(void)
 }
 
 Eina_Bool
-_eo_add_fallback_init(void)
+_efl_add_fallback_init(void)
 {
    if (_eo_call_stack_key != 0)
      WRN("_eo_call_stack_key already set, this should not happen.");
@@ -176,7 +176,7 @@ _eo_add_fallback_init(void)
 }
 
 Eina_Bool
-_eo_add_fallback_shutdown(void)
+_efl_add_fallback_shutdown(void)
 {
    if (_eo_call_stack_key != 0)
      {
diff --git a/src/lib/eo/eo_add_fallback.h b/src/lib/eo/eo_add_fallback.h
index 4b5e4a5625..4a22d13ba9 100644
--- a/src/lib/eo/eo_add_fallback.h
+++ b/src/lib/eo/eo_add_fallback.h
@@ -9,10 +9,10 @@ typedef struct _Eo_Stack_Frame
    Eo *obj;
 } Eo_Stack_Frame;
 
-Eina_Bool _eo_add_fallback_init(void);
-Eina_Bool _eo_add_fallback_shutdown(void);
+Eina_Bool _efl_add_fallback_init(void);
+Eina_Bool _efl_add_fallback_shutdown(void);
 
-Eo_Stack_Frame *_eo_add_fallback_stack_push(Eo *obj);
-Eo_Stack_Frame *_eo_add_fallback_stack_pop(void);
+Eo_Stack_Frame *_efl_add_fallback_stack_push(Eo *obj);
+Eo_Stack_Frame *_efl_add_fallback_stack_pop(void);
 
 #endif
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 89d3618a2f..b68a96de67 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -99,7 +99,7 @@ _eo_generic_data_node_free(Eo_Generic_Data_Node *node)
         break;
       case DATA_OBJ:
         efl_event_callback_del(node->d.obj, EFL_EVENT_DEL, _key_generic_cb_del, node);
-        eo_unref(node->d.obj);
+        efl_unref(node->d.obj);
         break;
       case DATA_OBJ_WEAK:
         efl_event_callback_del(node->d.obj, EFL_EVENT_DEL, _key_generic_cb_del, node);
@@ -238,7 +238,7 @@ static void
 _key_generic_cb_del(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Eo_Generic_Data_Node *node = data;
-   Efl_Object_Data *pd = eo_data_scope_get(node->obj, EFL_OBJECT_CLASS);
+   Efl_Object_Data *pd = efl_data_scope_get(node->obj, EFL_OBJECT_CLASS);
    _eo_key_generic_direct_del(pd, node, EINA_FALSE);
 }
 
@@ -262,7 +262,7 @@ _efl_object_key_ref_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *ke
    node = _key_generic_set(obj, pd, key, objdata, DATA_OBJ, EINA_TRUE);
    if (node)
      {
-        eo_ref(objdata);
+        efl_ref(objdata);
         efl_event_callback_add((Eo *)objdata, EFL_EVENT_DEL, _key_generic_cb_del, node);
      }
 }
@@ -442,7 +442,7 @@ _efl_object_name_find(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *sear
                {
                   child = _eo_obj_id_get(child_eo);
                   name = efl_name_get(child);
-                  klass_name = eo_class_name_get(eo_class_get(child));
+                  klass_name = efl_class_name_get(efl_class_get(child));
                   if (_name_match(klass, klass_glob, klass_name) &&
                       (((!_matchall(klass)) && (!name) && (_matchall(search_name))) ||
                        ((name) && _name_match(search_name, name_glob, name))))
@@ -520,7 +520,7 @@ _efl_object_del(const Eo *obj, Efl_Object_Data *pd EINA_UNUSED)
      }
    else
      {
-        eo_unref(obj);
+        efl_unref(obj);
      }
 }
 
@@ -536,7 +536,7 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
      {
         Efl_Object_Data *old_parent_pd;
 
-        old_parent_pd = eo_data_scope_get(pd->parent, EFL_OBJECT_CLASS);
+        old_parent_pd = efl_data_scope_get(pd->parent, EFL_OBJECT_CLASS);
         if (old_parent_pd)
           {
              old_parent_pd->children = eina_inlist_remove(old_parent_pd->children,
@@ -552,7 +552,7 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
          * the process of deleting the object.*/
         if (!parent_id && !eo_obj->del_triggered)
           {
-             eo_unref(obj);
+             efl_unref(obj);
           }
      }
 
@@ -560,7 +560,7 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
    if (parent_id)
      {
         Efl_Object_Data *parent_pd = NULL;
-        parent_pd = eo_data_scope_get(parent_id, EFL_OBJECT_CLASS);
+        parent_pd = efl_data_scope_get(parent_id, EFL_OBJECT_CLASS);
 
         if (EINA_LIKELY(parent_pd != NULL))
           {
@@ -655,7 +655,7 @@ _efl_children_iterator_free(Eo_Children_Iterator *it)
      }
    eina_spinlock_release(&klass->iterators.trash_lock);
 
-   _eo_unref(obj);
+   _efl_unref(obj);
 }
 
 EOLIAN static Eina_Iterator *
@@ -686,7 +686,7 @@ _efl_object_children_iterator_new(Eo *obj_id, Efl_Object_Data *pd)
 
    EINA_MAGIC_SET(&it->iterator, EINA_MAGIC_ITERATOR);
    it->current = pd->children;
-   it->obj = _eo_ref(obj);
+   it->obj = _efl_ref(obj);
    it->obj_id = obj_id;
 
    it->iterator.next = FUNC_ITERATOR_NEXT(_efl_children_iterator_next);
@@ -1303,7 +1303,7 @@ _efl_object_composite_attach(Eo *parent_id, Efl_Object_Data *pd EINA_UNUSED, Eo
    EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE);
    EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE);
 
-   Efl_Object_Data *comp_pd = eo_data_scope_get(comp_obj_id, EFL_OBJECT_CLASS);
+   Efl_Object_Data *comp_pd = efl_data_scope_get(comp_obj_id, EFL_OBJECT_CLASS);
    /* Don't composite if we already have a composite object of this type */
      {
         Eina_List *itr;
@@ -1342,7 +1342,7 @@ _efl_object_composite_detach(Eo *parent_id, Efl_Object_Data *pd EINA_UNUSED, Eo
    parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id);
    /* Clear the comp parent on the child. */
      {
-        Efl_Object_Data *comp_pd = eo_data_scope_get(comp_obj_id, EFL_OBJECT_CLASS);
+        Efl_Object_Data *comp_pd = efl_data_scope_get(comp_obj_id, EFL_OBJECT_CLASS);
         comp_pd->ext->composite_parent = NULL;
 
         _efl_object_extension_noneed(comp_pd);
@@ -1359,7 +1359,7 @@ _efl_object_composite_part_is(Eo *comp_obj_id EINA_UNUSED, Efl_Object_Data *pd)
 
 /* Eo_Dbg */
 EAPI void
-eo_dbg_info_free(Efl_Dbg_Info *info)
+efl_dbg_info_free(Efl_Dbg_Info *info)
 {
    eina_value_flush(&(info->value));
    free(info);
@@ -1434,7 +1434,7 @@ _eo_dbg_info_pget(const Eina_Value_Type *type EINA_UNUSED, const void *_mem, voi
    return EINA_TRUE;
 }
 
-static const Eina_Value_Type _EO_DBG_INFO_TYPE = {
+static const Eina_Value_Type _EFL_DBG_INFO_TYPE = {
    EINA_VALUE_TYPE_VERSION,
    sizeof(Efl_Dbg_Info *),
    "Efl_Dbg_Info_Ptr",
@@ -1449,7 +1449,7 @@ static const Eina_Value_Type _EO_DBG_INFO_TYPE = {
    _eo_dbg_info_pget
 };
 
-EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE;
+EAPI const Eina_Value_Type *EFL_DBG_INFO_TYPE = &_EFL_DBG_INFO_TYPE;
 
 
 /* EOF event callbacks */
@@ -1460,7 +1460,7 @@ EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE;
 EOLIAN static Eo *
 _efl_object_constructor(Eo *obj, Efl_Object_Data *pd EINA_UNUSED)
 {
-   DBG("%p - %s.", obj, eo_class_name_get(obj));
+   DBG("%p - %s.", obj, efl_class_name_get(obj));
 
    _eo_condtor_done(obj);
 
@@ -1473,7 +1473,7 @@ _efl_object_destructor(Eo *obj, Efl_Object_Data *pd)
    Eo *child;
    Efl_Object_Extension *ext;
 
-   DBG("%p - %s.", obj, eo_class_name_get(obj));
+   DBG("%p - %s.", obj, efl_class_name_get(obj));
 
    // special removal - remove from children list by hand after getting
    // child handle in case unparent method is overridden and does
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 4fad6b5860..37ee7c7919 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -107,7 +107,7 @@ struct _Eo_Object
      Eo_Vtable *vtable;
 
      Eina_List *composite_objects;
-     Eo_Del_Intercept del_intercept;
+     Efl_Del_Intercept del_intercept;
 
      short refcount;
      short user_refcount;
@@ -291,14 +291,14 @@ _eo_free(_Eo_Object *obj)
 }
 
 static inline _Eo_Object *
-_eo_ref(_Eo_Object *obj)
+_efl_ref(_Eo_Object *obj)
 {
    obj->refcount++;
    return obj;
 }
 
 static inline void
-_eo_unref(_Eo_Object *obj)
+_efl_unref(_Eo_Object *obj)
 {
    --(obj->refcount);
    if (EINA_UNLIKELY(obj->refcount <= 0))
@@ -317,14 +317,14 @@ _eo_unref(_Eo_Object *obj)
 
         if (obj->del_triggered)
           {
-             ERR("Object %p deletion already triggered. You wrongly call eo_unref() within a destructor.", _eo_obj_id_get(obj));
+             ERR("Object %p deletion already triggered. You wrongly call efl_unref() within a destructor.", _eo_obj_id_get(obj));
              return;
           }
 
         if (obj->del_intercept)
           {
              Eo *obj_id = _eo_obj_id_get(obj);
-             eo_ref(obj_id);
+             efl_ref(obj_id);
              obj->del_intercept(obj_id);
              return;
           }
@@ -355,7 +355,7 @@ _eo_unref(_Eo_Object *obj)
         if (!obj->manual_free)
           _eo_free(obj);
         else
-          _eo_ref(obj); /* If we manual free, we keep a phantom ref. */
+          _efl_ref(obj); /* If we manual free, we keep a phantom ref. */
      }
 }
 
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index b55d7b2955..40a92a4664 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2825,12 +2825,12 @@ EAPI int                               evas_smart_usage_get(const Evas_Smart *s)
  * This function has been implemented to support legacy mechanism that checks
  * objects types by name.
  * USE IT ONLY FOR LEGACY SUPPORT.
- * Otherwise, it is HIGHLY recommended to use eo_isa.
+ * Otherwise, it is HIGHLY recommended to use efl_isa.
  *
  * @param type The type (name string) to add.
  * @param klass The class to associate to the type.
  *
- * @see eo_isa
+ * @see efl_isa
  *
  * @ingroup Evas_Smart_Object_Group
  */
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 1962953bf8..96088916fe 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2382,7 +2382,7 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN
  * @code
  * vector = evas_object_vg_add(canvas);
  * root = evas_obj_vg_root_node_get(vector);
- * shape = eo_add(EVAS_VG_SHAPE_CLASS, root);
+ * shape = efl_add(EVAS_VG_SHAPE_CLASS, root);
  * Efl_Gfx_Path_Command *path_cmd = NULL;
  * double *points = NULL;
  * efl_gfx_path_append_circle(&path_cmd, &points);
@@ -5089,7 +5089,7 @@ EAPI void             *evas_object_smart_interface_data_get(const Evas_Object *o
  * If @c obj is not a smart object, this call will fail immediately.
  *
  * This function supports Eo and legacy inheritance mechanisms. However, it is
- * recommended to use @ref eo_isa instead if your object is using Eo from top
+ * recommended to use @ref efl_isa instead if your object is using Eo from top
  * to bottom.
  *
  * The checks use smart classes names and string comparison. There is a version
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index adfbb9938f..ee32e61697 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -6,8 +6,8 @@
 Eina_Bool
 _evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Image_Load_Opts lo;
 
    if (o->cur->u.f == f)
@@ -36,7 +36,7 @@ _efl_canvas_image_efl_file_mmap_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 void
 _evas_image_mmap_get(const Eo *eo_obj, const Eina_File **f, const char **key)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (f)
      *f = o->cur->mmaped_source ? o->cur->u.f : NULL;
@@ -54,8 +54,8 @@ _efl_canvas_image_efl_file_mmap_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 Eina_Bool
 _evas_image_file_set(Eo *eo_obj, const char *file, const char *key)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Image_Load_Opts lo;
    const char *file2;
 
@@ -95,7 +95,7 @@ _efl_canvas_image_efl_file_file_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 void
 _evas_image_file_get(const Eo *eo_obj, const char **file, const char **key)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (file)
      {
@@ -117,7 +117,7 @@ _efl_canvas_image_efl_file_file_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 Efl_Image_Load_Error
 _evas_image_load_error_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_error;
 }
@@ -139,7 +139,7 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel)
      }
    // FIXME: if already busy preloading, then dont request again until
    // preload done
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (cancel)
      {
         if (o->preloading)
@@ -161,8 +161,8 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel)
 void
 _evas_image_load_async_start(Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    _image_preload_internal(eo_obj, o, EINA_FALSE);
@@ -177,8 +177,8 @@ _efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj, void *_pd EINA_UNU
 void
 _evas_image_load_async_cancel(Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    _image_preload_internal(eo_obj, o, EINA_TRUE);
@@ -193,8 +193,8 @@ _efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj, void *_pd EINA_UN
 void
 _evas_image_load_dpi_set(Eo *eo_obj, double dpi)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (dpi == o->load_opts->dpi) return;
    evas_object_async_block(obj);
@@ -221,7 +221,7 @@ _efl_canvas_image_efl_image_load_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED
 double
 _evas_image_load_dpi_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_opts->dpi;
 }
@@ -235,8 +235,8 @@ _efl_canvas_image_efl_image_load_load_dpi_get(Eo *eo_obj, void *_pd EINA_UNUSED
 void
 _evas_image_load_size_set(Eo *eo_obj, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if ((o->load_opts->w == w) && (o->load_opts->h == h)) return;
    evas_object_async_block(obj);
@@ -267,7 +267,7 @@ _efl_canvas_image_efl_image_load_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED
 void
 _evas_image_load_size_get(const Eo *eo_obj, int *w, int *h)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (w) *w = o->load_opts->w;
    if (h) *h = o->load_opts->h;
@@ -282,8 +282,8 @@ _efl_canvas_image_efl_image_load_load_size_get(Eo *eo_obj, void *_pd EINA_UNUSED
 void
 _evas_image_load_scale_down_set(Eo *eo_obj, int scale_down)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (o->load_opts->scale_down_by == scale_down) return;
    evas_object_async_block(obj);
@@ -310,7 +310,7 @@ _efl_canvas_image_efl_image_load_load_scale_down_set(Eo *eo_obj, void *_pd EINA_
 int
 _evas_image_load_scale_down_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_opts->scale_down_by;
 }
@@ -324,8 +324,8 @@ _efl_canvas_image_efl_image_load_load_scale_down_get(Eo *eo_obj, void *_pd EINA_
 void
 _evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if ((o->load_opts->region.x == x) && (o->load_opts->region.y == y) &&
        (o->load_opts->region.w == w) && (o->load_opts->region.h == h)) return;
@@ -358,7 +358,7 @@ _efl_canvas_image_efl_image_load_load_region_set(Eo *eo_obj, void *_pd EINA_UNUS
 void
 _evas_image_load_region_get(const Eo *eo_obj, int *x, int *y, int *w, int *h)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (x) *x = o->load_opts->region.x;
    if (y) *y = o->load_opts->region.y;
@@ -375,8 +375,8 @@ _efl_canvas_image_efl_image_load_load_region_get(Eo *eo_obj, void *_pd EINA_UNUS
 void
 _evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (o->load_opts->orientation == !!enable) return;
    evas_object_async_block(obj);
@@ -395,7 +395,7 @@ _efl_canvas_image_efl_image_load_load_orientation_set(Eo *eo_obj, void *_pd EINA
 Eina_Bool
 _evas_image_load_orientation_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_opts->orientation;
 }
@@ -409,8 +409,8 @@ _efl_canvas_image_efl_image_load_load_orientation_get(Eo *eo_obj, void *_pd EINA
 Eina_Bool
 _evas_image_load_region_support_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return ENFN->image_can_region_get(ENDT, o->engine_data);
 }
@@ -425,8 +425,8 @@ _efl_canvas_image_efl_image_load_load_region_support_get(Eo *eo_obj, void *_pd E
 Eina_Bool
 _evas_image_animated_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_get)
      return EINA_FALSE;
@@ -443,14 +443,14 @@ _efl_canvas_image_efl_image_animated_animated_get(Eo *eo_obj, void *_pd EINA_UNU
 int
 _evas_image_animated_frame_count_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_frame_count_get ||
        !evas_object_image_animated_get(eo_obj))
      return -1;
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    return ENFN->image_animated_frame_count_get(ENDT, o->engine_data);
 }
 
@@ -463,8 +463,8 @@ _efl_canvas_image_efl_image_animated_animated_frame_count_get(Eo *eo_obj, void *
 Efl_Image_Animated_Loop_Hint
 _evas_image_animated_loop_type_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_loop_type_get ||
        !evas_object_image_animated_get(eo_obj))
@@ -482,8 +482,8 @@ _efl_canvas_image_efl_image_animated_animated_loop_type_get(Eo *eo_obj, void *_p
 int
 _evas_image_animated_loop_count_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_loop_count_get ||
        !evas_object_image_animated_get(eo_obj))
@@ -501,8 +501,8 @@ _efl_canvas_image_efl_image_animated_animated_loop_count_get(Eo *eo_obj, void *_
 double
 _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int frame_count = 0;
 
    if (!ENFN->image_animated_frame_count_get ||
@@ -525,8 +525,8 @@ _efl_canvas_image_efl_image_animated_animated_frame_duration_get(Eo *eo_obj, voi
 Eina_Bool
 _evas_image_animated_frame_set(Eo *eo_obj, int frame_index)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int frame_count = 0;
 
    if (!o->cur->u.file) return EINA_FALSE;
@@ -567,7 +567,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_set(Eo *eo_obj, void *_pd EI
 int
 _evas_image_animated_frame_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!o->cur->u.file) return EINA_FALSE;
    if (!evas_object_image_animated_get(eo_obj)) return EINA_FALSE;
@@ -583,7 +583,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_get(Eo *eo_obj, void *_pd EI
 EOLIAN static void
 _efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int *w, int *h)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (w) *w = o->cur->image.w;
    if (h) *h = o->cur->image.h;
@@ -742,8 +742,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_data_set(Eo *eo_obj, void *_pd EINA_UNUS
                                                  void *pixels, int w, int h, int stride,
                                                  Efl_Gfx_Colorspace cspace)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return _image_pixels_set(obj, o, pixels, w, h, stride, cspace, EINA_FALSE);
 }
@@ -753,8 +753,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS
                                                  const void *pixels, int w, int h, int stride,
                                                  Efl_Gfx_Colorspace cspace)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return _image_pixels_set(obj, o, (void *) pixels, w, h, stride, cspace, EINA_TRUE);
 }
@@ -762,8 +762,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS
 EOLIAN static void *
 _efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!o->buffer_data_set || !o->engine_data || !ENFN->image_data_direct)
      return NULL;
@@ -778,8 +778,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
                                             int x, int y, int w, int h,
                                             Efl_Gfx_Colorspace cspace, int *stride)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int len = 0, s = 0, width = 0, height = 0;
    void *data = NULL;
 
@@ -820,8 +820,8 @@ EOLIAN static Eina_Bool
 _efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED,
                                               void *data, int length)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_data_unmap || !o->engine_data)
      return EINA_FALSE;
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c
index d0b6a2e217..47f5a0158e 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.c
+++ b/src/lib/evas/canvas/efl_canvas_proxy.c
@@ -6,8 +6,8 @@
 Eina_Bool
 _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    if (obj->delete_me && eo_src)
      {
         WRN("Setting deleted object %p as image source %p", eo_src, eo_obj);
@@ -15,7 +15,7 @@ _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
      }
    if (eo_src)
      {
-        Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
         if (src->delete_me)
           {
              WRN("Setting object %p to deleted image source %p", eo_src, eo_obj);
@@ -65,7 +65,7 @@ _efl_canvas_proxy_source_set(Eo *eo_obj, void *_pd EINA_UNUSED, Evas_Object *eo_
 Evas_Object *
 _evas_image_proxy_source_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->source;
 }
 
@@ -79,8 +79,8 @@ void
 _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
 {
    Evas_Object_Protected_Data *src_obj;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    source_clip = !!source_clip;
    if (o->proxy_src_clip == source_clip) return;
@@ -89,7 +89,7 @@ _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
 
    if (!o->cur->source) return;
 
-   src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
    evas_object_change(o->cur->source, src_obj);
 }
 
@@ -102,7 +102,7 @@ _efl_canvas_proxy_source_clip_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool s
 Eina_Bool
 _evas_image_proxy_source_clip_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->proxy_src_clip;
 }
 
@@ -115,8 +115,8 @@ _efl_canvas_proxy_source_clip_get(Eo *eo_obj, void *_pd EINA_UNUSED)
 void
 _evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    source_events = !!source_events;
    if (obj->proxy->src_events == source_events) return;
@@ -139,7 +139,7 @@ _efl_canvas_proxy_source_events_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool
 Eina_Bool
 _evas_image_proxy_source_events_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    return obj->proxy->src_events;
 }
 
@@ -152,7 +152,7 @@ _efl_canvas_proxy_source_events_get(Eo *eo_obj, void *_pd EINA_UNUSED)
 Evas_Object *
 _evas_object_image_source_get(Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->source;
 }
 
@@ -163,7 +163,7 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox
 
    if (!o->cur->source) return;
 
-   cur_source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   cur_source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
 
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
      {
@@ -215,9 +215,9 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox
 void
 _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
 {
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    _evas_image_file_set(eo_proxy, NULL, NULL);
 
@@ -244,14 +244,14 @@ _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
 static inline void *
 _proxy_image_get(Evas_Image_Data *o)
 {
-   Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
    Evas_Image_Data *source_img = NULL;
 
    if (!source)
      return NULL;
 
-   if (eo_isa(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
-     source_img = eo_data_scope_get(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   if (efl_isa(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+     source_img = efl_data_scope_get(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (source_img)
      return source_img->engine_data;
@@ -266,8 +266,8 @@ _efl_canvas_proxy_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
                                             int x, int y, int w, int h,
                                             Efl_Gfx_Colorspace cspace, int *stride)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int len = 0, s = 0, width = 0, height = 0;
    void *image, *data = NULL;
 
@@ -315,8 +315,8 @@ EOLIAN static Eina_Bool
 _efl_canvas_proxy_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED,
                                               void *data, int length)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_data_unmap || !o->engine_data)
      return EINA_FALSE;
@@ -334,7 +334,7 @@ void
 _evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
                         int x, int y, Eina_Bool do_async)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Object_Protected_Data *proxy;
    Evas_Func *func;
 
@@ -344,7 +344,7 @@ _evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void
         o->proxyerror = 1;
      }
 
-   proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
+   proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
    func = proxy->layer->evas->engine.func;
    func->context_color_set(output, context, 0, 0, 0, 255);
    func->context_multiplier_unset(output, context);
diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.c b/src/lib/evas/canvas/efl_canvas_scene3d.c
index 367e50277c..ef4e491c7f 100644
--- a/src/lib/evas/canvas/efl_canvas_scene3d.c
+++ b/src/lib/evas/canvas/efl_canvas_scene3d.c
@@ -6,8 +6,8 @@
 EOLIAN static void
 _efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_Scene *scene)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Image_Load_Opts lo;
 
    if (o->cur->scene == scene) return;
@@ -24,7 +24,7 @@ _efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_
 EOLIAN static Evas_Canvas3D_Scene *
 _efl_canvas_scene3d_scene3d_get(Eo *eo_obj, void *pd EINA_UNUSED)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->scene;
 }
 
@@ -38,7 +38,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
    Evas_Canvas3D_Scene_Public_Data scene_data;
    Evas_Canvas3D_Scene_Data *pd_scene = NULL;
 
-   pd_scene = eo_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS);
+   pd_scene = efl_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS);
 
    if ((pd_scene->w == 0) || (pd_scene->h == 0)) return;
    if (!pd_scene->camera_node)
@@ -47,7 +47,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
         return;
      }
 
-   e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (pd_scene->surface)
      {
@@ -141,9 +141,9 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
 void
 _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
-   Evas_Canvas3D_Scene_Data *pd_scene = eo_data_scope_get(scene,
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Canvas3D_Scene_Data *pd_scene = efl_data_scope_get(scene,
                                                     EVAS_CANVAS3D_SCENE_CLASS);
    EINA_COW_WRITE_BEGIN(evas_object_3d_cow, obj->data_3d, Evas_Object_3D_Data,
                         data)
@@ -151,7 +151,7 @@ _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene)
         data->surface = NULL;
         data->w = 0;
         data->h = 0;
-        eo_ref(scene);
+        efl_ref(scene);
      }
    EINA_COW_WRITE_END(evas_object_3d_cow, obj->data_3d, data);
 
@@ -173,12 +173,12 @@ _evas_image_3d_unset(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data
    if (!o->cur->scene) return;
 
    Evas_Canvas3D_Scene_Data *pd_scene =
-      eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
+      efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
 
    EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
      {
         pd_scene->images = eina_list_remove(pd_scene->images, eo_obj);
-        eo_unref(state_write->scene);
+        efl_unref(state_write->scene);
         state_write->scene = NULL;
      }
    EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
@@ -215,7 +215,7 @@ _efl_canvas_scene3d_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
                                             int x, int y, int w, int h,
                                             Efl_Gfx_Colorspace cspace, int *stride EINA_UNUSED)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Public_Data *e;
    Evas_Canvas3D_Object_Data *pd_parent;
    Evas_Canvas3D_Scene_Data *pd_scene;
@@ -238,9 +238,9 @@ _efl_canvas_scene3d_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
         return NULL;
      }
 
-   pd_parent = eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_OBJECT_CLASS);
-   e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
-   pd_scene = eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
+   pd_parent = efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_OBJECT_CLASS);
+   e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
+   pd_scene = efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
 
    if (e->engine.func->drawable_size_get)
       {
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c
index 9aae7999f6..9f77ce6c92 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.c
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.c
@@ -8,12 +8,12 @@ _efl_canvas_snapshot_efl_object_constructor(Eo *eo_obj, void *pd EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
    if (!eo_obj) return NULL;
 
    efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE);
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    EINA_COW_STATE_WRITE_BEGIN(obj, sw, cur)
      sw->snapshot = EINA_TRUE;
    EINA_COW_STATE_WRITE_END(obj, sw, cur);
diff --git a/src/lib/evas/canvas/efl_canvas_surface.c b/src/lib/evas/canvas/efl_canvas_surface.c
index 13c86f0c6a..9d3437b1a0 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.c
+++ b/src/lib/evas/canvas/efl_canvas_surface.c
@@ -5,7 +5,7 @@
 EOLIAN static Eo *
 _efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd)
 {
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
    pd->surf.version = EVAS_NATIVE_SURFACE_VERSION;
    return eo;
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
index 116aad03ab..6ef23d6761 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
@@ -12,8 +12,8 @@ _efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Da
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
    if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_TBM))
@@ -22,7 +22,7 @@ _efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Da
         return NULL;
      }
 
-   pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
+   pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
    pd->base->surf.type = EVAS_NATIVE_SURFACE_TBM;
    return eo;
 }
@@ -32,10 +32,10 @@ _efl_canvas_surface_tbm_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Dat
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM);
-   eo_data_unref(eo, pd->base);
+   efl_data_unref(eo, pd->base);
    efl_destructor(eo);
 }
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
index f15e969d1b..040a874b1c 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
@@ -12,8 +12,8 @@ _efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wa
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
    if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_WL))
@@ -22,7 +22,7 @@ _efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wa
         return NULL;
      }
 
-   pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
+   pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
    pd->base->surf.type = EVAS_NATIVE_SURFACE_WL;
    return eo;
 }
@@ -32,10 +32,10 @@ _efl_canvas_surface_wayland_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Way
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL);
-   eo_data_unref(eo, pd->base);
+   efl_data_unref(eo, pd->base);
    efl_destructor(eo);
 }
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c
index c463a157d8..36a5f5f163 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c
@@ -13,8 +13,8 @@ _efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Da
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
    if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_X11))
@@ -23,7 +23,7 @@ _efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Da
         return NULL;
      }
 
-   pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
+   pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
    pd->base->surf.version = EVAS_NATIVE_SURFACE_VERSION;
    pd->base->surf.type = EVAS_NATIVE_SURFACE_X11;
    return eo;
@@ -34,10 +34,10 @@ _efl_canvas_surface_x11_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_X11_Dat
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11);
-   eo_data_unref(eo, pd->base);
+   efl_data_unref(eo, pd->base);
    efl_destructor(eo);
 }
 
diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c
index 95a4ae7fc0..524f75c111 100644
--- a/src/lib/evas/canvas/efl_event_hold.c
+++ b/src/lib/evas/canvas/efl_event_hold.c
@@ -63,7 +63,7 @@ _efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_H
 EOLIAN static Eo *
 _efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    pd->eo = obj;
    return obj;
 }
@@ -73,8 +73,8 @@ _efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNU
                                        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);
-   if (priv) *priv = eo_data_scope_get(evt, MY_CLASS);
+   Efl_Event *evt = efl_add(MY_CLASS, owner);
+   if (priv) *priv = efl_data_scope_get(evt, MY_CLASS);
    return evt;
 }
 
@@ -89,8 +89,8 @@ 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, efl_parent_get(obj));
-   ev = eo_data_scope_get(evt, MY_CLASS);
+   Efl_Event *evt = efl_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
+   ev = efl_data_scope_get(evt, MY_CLASS);
    if (ev)
      {
         memcpy(ev, pd, sizeof(*ev));
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c
index 7729432167..81dcd3f118 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_event_key.c
@@ -20,7 +20,7 @@ _del_hook(Eo *evt)
      {
         if (efl_parent_get(evt))
           {
-             eo_ref(evt);
+             efl_ref(evt);
              efl_parent_set(evt, NULL);
           }
         s_cached_event = evt;
@@ -48,11 +48,11 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
      }
    else
      {
-        evt = eo_add(EFL_EVENT_KEY_CLASS, owner);
+        evt = efl_add(EFL_EVENT_KEY_CLASS, owner);
         efl_del_intercept_set(evt, _del_hook);
      }
 
-   ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+   ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
    ev->fake = EINA_FALSE;
    if (priv) *priv = ev;
 
@@ -71,7 +71,7 @@ _efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED)
 EOLIAN static Efl_Object *
 _efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_event_reset(obj);
    return obj;
 }
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 8bd45c42a8..8db2735352 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -31,7 +31,7 @@ _del_hook(Eo *evt)
      {
         if (efl_parent_get(evt))
           {
-             eo_ref(evt);
+             efl_ref(evt);
              efl_parent_set(evt, NULL);
           }
         s_cached_event = evt;
@@ -59,11 +59,11 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
      }
    else
      {
-        evt = eo_add(EFL_EVENT_POINTER_CLASS, owner);
+        evt = efl_add(EFL_EVENT_POINTER_CLASS, owner);
         efl_del_intercept_set(evt, _del_hook);
      }
 
-   ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
    ev->fake = EINA_FALSE;
    if (priv) *priv = ev;
 
@@ -82,7 +82,7 @@ _efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
 EOLIAN static Efl_Object *
 _efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
 {
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
    efl_event_reset(obj);
    return obj;
 }
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 82b810518d..36f4f3837f 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -125,7 +125,7 @@ _evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e)
 void
 _evas_post_event_callback_free(Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Post_Callback *pc;
 
    EINA_LIST_FREE(e->post_events, pc)
@@ -139,7 +139,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
 {
    _eo_evas_object_cb_info *info;
    Eina_Inlist *itr;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return;
    if (!obj->callbacks) return;
@@ -164,7 +164,7 @@ evas_event_callback_all_del(Evas *eo_e)
 {
    _eo_evas_object_cb_info *info;
    Eina_Inlist *itr;
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (!e) return;
    if (!e->callbacks) return;
@@ -316,7 +316,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
         if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
               (type <= EVAS_CALLBACK_KEY_UP))
           {
-             Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *smart_parent = efl_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, efl_event_desc, efl_event_info);
           }
      }
@@ -333,7 +333,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
 EAPI void
 evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -362,7 +362,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return NULL;
    if (!func) return NULL;
@@ -393,7 +393,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return NULL;
    if (!func) return NULL;
@@ -426,7 +426,7 @@ evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func,
 EAPI void
 evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
@@ -448,7 +448,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
 EAPI void *
 evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _eo_evas_cb_info *info;
 
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
@@ -484,7 +484,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (!e) return NULL;
    if (!func) return NULL;
@@ -516,7 +516,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e) return;
    EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
    pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback);
@@ -539,7 +539,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e) return;
    EINA_LIST_FOREACH(e->post_events, l, pc)
      {
@@ -561,7 +561,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func,
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e) return;
    EINA_LIST_FOREACH(e->post_events, l, pc)
      {
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index ab222e634f..109838e122 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -28,7 +28,7 @@ _evas_canvas3d_camera_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED,
 void
 evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node)
 {
-   Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(camera, MY_CLASS);
+   Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(camera, MY_CLASS);
    int count = 0;
 
    if (!pd->nodes)
@@ -48,7 +48,7 @@ evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *
 void
 evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node)
 {
-   Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(camera, MY_CLASS);
+   Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(camera, MY_CLASS);
    int count = 0;
 
    if (!pd->nodes)
@@ -66,7 +66,7 @@ EOLIAN static Eo *
 _evas_canvas3d_camera_efl_object_constructor(Eo *obj,
                                        Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA);
 
    return obj;
@@ -85,14 +85,14 @@ _evas_canvas3d_camera_efl_object_destructor(Eo *obj,
         it = eina_hash_iterator_key_new(pd->nodes);
         while (eina_iterator_next(it, &data))
           {
-             node = eo_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
+             node = efl_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
              node->data.camera.camera = NULL;
           }
 
         eina_hash_free(pd->nodes);
      }
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Canvas3D_Camera *
@@ -101,7 +101,7 @@ evas_canvas3d_camera_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
@@ -161,8 +161,8 @@ _evas_canvas3d_camera_node_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Camera
 {
    Eina_Matrix4 matrix_vp;
    Eina_Quaternion planes[6];
-   Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
-   Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_Vector3 central_point;
 
    if (!node || pd_node->type != EVAS_CANVAS3D_NODE_TYPE_MESH)
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index 77a7d49d93..f71c54df7e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -29,7 +29,7 @@ void
 evas_canvas3d_light_node_add(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(light, MY_CLASS);
+   Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(light, MY_CLASS);
    if (pd->nodes == NULL)
      {
         pd->nodes = eina_hash_pointer_new(NULL);
@@ -50,7 +50,7 @@ void
 evas_canvas3d_light_node_del(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(light, MY_CLASS);
+   Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(light, MY_CLASS);
    if (pd->nodes == NULL)
      {
         ERR("No node to delete.");
@@ -72,14 +72,14 @@ evas_canvas3d_light_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -108,14 +108,14 @@ _evas_canvas3d_light_efl_object_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd
         it = eina_hash_iterator_key_new(pd->nodes);
         while (eina_iterator_next(it, &data))
           {
-             node = eo_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
+             node = efl_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
              node->data.light.light = NULL;
           }
 
         eina_hash_free(pd->nodes);
      }
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 150f5eb810..802fcde3cc 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -39,7 +39,7 @@ void
 evas_canvas3d_material_mesh_add(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh)
 {
    int count = 0;
-   Evas_Canvas3D_Material_Data *pd = eo_data_scope_get(material, MY_CLASS);
+   Evas_Canvas3D_Material_Data *pd = efl_data_scope_get(material, MY_CLASS);
 
    if (pd->meshes == NULL)
      {
@@ -61,7 +61,7 @@ void
 evas_canvas3d_material_mesh_del(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh)
 {
    int count = 0;
-   Evas_Canvas3D_Material_Data *pd = eo_data_scope_get(material, MY_CLASS);
+   Evas_Canvas3D_Material_Data *pd = efl_data_scope_get(material, MY_CLASS);
 
    if (pd->meshes == NULL)
      {
@@ -84,14 +84,14 @@ evas_canvas3d_material_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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);
@@ -118,7 +118,7 @@ _evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Da
         it = eina_hash_iterator_key_new(pd->meshes);
         while (eina_iterator_next(it, &data))
           {
-             mesh = eo_data_scope_get(data, EVAS_CANVAS3D_MESH_CLASS);
+             mesh = efl_data_scope_get(data, EVAS_CANVAS3D_MESH_CLASS);
              if (mesh->frames)
                {
                   EINA_LIST_FOREACH(mesh->frames, l, f)
@@ -136,7 +136,7 @@ _evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Da
              evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
           }
      }
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -187,12 +187,12 @@ _evas_canvas3d_material_texture_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Ev
         if (pd->attribs[attrib].texture)
           {
              evas_canvas3d_texture_material_del(pd->attribs[attrib].texture, obj);
-             eo_unref(pd->attribs[attrib].texture);
+             efl_unref(pd->attribs[attrib].texture);
           }
 
         pd->attribs[attrib].texture = texture;
         evas_canvas3d_texture_material_add(texture, obj);
-        eo_ref(texture);
+        efl_ref(texture);
      }
 
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL);
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index e59497f9af..d9e5b68f6c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -213,7 +213,7 @@ void
 evas_canvas3d_mesh_node_add(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
    if (pd->nodes == NULL)
      {
         pd->nodes = eina_hash_pointer_new(NULL);
@@ -234,7 +234,7 @@ void
 evas_canvas3d_mesh_node_del(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
    if (pd->nodes == NULL)
      {
         ERR("No node to delete.");
@@ -256,14 +256,14 @@ evas_canvas3d_mesh_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
    _mesh_init(pd);
 
@@ -274,7 +274,7 @@ EOLIAN static void
 _evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 {
    _mesh_fini(pd);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -371,11 +371,11 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int
    if (f->material)
      {
         evas_canvas3d_material_mesh_del(f->material, obj);
-        eo_unref(f->material);
+        efl_unref(f->material);
      }
 
    f->material = material;
-   eo_ref(material);
+   efl_ref(material);
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL);
    evas_canvas3d_material_mesh_add(material, obj);
 }
@@ -920,7 +920,7 @@ _evas_canvas3d_mesh_from_primitive_set(Eo *obj,
 {
    if ((primitive == NULL) || (obj == NULL)) return;
 
-   Evas_Canvas3D_Primitive_Data *ppd = eo_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS);
+   Evas_Canvas3D_Primitive_Data *ppd = efl_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS);
 
    evas_common_set_model_from_primitive(obj, frame, ppd);
 }
@@ -968,7 +968,7 @@ _mesh_frame_find(Evas_Canvas3D_Mesh *mesh, int frame,
 {
    Eina_List *left, *right;
    Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1;
-   Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
    left = pdmesh->frames;
    right = eina_list_next(left);
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index c4f6eeedf7..4454571626 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -60,7 +60,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
    Eina_Bool ret = EINA_FALSE;
 
    target_node = (Evas_Canvas3D_Node *)event->info;
-   pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
+   pd_target = efl_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
    collision_list = (Eina_List *)data;
    eo_desc = efl_object_legacy_only_event_description_get("collision");
 
@@ -68,7 +68,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
      {
         EINA_LIST_FOREACH(collision_list, l, n)
           {
-             pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+             pd = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
              if (box_intersection_box(&pd_target->aabb, &pd->aabb))
                ret = efl_event_callback_call(target_node, eo_desc, n);
           }
@@ -184,7 +184,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No
      EINA_LIST_FOREACH(pd->members, l, n)
        {
           /*Skip change orientation if node is billboard*/
-          Evas_Canvas3D_Node_Data *pdm = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+          Evas_Canvas3D_Node_Data *pdm = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
           if (pdm->billboard_target)
             continue;
           evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj);
@@ -224,7 +224,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva
 static Eina_Bool
 _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    Eina_Bool transform_dirty = EINA_FALSE, parent_dirty = EINA_FALSE;
 
    transform_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION);
@@ -238,7 +238,7 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
      {
         if (pd->parent)
           {
-             Evas_Canvas3D_Node_Data *pdparent = eo_data_scope_get(pd->parent, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdparent = efl_data_scope_get(pd->parent, MY_CLASS);
              const Eina_Vector3 *scale_parent = &pdparent->scale_world;
              const Eina_Quaternion *orientation_parent = &pdparent->orientation_world;
 
@@ -315,10 +315,10 @@ _node_billboard_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
    Eina_Vector3   target;
    Eina_Vector3   up;
-   Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, MY_CLASS);
    if (pd_node->billboard_target)
      {
-        Evas_Canvas3D_Node_Data *pd_target = eo_data_scope_get(pd_node->billboard_target,
+        Evas_Canvas3D_Node_Data *pd_target = efl_data_scope_get(pd_node->billboard_target,
                                                        MY_CLASS);
         eina_vector3_set(&target, pd_target->position.x, pd_target->position.y,
                       pd_target->position.z);
@@ -353,7 +353,7 @@ _node_billboard_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 static Eina_Bool
 _node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    if (pd->type == EVAS_CANVAS3D_NODE_TYPE_CAMERA)
      {
         if (pd->data.camera.camera)
@@ -446,7 +446,7 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
    int i;
    int count;
    Eina_Vector3 *vertices = NULL;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_Bool transform_orientation_dirty;
    Eina_Bool transform_position_dirty;
    Eina_Bool transform_scale_dirty;
@@ -497,7 +497,7 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
 Eina_Bool
 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);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_List *current;
    Evas_Canvas3D_Node *datanode;
    const Efl_Event_Description *eo_desc = NULL;
@@ -507,7 +507,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
    _update_node_shapes(node);
    EINA_LIST_FOREACH(pd->members, current, datanode)
      {
-        Evas_Canvas3D_Node_Data *datapd = eo_data_scope_get(datanode, EVAS_CANVAS3D_NODE_CLASS);
+        Evas_Canvas3D_Node_Data *datapd = efl_data_scope_get(datanode, EVAS_CANVAS3D_NODE_CLASS);
         evas_box3_union(&pd->obb, &pd->obb, &datapd->obb);
         evas_box3_union(&pd->aabb, &pd->aabb, &datapd->aabb);
      }
@@ -523,7 +523,7 @@ static Eina_Bool
 _node_update_done(Evas_Canvas3D_Node *obj, void *data EINA_UNUSED)
 {
    //@FIXME
-   Evas_Canvas3D_Object_Data *pdobject = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
+   Evas_Canvas3D_Object_Data *pdobject = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
    memset(&pdobject->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
    return EINA_TRUE;
 }
@@ -556,7 +556,7 @@ _evas_canvas3d_node_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D_No
 static void
 _node_free(Evas_Canvas3D_Object *obj)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(obj, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(obj, MY_CLASS);
 
    if (pd->members)
      {
@@ -565,7 +565,7 @@ _node_free(Evas_Canvas3D_Object *obj)
 
         EINA_LIST_FOREACH(pd->members, l, n)
           {
-             eo_unref(n);
+             efl_unref(n);
           }
 
         eina_list_free(pd->members);
@@ -583,7 +583,7 @@ _node_free(Evas_Canvas3D_Object *obj)
 
         EINA_LIST_FOREACH(pd->data.mesh.meshes, l, m)
           {
-             eo_unref(m);
+             efl_unref(m);
           }
 
         eina_list_free(pd->data.mesh.meshes);
@@ -603,7 +603,7 @@ void
 evas_canvas3d_node_scene_root_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_root == NULL)
      {
         pd->scenes_root = eina_hash_pointer_new(NULL);
@@ -624,7 +624,7 @@ void
 evas_canvas3d_node_scene_root_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_root == NULL)
      {
         ERR("No scene to delete.");
@@ -649,7 +649,7 @@ void
 evas_canvas3d_node_scene_camera_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_camera == NULL)
      {
         pd->scenes_camera = eina_hash_pointer_new(NULL);
@@ -670,7 +670,7 @@ void
 evas_canvas3d_node_scene_camera_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_camera == NULL)
      {
         ERR("No scene to delete.");
@@ -707,7 +707,7 @@ evas_canvas3d_node_traverse(Evas_Canvas3D_Node *from, Evas_Canvas3D_Node *to, Ev
 
              if (node == from)
                break;
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              node = pdnode->parent;
 
              if (node == NULL)
@@ -723,7 +723,7 @@ evas_canvas3d_node_traverse(Evas_Canvas3D_Node *from, Evas_Canvas3D_Node *to, Ev
 
              if (node == to)
                break;
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              node = pdnode->parent;
 
              if (node == NULL)
@@ -771,7 +771,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
           {
              /* Dequeue a node. */
              node = eina_list_data_get(nodes);
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
 
              nodes = eina_list_remove_list(nodes, nodes);
 
@@ -795,7 +795,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
           {
              /* Pop a node from the stack. */
              node = eina_list_data_get(nodes);
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              nodes = eina_list_remove_list(nodes, nodes);
 
              /* Call node function on the node. */
@@ -825,7 +825,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
           {
              /* Peek a node from the stack. */
              node = eina_list_data_get(nodes);
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              if (eina_list_count(pdnode->members) == 0)
                {
                   /* The peeked node is a leaf node,
@@ -852,7 +852,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
                    * its childs into the stack. */
                    Evas_Canvas3D_Node_Data *pdlast;
                    if (last )
-                     pdlast= eo_data_scope_get(last, MY_CLASS);
+                     pdlast= efl_data_scope_get(last, MY_CLASS);
                   if (last && pdlast->parent == node)
                     {
                        /* Visit the node as it doesn't have any unvisited child node. */
@@ -893,7 +893,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
    Evas_Canvas3D_Mesh_Data *mesh_pd;
    Evas_Canvas3D_Mesh_Frame *f;
    Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    unsigned short int *index;
    int stride, tex_stride, normal_stride;
 
@@ -903,14 +903,14 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
         /*In case LOD calculate distance to the camera node*/
         if (pd->lod)
           {
-              Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(scene_data->camera_node, MY_CLASS);
+              Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(scene_data->camera_node, MY_CLASS);
               scene_data->lod_distance = eina_vector3_distance_get(&pd_camera->position, &pd->position_world);
           }
         /* calculation of tangent space for all meshes */
         list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node);
         EINA_LIST_FOREACH(list_meshes, l, mesh)
           {
-             mesh_pd = eo_data_scope_get(mesh, MY_CLASS);
+             mesh_pd = efl_data_scope_get(mesh, MY_CLASS);
              f = evas_canvas3d_mesh_frame_find(mesh_pd, 0);
              if (!f)
                {
@@ -964,8 +964,8 @@ Eina_Bool
 evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
 {
    Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
-   Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(scene_data->camera_node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(scene_data->camera_node, MY_CLASS);
    Evas_Canvas3D_Camera *camera = (Evas_Canvas3D_Camera*)pd_camera->data.camera.camera;
 
    Eina_List *list_meshes, *l;
@@ -1012,7 +1012,7 @@ Eina_Bool
 evas_canvas3d_node_light_collect(Evas_Canvas3D_Node *node, void *data)
 {
    Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->type == EVAS_CANVAS3D_NODE_TYPE_LIGHT)
      scene_data->light_nodes = eina_list_append(scene_data->light_nodes, node);
 
@@ -1025,7 +1025,7 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(eo_self, type));
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_self, type));
    return eo_obj;
 }
 
@@ -1069,7 +1069,7 @@ _evas_canvas3d_node_efl_object_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd E
 {
    _node_free(obj);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Evas_Canvas3D_Node_Type
@@ -1086,14 +1086,14 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
         ERR("Failed to add a member node (adding to itself).");
         return;
      }
-   Evas_Canvas3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pdmember = efl_data_scope_get(member, MY_CLASS);
    if (!pdmember || pdmember->parent == obj)
      return;
 
    if (pdmember->parent)
      {
         /* Detaching from previous parent. */
-         Evas_Canvas3D_Node_Data *pdmemberparent = eo_data_scope_get(pdmember->parent, MY_CLASS);
+         Evas_Canvas3D_Node_Data *pdmemberparent = efl_data_scope_get(pdmember->parent, MY_CLASS);
         pdmemberparent->members = eina_list_remove(pdmemberparent->members, member);
 
         /* Mark changed. */
@@ -1102,7 +1102,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
    else
      {
         /* Should get a new reference. */
-        eo_ref(member);
+        efl_ref(member);
      }
 
    /* Add the member node. */
@@ -1119,7 +1119,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
 EOLIAN static void
 _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Node *member)
 {
-   Evas_Canvas3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pdmember = efl_data_scope_get(member, MY_CLASS);
    if (!pdmember || pdmember->parent != obj)
      {
         ERR("Failed to delete a member node (not a member of the given node)");
@@ -1137,7 +1137,7 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
    evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL);
 
    /* Decrease reference count. */
-   eo_unref(member);
+   efl_unref(member);
 }
 
 EOLIAN static Evas_Canvas3D_Node *
@@ -1456,11 +1456,11 @@ _evas_canvas3d_node_camera_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
      {
         /* Detach previous camera object. */
         evas_canvas3d_camera_node_del(pd->data.camera.camera, obj);
-        eo_unref(pd->data.camera.camera);
+        efl_unref(pd->data.camera.camera);
      }
 
    pd->data.camera.camera = camera;
-   eo_ref(camera);
+   efl_ref(camera);
 
    /* Register change notification on the camera for this node. */
    evas_canvas3d_camera_node_add(camera, obj);
@@ -1491,11 +1491,11 @@ _evas_canvas3d_node_light_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3
      {
         /* Detach previous light object. */
         evas_canvas3d_light_node_del(pd->data.light.light, obj);
-        eo_unref(pd->data.light.light);
+        efl_unref(pd->data.light.light);
      }
 
    pd->data.light.light = light;
-   eo_ref(light);
+   efl_ref(light);
 
    /* Register change notification on the light for this node. */
    evas_canvas3d_light_node_add(light, obj);
@@ -1542,7 +1542,7 @@ _evas_canvas3d_node_mesh_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
      }
 
    pd->data.mesh.meshes = eina_list_append(pd->data.mesh.meshes, mesh);
-   eo_ref(mesh);
+   efl_ref(mesh);
 
    /* Register change notification. */
    evas_canvas3d_mesh_node_add(mesh, obj);
@@ -1569,7 +1569,7 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
 
    pd->data.mesh.meshes = eina_list_remove(pd->data.mesh.meshes, mesh);
    evas_canvas3d_mesh_node_del(mesh, obj);
-   eo_unref(mesh);
+   efl_unref(mesh);
 
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL);
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL);
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 8f9911517b..9dde9f899c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -7,7 +7,7 @@ EOLIAN static Eo *
 _evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
 {
    Eo *e = NULL;
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    e = efl_parent_get(obj);
    pd->evas = e;
    pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID;
@@ -21,7 +21,7 @@ EOLIAN static Evas *
 {
    if (klass == EVAS_CANVAS_CLASS)
      return pd->evas;
-   return efl_provider_find(eo_super(obj, MY_CLASS), klass);
+   return efl_provider_find(efl_super(obj, MY_CLASS), klass);
 }
 
 EOLIAN static void
@@ -76,7 +76,7 @@ _evas_canvas3d_object_efl_object_event_callback_priority_add(Eo *obj,
 {
    Eina_Bool r = EINA_FALSE;
 
-   r = efl_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data);
+   r = efl_event_callback_priority_add(efl_super(obj, MY_CLASS), desc, priority, func, user_data);
    evas_canvas3d_object_callback_register(obj, desc->name, user_data);
 
    return r;
@@ -89,7 +89,7 @@ _evas_canvas3d_object_efl_object_event_callback_del(Eo *obj, Evas_Canvas3D_Objec
                                            const void *user_data)
 {
    Eina_Bool r = EINA_FALSE;
-   r = efl_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data);
+   r = efl_event_callback_del(efl_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_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c
index 07e63a802d..bcfa90eda4 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.c
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c
@@ -20,14 +20,14 @@ evas_canvas3d_primitive_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE);
    _primitive_init(pd);
 
@@ -37,7 +37,7 @@ _evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive
 EOLIAN static void
 _evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 4e5cc39b29..f172188e5e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -37,7 +37,7 @@ _evas_canvas3d_scene_evas_canvas3d_object_change_notify(Eo *eo_obj EINA_UNUSED,
 
    EINA_LIST_FOREACH(pd->images, l, eo)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
         evas_object_change(eo, obj);
      }
 }
@@ -64,14 +64,14 @@ evas_canvas3d_scene_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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;
@@ -92,14 +92,14 @@ _evas_canvas3d_scene_root_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_C
    if (pd->root_node)
      {
         evas_canvas3d_node_scene_root_del(pd->root_node, obj);
-        eo_unref(pd->root_node);
+        efl_unref(pd->root_node);
      }
 
    pd->root_node = node;
 
    if (node)
      {
-        eo_ref(node);
+        efl_ref(node);
         evas_canvas3d_node_scene_root_add(node, obj);
      }
 
@@ -301,7 +301,7 @@ _pick_data_mesh_add(Evas_Canvas3D_Pick_Data *data, const Evas_Ray3 *ray,
 
    evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
                                               &tex0, &tex1, &tex_weight);
-   Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
    if (pdmesh->indices)
      {
         unsigned int i0, i1, i2;
@@ -561,7 +561,7 @@ _node_pick(Evas_Canvas3D_Node *node, void *data)
    Evas_Ray3            ray;
    Evas_Canvas3D_Pick_Data   *pick = (Evas_Canvas3D_Pick_Data *)data;
    Eina_Matrix4            mvp;
-   Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
 
    evas_canvas3d_node_tree_traverse(node, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE,
                                  node_aabb_update, NULL);
@@ -630,8 +630,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
    Evas_Canvas3D_Node *picked_node = 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);
+   pd_parent = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
+   e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
 
    _pick_data_init(&data, e, x, y);
    px = round(x * pd->w / e->viewport.w);
@@ -704,8 +704,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
      }
    /* Update the scene graph. */
    evas_canvas3d_object_update((Eo *) obj);
-   pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
-   pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
+   pd_camera_node = efl_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   pd_camera = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
    eina_matrix4_multiply(&data.matrix_vp,
                       &pd_camera->projection,
                       &pd_camera_node->data.camera.matrix_world_to_eye);
@@ -740,15 +740,15 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea
    Evas_Canvas3D_Object_Data *pd_parent;
    Evas_Public_Data *e;
 
-   pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
-   e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
+   pd_parent = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
+   e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
 
    _pick_data_init(&data, e, x, y);
 
    /* Update the scene graph. */
    evas_canvas3d_object_update((Eo *) obj);
-   pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
-   pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
+   pd_camera_node = efl_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   pd_camera = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
    eina_matrix4_multiply(&data.matrix_vp,
                       &pd_camera->projection,
                       &pd_camera_node->data.camera.matrix_world_to_eye);
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index d27a803316..0e152e797b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -6,7 +6,7 @@
 static inline void
 _texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Object_Protected_Data *src)
 {
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src)
      {
         proxy_src->proxy_textures = eina_list_append(proxy_src->proxy_textures, texture);
@@ -20,7 +20,7 @@ _texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Obj
 static inline void
 _texture_proxy_unset(Evas_Canvas3D_Texture_Data *texture)
 {
-   Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(texture->source, EFL_CANVAS_OBJECT_CLASS);
 
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src);
      {
@@ -55,8 +55,8 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
    /* Code taken from _proxy_subrender() in file evas_object_image.c */
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(obj, MY_CLASS);
    Evas_Object_Protected_Data *source;
    void *ctx;
    int w, h;
@@ -67,9 +67,9 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
 
    // TODO: replace this function by evas_render_proxy_subrender (as appropriate)
 
-   source = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+   source = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
 
-   is_image = eo_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   is_image = efl_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write)
      {
@@ -166,11 +166,11 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
    Evas_Canvas3D_Material_Data *material = NULL;
 
    evas = evas_object_evas_get(obj);
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(obj, MY_CLASS);
 
    if (pd->engine_data)
      {
-        Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+        Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
         if (e->engine.func->texture_free)
           e->engine.func->texture_free(e->engine.data.output, pd->engine_data);
         pd->engine_data = NULL;
@@ -181,7 +181,7 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
         it = eina_hash_iterator_key_new(pd->materials);
         EINA_ITERATOR_FOREACH(it, data)
           {
-             material = eo_data_scope_get(data, EVAS_CANVAS3D_MATERIAL_CLASS);
+             material = efl_data_scope_get(data, EVAS_CANVAS3D_MATERIAL_CLASS);
              if (!material) continue;
              for (i = 0; i < EVAS_CANVAS3D_MATERIAL_ATTRIB_COUNT; i++)
                {
@@ -225,8 +225,8 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D
      {
         Eo *evas = NULL;
         evas = evas_object_evas_get(obj);
-        Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
-        Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
+        Evas_Object_Protected_Data *src = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
 
         if (pd->engine_data == NULL)
           {
@@ -270,7 +270,7 @@ void
 evas_canvas3d_texture_material_add(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material)
 {
    int count = 0;
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
    if (pd->materials == NULL)
      {
         pd->materials = eina_hash_pointer_new(NULL);
@@ -292,7 +292,7 @@ void
 evas_canvas3d_texture_material_del(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material)
 {
    int count = 0;
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
    if (pd->materials == NULL)
      {
         ERR("No material to delete.");
@@ -313,7 +313,7 @@ evas_canvas3d_texture_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
@@ -321,7 +321,7 @@ evas_canvas3d_texture_add(Evas *e)
 EOLIAN static Eo *
 _evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    pd->atlas_enable = EINA_TRUE;
 
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE);
@@ -333,7 +333,7 @@ EOLIAN static void
 _evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd  EINA_UNUSED)
 {
    _texture_fini(obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -344,7 +344,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd,
    Eo *evas = NULL;
    void *image = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (!pd->engine_data && e->engine.func->texture_new)
      pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
@@ -379,7 +379,7 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c
    void *image;
 
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (!pd->engine_data && e->engine.func->texture_new)
      pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
@@ -407,7 +407,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    Evas_Object_Protected_Data *src;
 
    if (source == pd->source)
@@ -424,7 +424,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
         return;
      }
 
-   src = eo_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS);
+   src = efl_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS);
 
    if (src->delete_me)
      {
@@ -452,7 +452,7 @@ _evas_canvas3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
    if (pd->source == NULL)
      return;
 
-   src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
 
    if (src_obj->proxy->src_invisible == !visible)
      return;
@@ -474,7 +474,7 @@ _evas_canvas3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
    if (pd->source == NULL)
      return EINA_FALSE;
 
-   src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
    return !src_obj->proxy->src_invisible;
 }
 
@@ -484,7 +484,7 @@ _evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D
    Evas_Colorspace format = -1;
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (e->engine.func->image_colorspace_get &&
        e->engine.func->texture_image_get)
@@ -503,7 +503,7 @@ _evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, i
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_size_get)
      {
         e->engine.func->texture_size_get(e->engine.data.output,
@@ -516,7 +516,7 @@ _evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Ca
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_wrap_set)
      {
         e->engine.func->texture_wrap_set(e->engine.data.output,
@@ -530,7 +530,7 @@ _evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Ca
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_wrap_set)
      {
         e->engine.func->texture_wrap_get(e->engine.data.output,
@@ -543,7 +543,7 @@ _evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_filter_set)
      {
         e->engine.func->texture_filter_set(e->engine.data.output,
@@ -557,7 +557,7 @@ _evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Textu
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_filter_get)
      {
         e->engine.func->texture_filter_get(e->engine.data.output,
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index dd26c2887b..cb79f32b66 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -178,7 +178,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
         if (obj->smart.parent)
           {
              Evas_Object_Protected_Data *smart_parent_obj =
-                eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+                efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
              evas_object_child_map_across_mark
                 (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0, NULL);
           }
@@ -233,7 +233,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
 
    evas_object_async_block(obj);
 
-   clip = eo_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS);
+   clip = efl_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS);
    if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
    if (eo_obj == eo_clip)
      {
@@ -483,7 +483,7 @@ static void
 _clipper_del_cb(void *data, const Eo_Event *event)
 {
    Evas_Object *eo_obj = data;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return;
 
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index a0eb26f0ae..0b9a438d78 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -42,12 +42,12 @@ evas_device_add(Evas *eo_e)
 
    SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS, NULL);
 
-   dev = eo_add(EFL_INPUT_DEVICE_CLASS, eo_e);
+   dev = efl_add(EFL_INPUT_DEVICE_CLASS, eo_e);
 
-   d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
    d->evas = eo_e;
 
-   e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    e->devices = eina_list_append(e->devices, dev);
    efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
 
@@ -61,7 +61,7 @@ evas_device_del(Evas_Device *dev)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   eo_unref(dev);
+   efl_unref(dev);
 }
 
 EAPI void
@@ -70,13 +70,13 @@ evas_device_push(Evas *eo_e, Evas_Device *dev)
    SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS);
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e->cur_device)
      {
         e->cur_device = eina_array_new(4);
         if (!e->cur_device) return;
      }
-   eo_ref(dev);
+   efl_ref(dev);
    eina_array_push(e->cur_device, dev);
 }
 
@@ -87,9 +87,9 @@ evas_device_pop(Evas *eo_e)
 
    SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS);
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    dev = eina_array_pop(e->cur_device);
-   if (dev) eo_unref(dev);
+   if (dev) efl_unref(dev);
 }
 
 EAPI const Eina_List *
@@ -101,11 +101,11 @@ evas_device_list(Evas *eo_e, const Evas_Device *dev)
      {
         SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS, NULL);
 
-        Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
         return d->children;
      }
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    return e->devices;
 }
 
@@ -114,7 +114,7 @@ evas_device_name_set(Evas_Device *dev, const char *name)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_name_set(dev, name);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -133,7 +133,7 @@ evas_device_description_set(Evas_Device *dev, const char *desc)
 
    efl_input_device_description_set(dev, desc);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
 }
 
@@ -148,8 +148,8 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(d->evas, EVAS_CANVAS_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(d->evas, EVAS_CANVAS_CLASS);
    if (parent)
      {
         SAFETY_CHECK(parent, EFL_INPUT_DEVICE_CLASS);
@@ -159,7 +159,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
    if (d->parent == parent) return;
    if (d->parent)
      {
-        Efl_Input_Device_Data *p = eo_data_scope_get(d->parent, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *p = efl_data_scope_get(d->parent, EFL_INPUT_DEVICE_CLASS);
         p->children = eina_list_remove(p->children, dev);
      }
    else if (parent)
@@ -167,7 +167,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
    d->parent = parent;
    if (parent)
      {
-        Efl_Input_Device_Data *p = eo_data_scope_get(parent, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *p = efl_data_scope_get(parent, EFL_INPUT_DEVICE_CLASS);
         p->children = eina_list_append(p->children, dev);
      }
    else
@@ -187,7 +187,7 @@ evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_type_set(dev, clas);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -203,7 +203,7 @@ EAPI void
 evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_subtype_set(dev, clas);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -219,7 +219,7 @@ EAPI void
 evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_source_set(dev, src);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -236,11 +236,11 @@ _evas_device_cleanup(Evas *eo_e)
 {
    Evas_Device *dev;
    
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (e->cur_device)
      {
         while ((dev = eina_array_pop(e->cur_device)))
-          eo_unref(dev);
+          efl_unref(dev);
         eina_array_free(e->cur_device);
         e->cur_device = NULL;
      }
@@ -255,7 +255,7 @@ _evas_device_top_get(const Evas *eo_e)
 {
    int num;
    
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e->cur_device) return NULL;
    num = eina_array_count(e->cur_device);
    if (num < 1) return NULL;
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 67d4ed9d0c..c0b53480b5 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -31,7 +31,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte
 {
    if (obj->smart.parent)
      {
-        Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *smart_parent_obj = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
         _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed);
      }
 
@@ -132,7 +132,7 @@ _efl_event_desc_get(Evas_Callback_Type type)
    if (_info_pflags) *_info_pflags = efl_event_flags_get(_eoev); \
    } while (0)
 #define EV_RESET(a) do { if (a) efl_event_reset(a); } while (0)
-#define EV_DEL(a) do { if (a) { eo_unref(a); } a = NULL; } while (0)
+#define EV_DEL(a) do { if (a) { efl_unref(a); } a = NULL; } while (0)
 
 #if 0
 # define DDD_DO 1
@@ -456,10 +456,10 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Mouse_Down *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Evas_Object_Protected_Data *child;
    Efl_Event_Pointer *pe = NULL;
@@ -497,7 +497,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
 
    EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
      {
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
             (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
           {
@@ -516,7 +516,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
    copy = evas_event_list_copy(src->proxy->src_event_in);
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         ev->canvas = point;
         _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x,
                                    &ev->canvas.y,
@@ -536,10 +536,10 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Mouse_Move *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->cur.canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -561,7 +561,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
         Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
 
              if ((evas_object_clippers_is_visible(eo_child, child) ||
                  child->mouse_grabbed) &&
@@ -587,7 +587,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
           {
              eo_child = outs->data;
              outs = eina_list_remove(outs, eo_child);
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
              if ((child->mouse_grabbed == 0) && (!e->delete_me))
                {
                   if (child->mouse_in) continue;
@@ -621,7 +621,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
 
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
 
              ev->cur.canvas = point;
 
@@ -667,7 +667,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
         int event_id2 = _evas_event_counter;
         EINA_LIST_FOREACH(ins, l, eo_child)
           {
-              child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+              child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
               if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
                 {
                    if (!child->mouse_in)
@@ -709,10 +709,10 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
                                    Evas_Event_Mouse_Up *ev, int event_id,
                                    Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -731,7 +731,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
         if (src->delete_me) break;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
              (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
             (child->mouse_grabbed > 0))
@@ -764,9 +764,9 @@ static void
 _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev,
                                int event_id, Efl_Event_Hold *parent_he)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *child;
    Efl_Event_Hold *he = NULL;
    Evas_Object *eo_child;
@@ -777,7 +777,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
    EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
      {
         if (src->delete_me) return;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         EV_CALL(eo_child, child, EVAS_CALLBACK_HOLD, ev, event_id, he, parent_he);
         if (src->layer->evas->delete_me) break;
      }
@@ -790,10 +790,10 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
                                 Evas_Event_Mouse_Wheel *ev, int event_id,
                                 Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -810,7 +810,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
         if (src->delete_me) return;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         ev->canvas = point;
         _evas_event_havemap_adjust(eo_child, child,
                                    &ev->canvas.x,
@@ -829,10 +829,10 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Multi_Down *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Precision_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -850,7 +850,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
 
    EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
      {
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
           {
              child->mouse_grabbed += (addgrab + 1);
@@ -868,7 +868,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
                                    &ev->canvas.x,
                                    &ev->canvas.y,
                                    child->mouse_grabbed);
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id, pe, parent_pe);
         if (e->delete_me) break;
      }
@@ -883,10 +883,10 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e,
                                    Evas_Event_Multi_Up *ev, int event_id,
                                    Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Precision_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -905,7 +905,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e,
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
         ev->canvas = point;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
              (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
             (child->mouse_grabbed > 0))
@@ -931,10 +931,10 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Multi_Move *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Precision_Point canvas = ev->cur.canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -957,7 +957,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
         Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
              if (((evas_object_clippers_is_visible(eo_child, child)) ||
                   ((child->mouse_grabbed) &&
                   (!evas_event_passes_through(eo_child, child)) &&
@@ -969,7 +969,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                              &ev->cur.canvas.x,
                                              &ev->cur.canvas.y,
                                              child->mouse_grabbed);
-                  child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+                  child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
                   EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe);
                   if (e->delete_me || e->is_frozen) break;
                }
@@ -990,7 +990,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
         Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
              ev->cur.canvas = point;
 
              if (evas_object_is_in_output_rect(eo_child, child,
@@ -1010,7 +1010,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                              &ev->cur.canvas.x,
                                              &ev->cur.canvas.y,
                                              child->mouse_grabbed);
-                  child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+                  child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
                   EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe);
                   if (e->delete_me || e->is_frozen) break;
                }
@@ -1038,10 +1038,10 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
                                    Evas_Event_Mouse_In *ev, int event_id,
                                    Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
    Evas_Object *eo_child;
@@ -1067,7 +1067,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
    point = ev->canvas;
    EINA_LIST_FOREACH(ins, l, eo_child)
      {
-        Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child,
+        Evas_Object_Protected_Data *child = efl_data_scope_get(eo_child,
                                                         EFL_CANVAS_OBJECT_CLASS);
         if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
           {
@@ -1100,10 +1100,10 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
                                     Evas_Event_Mouse_Out *ev, int event_id,
                                     Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
    Evas_Object *eo_child;
@@ -1122,7 +1122,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
 
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
-        Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child,
+        Evas_Object_Protected_Data *child = efl_data_scope_get(eo_child,
                                                         EFL_CANVAS_OBJECT_CLASS);
         if (!child->mouse_in) continue;
         child->mouse_in = 0;
@@ -1160,7 +1160,7 @@ _evas_event_object_list_in_get(Evas *eo_e, Eina_List *in,
 static Eina_List *
 _evas_event_objects_event_list_no_frozen_check(Evas *eo_e, Evas_Object *stop, int x, int y)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Layer *lay;
    Eina_List *in = NULL;
 
@@ -1188,7 +1188,7 @@ _evas_canvas_tree_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, E
 Eina_List *
 evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if ((!e->layers) || (e->is_frozen)) return NULL;
    D("------------------------------GET EVETNS AT ............... %i %i\n", x, y); 
@@ -1247,7 +1247,7 @@ evas_event_thaw(Evas *eo_e)
 EOLIAN void
 _evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e)
 {
-   efl_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   efl_event_freeze(efl_super(eo_e, EVAS_CANVAS_CLASS));
    e->is_frozen = EINA_TRUE;
 }
 
@@ -1255,8 +1255,8 @@ EOLIAN void
 _evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e)
 {
    int fcount = -1;
-   efl_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS));
-   fcount = efl_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   efl_event_thaw(efl_super(eo_e, EVAS_CANVAS_CLASS));
+   fcount = efl_event_freeze_count_get(efl_super(eo_e, EVAS_CANVAS_CLASS));
    if (0 == fcount)
      {
         Evas_Layer *lay;
@@ -1294,7 +1294,7 @@ evas_event_thaw_eval(Evas *eo_e)
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
    MAGIC_CHECK_END();
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (0 == evas_event_freeze_get(eo_e))
      {
         _canvas_event_thaw_eval_internal(eo_e, e);
@@ -1306,7 +1306,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
                                        unsigned int timestamp, const void *data,
                                        Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy;
    Evas_Event_Mouse_Down ev;
@@ -1338,7 +1338,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    /* append new touch point to the touch point list */
@@ -1362,7 +1362,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
             (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
           {
@@ -1377,7 +1377,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
      }
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (obj->delete_me) continue;
         ev.canvas.x = e->pointer.x;
         ev.canvas.y = e->pointer.y;
@@ -1394,7 +1394,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
    _evas_post_event_callback_call(eo_e, e);
    /* update touch point's state to EVAS_TOUCH_POINT_STILL */
    _evas_touch_point_update(eo_e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_STILL);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -1409,7 +1409,7 @@ static int
 _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
                 Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy, *ins, *ll;
    Evas_Event_Mouse_Out ev;
@@ -1431,7 +1431,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    /* get new list of ins */
    ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y);
@@ -1439,7 +1439,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, ll, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside))
           {
              if (!obj->mouse_in) continue;
@@ -1483,7 +1483,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
 
         EINA_LIST_FOREACH(ins, l, eo_obj_itr)
           {
-             Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj_itr = efl_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS);
              if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr))
                {
                   if (obj_itr->mouse_in) continue;
@@ -1523,7 +1523,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
      }
    if (e->pointer.inside)
      _canvas_event_feed_mouse_move_internal(eo_e, e, e->pointer.x, e->pointer.y, timestamp, data, pe);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    EV_DEL(pe);
 
    return post_called;
@@ -1534,7 +1534,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
                                      unsigned int timestamp, const void *data,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy;
 
@@ -1568,7 +1568,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
         ev.timestamp = timestamp;
         ev.event_flags = e->default_event_flags;
         ev.dev = _evas_device_top_get(eo_e);
-        if (ev.dev) eo_ref(ev.dev);
+        if (ev.dev) efl_ref(ev.dev);
 
         _evas_walk(e);
         /* update released touch point */
@@ -1576,7 +1576,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
         copy = evas_event_list_copy(e->pointer.object.in);
         EINA_LIST_FOREACH(copy, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              if (((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
                  (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
                  (obj->mouse_grabbed > 0))
@@ -1609,7 +1609,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
         eina_list_free(copy);
         e->last_mouse_up_counter++;
         _evas_post_event_callback_call(eo_e, e);
-        if (ev.dev) eo_unref(ev.dev);
+        if (ev.dev) efl_unref(ev.dev);
      }
 
    if (e->pointer.mouse_grabbed == 0)
@@ -1639,7 +1639,7 @@ static void
 _canvas_event_feed_mouse_cancel_internal(Eo *eo_e, unsigned int timestamp, const void *data,
                                          Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Touch_Point *point;
    Eina_List *l, *ll;
    Evas_Event_Flags flags;
@@ -1679,7 +1679,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, int direction, int z,
                                         unsigned int timestamp, const void *data,
                                         Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy;
    Evas_Event_Mouse_Wheel ev;
@@ -1704,14 +1704,14 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, int direction, int z,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    copy = evas_event_list_copy(e->pointer.object.in);
 
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (!evas_event_freezes_through(eo_obj, obj))
           {
              ev.canvas.x = e->pointer.x;
@@ -1727,7 +1727,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, int direction, int z,
    eina_list_free(copy);
    _evas_post_event_callback_call(eo_e, e);
 
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -1790,12 +1790,12 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
              ev.timestamp = timestamp;
              ev.event_flags = e->default_event_flags;
              ev.dev = _evas_device_top_get(eo_e);
-             if (ev.dev) eo_ref(ev.dev);
+             if (ev.dev) efl_ref(ev.dev);
 
              copy = evas_event_list_copy(e->pointer.object.in);
              EINA_LIST_FOREACH(copy, l, eo_obj)
                {
-                  Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+                  Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
                   if ((!e->is_frozen) &&
                       (evas_object_clippers_is_visible(eo_obj, obj) ||
                        obj->mouse_grabbed) &&
@@ -1830,7 +1830,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
                   if (e->delete_me) break;
                }
              _evas_post_event_callback_call(eo_e, e);
-             if (ev.dev) eo_unref(ev.dev);
+             if (ev.dev) efl_unref(ev.dev);
              EV_DEL(pemove);
           }
           {
@@ -1851,7 +1851,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
              ev.timestamp = timestamp;
              ev.event_flags = e->default_event_flags;
              ev.dev = _evas_device_top_get(eo_e);
-             if (ev.dev) eo_ref(ev.dev);
+             if (ev.dev) efl_ref(ev.dev);
 
              eina_list_free(copy);
 
@@ -1860,7 +1860,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
                   Evas_Object *eo_obj;
                   eo_obj = outs->data;
                   outs = eina_list_remove(outs, eo_obj);
-                  Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+                  Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
                   if ((obj->mouse_grabbed == 0) && (!e->delete_me))
                     {
                        if (!obj->mouse_in) continue;
@@ -1878,7 +1878,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
                     }
                }
              _evas_post_event_callback_call(eo_e, e);
-             if (ev.dev) eo_unref(ev.dev);
+             if (ev.dev) efl_unref(ev.dev);
              EV_DEL(peout);
           }
      }
@@ -1910,7 +1910,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
         ev.timestamp = timestamp;
         ev.event_flags = e->default_event_flags;
         ev.dev = _evas_device_top_get(eo_e);
-        if (ev.dev) eo_ref(ev.dev);
+        if (ev.dev) efl_ref(ev.dev);
 
         ev2.buttons = e->pointer.button;
         ev2.output.x = e->pointer.x;
@@ -1942,7 +1942,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
         copy = evas_event_list_copy(e->pointer.object.in);
         EINA_LIST_FOREACH(copy, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
              if (!obj) continue;
              /* if its under the pointer and its visible and its in the new */
@@ -2001,7 +2001,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
         /* go thru our current list of ins */
         EINA_LIST_FOREACH(ins, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              /* if its not in the old list of ins send an enter event */
              if (!eina_list_data_find(e->pointer.object.in, eo_obj))
                {
@@ -2035,7 +2035,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int
              eina_list_free(ins);
           }
         _evas_post_event_callback_call(eo_e, e);
-        if (ev.dev) eo_unref(ev.dev);
+        if (ev.dev) efl_unref(ev.dev);
         EV_DEL(pemove);
         EV_DEL(peout);
         EV_DEL(pein);
@@ -2072,7 +2072,7 @@ nogrep:
         ev.timestamp = timestamp;
         ev.event_flags = e->default_event_flags;
         ev.dev = _evas_device_top_get(eo_e);
-        if (ev.dev) eo_ref(ev.dev);
+        if (ev.dev) efl_ref(ev.dev);
 
         ev2.buttons = e->pointer.button;
         ev2.output.x = e->pointer.x;
@@ -2114,7 +2114,7 @@ nogrep:
         eo_below_obj = evas_object_below_get(nogrep_obj);
         if (eo_below_obj)
           {
-             Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *below_obj = efl_data_scope_get(eo_below_obj, EFL_CANVAS_OBJECT_CLASS);
              ins = _evas_event_object_list_raw_in_get(eo_e, NULL,
                                                    EINA_INLIST_GET(below_obj), NULL,
                                                    e->pointer.x, e->pointer.y,
@@ -2132,7 +2132,7 @@ nogrep:
 
         EINA_LIST_FOREACH(lst, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              /* if its under the pointer and its visible and its in the new */
              /* in list */
              // FIXME: i don't think we need this
@@ -2186,7 +2186,7 @@ nogrep:
         /* go thru our current list of ins */
         EINA_LIST_FOREACH(newin, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              /* if its not in the old list of ins send an enter event */
              if (!eina_list_data_find(e->pointer.object.in, eo_obj))
                {
@@ -2209,7 +2209,7 @@ nogrep:
         e->pointer.object.in = newin;
 
         _evas_post_event_callback_call(eo_e, e);
-        if (ev.dev) eo_unref(ev.dev);
+        if (ev.dev) efl_unref(ev.dev);
         EV_DEL(pemove);
         EV_DEL(peout);
         EV_DEL(pein);
@@ -2220,14 +2220,14 @@ nogrep:
 EAPI void
 evas_event_input_mouse_move(Eo *eo_e, int x, int y, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_mouse_move_internal(eo_e, e, x - e->framespace.x, y - e->framespace.y, timestamp, data, NULL);
 }
 
 EAPI void
 evas_event_feed_mouse_move(Eo *eo_e, int x, int y, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_mouse_move_internal(eo_e, e, x, y, timestamp, data, NULL);
 }
 
@@ -2235,7 +2235,7 @@ static void
 _canvas_event_feed_mouse_in_internal(Eo *eo_e, unsigned int timestamp, const void *data,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *ins;
    Eina_List *l;
@@ -2264,14 +2264,14 @@ _canvas_event_feed_mouse_in_internal(Eo *eo_e, unsigned int timestamp, const voi
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
    
    _evas_walk(e);
    /* get new list of ins */
    ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y);
    EINA_LIST_FOREACH(ins, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (!eina_list_data_find(e->pointer.object.in, eo_obj))
           {
              if (obj->mouse_in) continue;
@@ -2292,7 +2292,7 @@ _canvas_event_feed_mouse_in_internal(Eo *eo_e, unsigned int timestamp, const voi
    e->pointer.object.in = ins;
    _evas_post_event_callback_call(eo_e, e);
    _canvas_event_feed_mouse_move_internal(eo_e, e, e->pointer.x, e->pointer.y, timestamp, data, pe);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -2307,7 +2307,7 @@ static void
 _canvas_event_feed_mouse_out_internal(Eo *eo_e, unsigned int timestamp, const void *data,
                                       Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Evas_Event_Mouse_Out ev;
    int event_id = 0;
@@ -2331,7 +2331,7 @@ _canvas_event_feed_mouse_out_internal(Eo *eo_e, unsigned int timestamp, const vo
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    /* if our mouse button is inside any objects */
@@ -2342,7 +2342,7 @@ _canvas_event_feed_mouse_out_internal(Eo *eo_e, unsigned int timestamp, const vo
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (!obj->mouse_in) continue;
         obj->mouse_in = 0;
         if (!obj->delete_me)
@@ -2364,7 +2364,7 @@ _canvas_event_feed_mouse_out_internal(Eo *eo_e, unsigned int timestamp, const vo
    e->pointer.object.in =  eina_list_free(e->pointer.object.in);
    e->pointer.mouse_grabbed = 0;
    _evas_post_event_callback_call(eo_e, e);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -2419,7 +2419,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    /* append new touch point to the touch point list */
@@ -2431,7 +2431,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
           {
              obj->mouse_grabbed += addgrab + 1;
@@ -2440,7 +2440,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
      }
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         ev.canvas.x = x;
         ev.canvas.y = y;
         ev.canvas.xsub = fx;
@@ -2460,7 +2460,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
    _evas_post_event_callback_call(eo_e, e);
    /* update touch point's state to EVAS_TOUCH_POINT_STILL */
    _evas_touch_point_update(eo_e, d, x, y, EVAS_TOUCH_POINT_STILL);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -2468,7 +2468,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
 EAPI void
 evas_event_input_multi_down(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_multi_down_internal(eo_e, e, d,
                                           x - e->framespace.x,
                                           y - e->framespace.y,
@@ -2479,7 +2479,7 @@ evas_event_input_multi_down(Eo *eo_e, int d, int x, int y, double rad, double ra
 EAPI void
 evas_event_feed_multi_down(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_multi_down_internal(eo_e, e,
                                           d, x, y, rad, radx, rady, pres, ang,
                                           fx, fy, flags, timestamp, data, NULL);
@@ -2531,7 +2531,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    /* update released touch point */
@@ -2539,7 +2539,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd,
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         ev.canvas.x = x;
         ev.canvas.y = y;
         ev.canvas.xsub = fx;
@@ -2566,7 +2566,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd,
       _evas_post_event_callback_call(eo_e, e);
    /* remove released touch point from the touch point list */
    _evas_touch_point_remove(eo_e, d);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -2574,7 +2574,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd,
 EAPI void
 evas_event_input_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_multi_up_internal(eo_e, e, d,
                                         x - e->framespace.x,
                                         y - e->framespace.y,
@@ -2586,7 +2586,7 @@ evas_event_input_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx
 EAPI void
 evas_event_feed_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_multi_up_internal(eo_e, e, d, x, y, rad, radx, rady,
                                         pres, ang, fx, fy, flags, timestamp, data, NULL);
 }
@@ -2641,12 +2641,12 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
         ev.timestamp = timestamp;
         ev.event_flags = e->default_event_flags;
         ev.dev = _evas_device_top_get(eo_e);
-        if (ev.dev) eo_ref(ev.dev);
+        if (ev.dev) efl_ref(ev.dev);
 
         copy = evas_event_list_copy(e->pointer.object.in);
         EINA_LIST_FOREACH(copy, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              if ((evas_object_clippers_is_visible(eo_obj, obj) ||
                   obj->mouse_grabbed) &&
                  (!evas_event_passes_through(eo_obj, obj)) &&
@@ -2673,7 +2673,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
           }
         eina_list_free(copy);
         _evas_post_event_callback_call(eo_e, e);
-        if (ev.dev) eo_unref(ev.dev);
+        if (ev.dev) efl_unref(ev.dev);
      }
    else
      {
@@ -2704,7 +2704,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
         ev.timestamp = timestamp;
         ev.event_flags = e->default_event_flags;
         ev.dev = _evas_device_top_get(eo_e);
-        if (ev.dev) eo_ref(ev.dev);
+        if (ev.dev) efl_ref(ev.dev);
 
         /* get all new in objects */
         ins = evas_event_objects_event_list(eo_e, NULL, x, y);
@@ -2712,7 +2712,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
         copy = evas_event_list_copy(e->pointer.object.in);
         EINA_LIST_FOREACH(copy, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              /* if its under the pointer and its visible and its in the new */
              /* in list */
              // FIXME: i don't think we need this
@@ -2758,7 +2758,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
              eina_list_free(ins);
           }
         _evas_post_event_callback_call(eo_e, e);
-        if (ev.dev) eo_unref(ev.dev);
+        if (ev.dev) efl_unref(ev.dev);
      }
    _evas_unwalk(e);
    EV_DEL(pe);
@@ -2767,7 +2767,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
 EAPI void
 evas_event_input_multi_move(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_multi_move_internal(eo_e, e, d,
                                           x - e->framespace.x, y - e->framespace.y,
                                           rad, radx, rady,
@@ -2777,7 +2777,7 @@ evas_event_input_multi_move(Eo *eo_e, int d, int x, int y, double rad, double ra
 EAPI void
 evas_event_feed_multi_move(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_multi_move_internal(eo_e, e, d, x, y, rad, radx, rady,
                                           pres, ang, fx, fy, timestamp, data, NULL);
 }
@@ -2821,7 +2821,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
    ev.keycode = keycode;
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    if (ke)
      {
@@ -2854,7 +2854,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
                {
                   if (!(e->modifiers.mask & g->not_modifiers))
                     {
-                       Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
+                       Evas_Object_Protected_Data *object_obj = efl_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
                        if (!e->is_frozen &&
                            !evas_event_freezes_through(g->object, object_obj))
                          {
@@ -2878,7 +2878,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
                        l = eina_list_next(l);
                        if (g->delete_me)
                          {
-                            Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
+                            Evas_Object_Protected_Data *g_object_obj = efl_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
                             evas_key_grab_free(g->object, g_object_obj, g->keyname,
                                                g->modifiers, g->not_modifiers);
                          }
@@ -2889,7 +2889,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
    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);
+        Evas_Object_Protected_Data *focused_obj = efl_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,
@@ -2897,7 +2897,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
           }
      }
    _evas_post_event_callback_call(eo_e, e);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
 
    if (ke)
@@ -2949,7 +2949,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
    ev.keycode = keycode;
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    if (ke)
      {
@@ -2981,7 +2981,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
                  (!(e->modifiers.mask & g->not_modifiers)) &&
                  (!strcmp(keyname, g->keyname)))
                {
-                  Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
+                  Evas_Object_Protected_Data *object_obj = efl_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
                   if (!e->is_frozen &&
                         !evas_event_freezes_through(g->object, object_obj))
                     {
@@ -3007,7 +3007,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
                        if (gr->delete_me)
                          {
                             Evas_Object_Protected_Data *gr_object_obj =
-                               eo_data_scope_get(gr->object, EFL_CANVAS_OBJECT_CLASS);
+                               efl_data_scope_get(gr->object, EFL_CANVAS_OBJECT_CLASS);
                             evas_key_grab_free(gr->object, gr_object_obj, gr->keyname,
                                             gr->modifiers, gr->not_modifiers);
                          }
@@ -3017,7 +3017,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
      }
    if ((e->focused) && (!exclusive))
      {
-        Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *focused_obj = efl_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS);
         if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
           {
              evas_object_event_callback_call
@@ -3026,7 +3026,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
           }
      }
    _evas_post_event_callback_call(eo_e, e);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
 
    if (ke)
@@ -3041,7 +3041,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
 EAPI void
 evas_event_feed_key_down(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_key_down_internal(eo_e, e, keyname, key, string,
                                         compose, timestamp, data, 0, NULL);
 }
@@ -3049,7 +3049,7 @@ evas_event_feed_key_down(Eo *eo_e, const char *keyname, const char *key, const c
 EAPI void
 evas_event_feed_key_up(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_key_up_internal(eo_e, e, keyname, key, string,
                                       compose, timestamp, data, 0, NULL);
 }
@@ -3057,7 +3057,7 @@ evas_event_feed_key_up(Eo *eo_e, const char *keyname, const char *key, const cha
 EAPI void
 evas_event_feed_key_down_with_keycode(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_key_down_internal(eo_e, e, keyname, key, string,
                                         compose, timestamp, data, keycode, NULL);
 }
@@ -3065,7 +3065,7 @@ evas_event_feed_key_down_with_keycode(Eo *eo_e, const char *keyname, const char
 EAPI void
 evas_event_feed_key_up_with_keycode(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_key_up_internal(eo_e, e, keyname, key, string,
                                       compose, timestamp, data, keycode, NULL);
 }
@@ -3073,7 +3073,7 @@ evas_event_feed_key_up_with_keycode(Eo *eo_e, const char *keyname, const char *k
 EAPI void
 evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Hold *he = NULL;
    Eina_List *l, *copy;
    Evas_Event_Hold ev;
@@ -3091,13 +3091,13 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if ( !evas_event_freezes_through(eo_obj, obj))
           {
              EV_CALL(eo_obj, obj, EVAS_CALLBACK_HOLD, &ev, event_id, he, NULL);
@@ -3108,7 +3108,7 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
      }
    eina_list_free(copy);
    _evas_post_event_callback_call(eo_e, e);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    _evas_object_event_new();
 
@@ -3136,14 +3136,14 @@ _canvas_event_feed_axis_update_internal(Evas *eo_e, Evas_Public_Data *e, unsigne
    ev.naxis = naxis;
    ev.axis = (Evas_Axis *)axis;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    copy = evas_event_list_copy(e->pointer.object.in);
 
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (!evas_event_freezes_through(eo_obj, obj))
           {
              evas_object_event_callback_call(eo_obj, obj,
@@ -3161,7 +3161,7 @@ _canvas_event_feed_axis_update_internal(Evas *eo_e, Evas_Public_Data *e, unsigne
 EAPI void
 evas_event_feed_axis_update(Evas *eo_e, unsigned int timestamp, int device, int toolid, int naxis, const Evas_Axis *axis, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _canvas_event_feed_axis_update_internal(eo_e, e, timestamp, device, toolid, naxis, axis, data);
 }
 
@@ -3296,7 +3296,7 @@ _efl_canvas_object_pointer_mode_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
              /* only change objects past it */
              EINA_LIST_FOREACH(l->next, l, cobj)
                {
-                  cobj_data = eo_data_scope_get(cobj, EFL_CANVAS_OBJECT_CLASS);
+                  cobj_data = efl_data_scope_get(cobj, EFL_CANVAS_OBJECT_CLASS);
                   if (!cobj_data->mouse_grabbed) continue;
                   cobj_data->mouse_grabbed -= addgrab;
                   cobj_data->layer->evas->pointer.mouse_grabbed -= addgrab;
@@ -3413,7 +3413,7 @@ _evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
 static void
 _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event)
 {
-   Efl_Event_Pointer_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
+   Efl_Event_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
    Evas_Public_Data *e = data;
    Evas *eo_e = event->object;
    int dir;
@@ -3503,7 +3503,7 @@ _evas_canvas_event_key_cb(void *data, const Eo_Event *event)
    Evas_Public_Data *e = data;
    Efl_Event_Key_Data *ev;
 
-   ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+   ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
    if (!ev) return;
 
    if (ev->pressed)
@@ -3525,7 +3525,7 @@ _evas_canvas_event_key_cb(void *data, const Eo_Event *event)
 }
 
 // note: "hold" event comes from above (elm), not below (ecore)
-EO_CALLBACKS_ARRAY_DEFINE(_evas_canvas_event_pointer_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(_evas_canvas_event_pointer_callbacks,
 { EFL_EVENT_POINTER_MOVE, _evas_canvas_event_pointer_cb },
 { EFL_EVENT_POINTER_DOWN, _evas_canvas_event_pointer_cb },
 { EFL_EVENT_POINTER_UP, _evas_canvas_event_pointer_cb },
diff --git a/src/lib/evas/canvas/evas_events_legacy.c b/src/lib/evas/canvas/evas_events_legacy.c
index 463a73d2e1..5c48e8d4b2 100644
--- a/src/lib/evas/canvas/evas_events_legacy.c
+++ b/src/lib/evas/canvas/evas_events_legacy.c
@@ -7,7 +7,7 @@
 Eina_Bool
 efl_event_pointer_legacy_info_set(Efl_Event_Pointer *evt, const void *event_info, Evas_Callback_Type type)
 {
-   Efl_Event_Pointer_Data *ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+   Efl_Event_Pointer_Data *ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
    if (!ev || !event_info) return EINA_FALSE;
 
    /* FIXME/TODO:
@@ -212,7 +212,7 @@ efl_event_pointer_legacy_info_set(Efl_Event_Pointer *evt, const void *event_info
 Eina_Bool
 efl_event_key_legacy_info_set(Efl_Event_Key *evt, const void *event_info, Evas_Callback_Type type)
 {
-   Efl_Event_Key_Data *ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+   Efl_Event_Key_Data *ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
    if (!ev || !event_info) return EINA_FALSE;
 
    switch (type)
@@ -264,7 +264,7 @@ efl_event_key_legacy_info_set(Efl_Event_Key *evt, const void *event_info, Evas_C
 Eina_Bool
 efl_event_hold_legacy_info_set(Efl_Event_Hold *evt, const void *event_info, Evas_Callback_Type type)
 {
-   Efl_Event_Hold_Data *ev = eo_data_scope_get(evt, EFL_EVENT_HOLD_CLASS);
+   Efl_Event_Hold_Data *ev = efl_data_scope_get(evt, EFL_EVENT_HOLD_CLASS);
    const Evas_Event_Hold *e = event_info;
 
    if (!ev || !event_info) return EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 1796bc5cbc..c918cb5f02 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -76,8 +76,8 @@ static void
 _render_post_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Eo *eo_obj = data;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Filter_Data *pd = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Filter_Data *pd = efl_data_scope_get(eo_obj, MY_CLASS);
    Eina_List *post_data;
    Evas_Filter_Post_Render_Data *task;
 
@@ -97,8 +97,8 @@ static void
 _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
 {
    Eo *eo_obj = data;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Filter_Data *pd = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Filter_Data *pd = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Filter_Post_Render_Data *post_data;
 
    if (!pd->data->async)
@@ -122,8 +122,8 @@ _filter_source_hash_free_cb(void *data)
    Evas_Object_Protected_Data *proxy, *source;
    Evas_Filter_Data *pd;
 
-   proxy = eo_data_scope_get(pb->eo_proxy, EFL_CANVAS_OBJECT_CLASS);
-   source = eo_data_scope_get(pb->eo_source, EFL_CANVAS_OBJECT_CLASS);
+   proxy = efl_data_scope_get(pb->eo_proxy, EFL_CANVAS_OBJECT_CLASS);
+   source = efl_data_scope_get(pb->eo_source, EFL_CANVAS_OBJECT_CLASS);
 
    if (source)
      {
@@ -133,7 +133,7 @@ _filter_source_hash_free_cb(void *data)
         EINA_COW_WRITE_END(evas_object_proxy_cow, source->proxy, source_write)
      }
 
-   pd = eo_data_scope_get(pb->eo_proxy, MY_CLASS);
+   pd = efl_data_scope_get(pb->eo_proxy, MY_CLASS);
 
    if (pd && proxy)
      {
@@ -155,7 +155,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                           void *output, void *context, void *surface,
                           int x, int y, Eina_Bool do_async, Eina_Bool alpha)
 {
-   Evas_Filter_Data *pd = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Filter_Data *pd = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!pd->data->invalid && (pd->data->chain || pd->data->code))
      {
@@ -249,7 +249,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                   iter = eina_hash_iterator_data_new(pd->data->sources);
                   EINA_ITERATOR_FOREACH(iter, pb)
                     {
-                       source = eo_data_scope_get(pb->eo_source, EFL_CANVAS_OBJECT_CLASS);
+                       source = efl_data_scope_get(pb->eo_source, EFL_CANVAS_OBJECT_CLASS);
                        if (source->changed)
                          {
                             redraw = EINA_TRUE;
@@ -355,7 +355,7 @@ EOLIAN static void
 _efl_canvas_filter_internal_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
                                                               const char *code, const char *name)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Filter_Program *pgm = NULL;
    Evas_Object_Filter_Data *fcow;
    Eina_Bool alpha;
@@ -408,13 +408,13 @@ EOLIAN static void
 _efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
                                                              const char *name, Efl_Gfx *eo_source)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
    Evas_Object_Protected_Data *source = NULL;
    Evas_Object_Filter_Data *fcow = NULL;
 
    if (eo_source)
-     source = eo_data_scope_get(eo_source, EFL_CANVAS_OBJECT_CLASS);
+     source = efl_data_scope_get(eo_source, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_async_block(obj);
    if (!name)
@@ -502,7 +502,7 @@ _efl_canvas_filter_internal_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Fil
                                                             const char *next_state, double next_val,
                                                             double pos)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_async_block(obj);
    if ((cur_state != pd->data->state.cur.name) || (cur_val != pd->data->state.cur.value) ||
@@ -585,7 +585,7 @@ _efl_canvas_filter_internal_efl_object_constructor(Eo *eo_obj, Evas_Filter_Data
 {
    Eo *obj = NULL;
 
-   obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
    pd->data = eina_cow_alloc(evas_object_filter_cow);
    SLKI(pd->lck);
 
@@ -595,7 +595,7 @@ _efl_canvas_filter_internal_efl_object_constructor(Eo *eo_obj, Evas_Filter_Data
 EOLIAN static void
 _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_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Filter_Data_Binding *db;
    Eina_Inlist *il;
 
@@ -630,7 +630,7 @@ finish:
      }
    SLKD(pd->lck);
 
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index b5c1d31b07..8d36049445 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -142,7 +142,7 @@ void
 evas_fonts_zero_free(Evas *eo_evas)
 {
    Fndat *fd;
-   Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
 
    EINA_LIST_FREE(fonts_zero, fd)
      {
@@ -162,7 +162,7 @@ void
 evas_fonts_zero_pressure(Evas *eo_evas)
 {
    Fndat *fd;
-   Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
 
    while (fonts_zero
 	  && eina_list_count(fonts_zero) > 4) /* 4 is arbitrary */
@@ -191,7 +191,7 @@ evas_font_free(Evas *eo_evas, void *font)
 {
    Eina_List *l;
    Fndat *fd;
-   Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
 
    EINA_LIST_FOREACH(fonts_cache, l, fd)
      {
@@ -232,7 +232,7 @@ static Evas_Font_Set *
 _evas_load_fontconfig(Evas_Font_Set *font, Evas *eo_evas, FcFontSet *set, int size,
       Font_Rend_Flags wanted_rend)
 {
-   Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
    int i;
 
    /* Do loading for all in family */
@@ -547,7 +547,7 @@ evas_font_name_parse(Evas_Font_Description *fdesc, const char *name)
 void *
 evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size)
 {
-   Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
 #ifdef HAVE_FONTCONFIG
    FcPattern *p_nm = NULL;
    FcFontSet *set = NULL;
@@ -912,7 +912,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
 void
 evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting)
 {
-   Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
    evas->engine.func->font_hinting_set(evas->engine.data.output, font,
 				       hinting);
 }
@@ -920,7 +920,7 @@ evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting)
 Eina_List *
 evas_font_dir_available_list(const Evas *eo_evas)
 {
-   const Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
+   const Evas_Public_Data *evas = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS);
    Eina_List *l;
    Eina_List *ll;
    Eina_List *available = NULL;
@@ -1433,7 +1433,7 @@ evas_font_path_global_list(void)
 void
 evas_font_object_rehint(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (obj->is_smart)
      {
 	EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj)
diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c
index 7e9c4e7db9..5a71f1278c 100644
--- a/src/lib/evas/canvas/evas_gl.c
+++ b/src/lib/evas/canvas/evas_gl.c
@@ -143,13 +143,13 @@ evas_gl_new(Evas *e)
    if (!evas_gl) return NULL;
 
    evas_gl->magic = MAGIC_EVAS_GL;
-   evas_gl->evas = eo_data_ref(e, EVAS_CANVAS_CLASS);
+   evas_gl->evas = efl_data_ref(e, EVAS_CANVAS_CLASS);
    LKI(evas_gl->lck);
 
    if (!evas_gl->evas->engine.func->gl_context_create)
      {
         ERR("Evas GL engine not available.");
-        eo_data_unref(e, evas_gl->evas);
+        efl_data_unref(e, evas_gl->evas);
         free(evas_gl);
         return NULL;
      }
@@ -158,7 +158,7 @@ evas_gl_new(Evas *e)
    if (eina_tls_new(&(evas_gl->resource_key)) == EINA_FALSE)
      {
         ERR("Error creating tls key");
-        eo_data_unref(e, evas_gl->evas);
+        efl_data_unref(e, evas_gl->evas);
         free(evas_gl);
         return NULL;
      }
@@ -189,7 +189,7 @@ evas_gl_free(Evas_GL *evas_gl)
    if (_current_evas_gl_key && (evas_gl == eina_tls_get(_current_evas_gl_key)))
      eina_tls_set(_current_evas_gl_key, NULL);
 
-   eo_data_unref(evas_gl->evas->evas, evas_gl->evas);
+   efl_data_unref(evas_gl->evas->evas, evas_gl->evas);
    evas_gl->magic = 0;
    LKD(evas_gl->lck);
    free(evas_gl);
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 8c3abf1e09..f257b84359 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -4,7 +4,7 @@
 #include "evas_image.eo.h"
 
 #define EVAS_IMAGE_API(_o, ...) do { \
-   if (EINA_UNLIKELY(!eo_isa(_o, EFL_CANVAS_IMAGE_INTERNAL_CLASS))) { \
+   if (EINA_UNLIKELY(!efl_isa(_o, EFL_CANVAS_IMAGE_INTERNAL_CLASS))) { \
       EINA_SAFETY_ERROR("object is not an image!"); \
       return __VA_ARGS__; \
    } } while (0)
@@ -17,18 +17,18 @@
 EAPI Evas_Object *
 evas_object_image_add(Evas *eo_e)
 {
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
-   return eo_add(EVAS_IMAGE_CLASS, eo_e,
-                 efl_gfx_fill_auto_set(eo_self, EINA_FALSE),
-                 efl_canvas_object_legacy_ctor(eo_self));
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
+   return efl_add(EVAS_IMAGE_CLASS, eo_e,
+                 efl_gfx_fill_auto_set(efl_self, EINA_FALSE),
+                 efl_canvas_object_legacy_ctor(efl_self));
 }
 
 EAPI Evas_Object *
 evas_object_image_filled_add(Evas *eo_e)
 {
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
-   return eo_add(EVAS_IMAGE_CLASS, eo_e,
-                 efl_canvas_object_legacy_ctor(eo_self));
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
+   return efl_add(EVAS_IMAGE_CLASS, eo_e,
+                 efl_canvas_object_legacy_ctor(efl_self));
 }
 
 EAPI void
@@ -50,7 +50,7 @@ evas_object_image_fill_set(Evas_Object *obj,
                            Evas_Coord w, Evas_Coord h)
 {
    EVAS_IMAGE_API(obj);
-   _evas_image_fill_set(obj, eo_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS), x, y, w, h);
+   _evas_image_fill_set(obj, efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS), x, y, w, h);
 }
 
 EAPI void
@@ -160,7 +160,7 @@ EAPI int
 evas_object_image_stride_get(const Evas_Object *obj)
 {
    EVAS_IMAGE_API(obj, 0);
-   Evas_Image_Data *o = eo_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->image.stride;
 }
 
@@ -351,7 +351,7 @@ evas_object_image_orient_set(Evas_Object *obj, Evas_Image_Orient orient)
 {
    EVAS_IMAGE_API(obj);
 
-   Evas_Image_Data *o = eo_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    _evas_image_orientation_set(obj, o, orient);
 }
 
@@ -360,7 +360,7 @@ evas_object_image_orient_get(const Evas_Object *obj)
 {
    EVAS_IMAGE_API(obj, EVAS_IMAGE_ORIENT_NONE);
 
-   Evas_Image_Data *o = eo_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->cur->orient;
 }
@@ -370,7 +370,7 @@ evas_object_image_snapshot_set(Evas_Object *eo, Eina_Bool s)
 {
    EVAS_IMAGE_API(eo);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    if (obj->cur->snapshot == s) return;
 
@@ -384,7 +384,7 @@ evas_object_image_snapshot_get(const Evas_Object *eo)
 {
    EVAS_IMAGE_API(eo, EINA_FALSE);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    return obj->cur->snapshot;
 }
 
@@ -484,8 +484,8 @@ evas_object_image_pixels_get_callback_set(Eo *eo_obj, Evas_Object_Image_Pixels_G
 {
    EVAS_IMAGE_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    EINA_COW_PIXEL_WRITE_BEGIN(o, pixi_write)
@@ -501,8 +501,8 @@ evas_object_image_pixels_dirty_set(Eo *eo_obj, Eina_Bool dirty)
 {
    EVAS_IMAGE_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    if (dirty) o->dirty_pixels = EINA_TRUE;
@@ -516,7 +516,7 @@ evas_object_image_pixels_dirty_get(const Eo *eo_obj)
 {
    EVAS_IMAGE_API(eo_obj, EINA_FALSE);
 
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return (o->dirty_pixels ? 1 : 0);
 }
@@ -526,8 +526,8 @@ evas_object_image_data_set(Eo *eo_obj, void *data)
 {
    EVAS_IMAGE_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    void *p_data;
    Eina_Bool resize_call = EINA_FALSE;
 
@@ -617,14 +617,14 @@ evas_object_image_data_get(const Eo *eo_obj, Eina_Bool for_writing)
 {
    EVAS_IMAGE_API(eo_obj, NULL);
 
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int stride = 0;
    void *pixels;
    DATA32 *data;
 
    if (!o->engine_data) return NULL;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (for_writing) evas_object_async_block(obj);
    if (for_writing) evas_render_rendering_wait(obj->layer->evas);
@@ -667,8 +667,8 @@ evas_object_image_data_copy_set(Eo *eo_obj, void *data)
 {
    EVAS_IMAGE_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!data) return;
    evas_object_async_block(obj);
@@ -721,8 +721,8 @@ evas_object_image_size_set(Evas_Object *eo_obj, int w, int h)
 {
    EVAS_IMAGE_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int stride = 0;
 
    if (o->cur->scene) return;
@@ -788,8 +788,8 @@ evas_object_image_colorspace_set(Evas_Object *eo_obj, Evas_Colorspace cspace)
 {
    EVAS_IMAGE_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    _evas_image_cleanup(eo_obj, obj, o);
@@ -809,8 +809,8 @@ evas_object_image_video_surface_set(Evas_Object *eo_obj, Evas_Video_Surface *sur
 {
    EVAS_IMAGE_LEGACY_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    evas_object_async_block(obj);
 
    _evas_image_cleanup(eo_obj, obj, o);
@@ -870,7 +870,7 @@ evas_object_image_video_surface_get(const Evas_Object *eo_obj)
 {
    EVAS_IMAGE_LEGACY_API(eo_obj, NULL);
 
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return (!o->video_surface ? NULL : &o->pixels->video);
 }
 
@@ -879,8 +879,8 @@ evas_object_image_video_surface_caps_set(Evas_Object *eo_obj, unsigned int caps)
 {
    EVAS_IMAGE_LEGACY_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    evas_object_async_block(obj);
 
    _evas_image_cleanup(eo_obj, obj, o);
@@ -898,7 +898,7 @@ evas_object_image_video_surface_caps_get(const Evas_Object *eo_obj)
 {
    EVAS_IMAGE_LEGACY_API(eo_obj, 0);
 
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return (!o->video_surface ? 0 : o->pixels->video_caps);
 }
 
@@ -931,15 +931,15 @@ evas_object_image_source_visible_set(Evas_Object *eo, Eina_Bool visible)
 
    EVAS_IMAGE_LEGACY_API(eo);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *src_obj;
    Evas_Image_Data *o;
 
-   o = eo_data_scope_get(eo, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   o = efl_data_scope_get(eo, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    if (!o->cur->source) return;
 
    visible = !!visible;
-   src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
    if (src_obj->proxy->src_invisible == !visible) return;
 
    evas_object_async_block(obj);
@@ -967,9 +967,9 @@ evas_object_image_source_visible_get(const Evas_Object *eo)
    Evas_Image_Data *o;
    Eina_Bool visible;
 
-   o = eo_data_scope_get(eo, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   o = efl_data_scope_get(eo, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    if (!o->cur->source) visible = EINA_FALSE;
-   src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
    if (src_obj) visible = !src_obj->proxy->src_invisible;
    else visible = EINA_FALSE;
 
@@ -982,7 +982,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace)
 {
    EVAS_IMAGE_LEGACY_API(eo_obj, NULL);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Image_Data *o;
    void *engine_data;
    DATA32 *data;
@@ -996,7 +996,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace)
      }
 
    evas_object_async_block(obj);
-   o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    if ((o->preloading) && (o->engine_data))
      {
         o->preloading = EINA_FALSE;
@@ -1021,11 +1021,11 @@ evas_object_image_reload(Evas_Object *eo_obj)
 {
    EVAS_IMAGE_LEGACY_API(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Image_Data *o;
 
    evas_object_async_block(obj);
-   o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    if ((o->preloading) && (o->engine_data))
      {
         o->preloading = EINA_FALSE;
@@ -1057,7 +1057,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p
 {
    EVAS_IMAGE_LEGACY_API(eo_obj, EINA_FALSE);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Image_Data *o;
 
    static int warned = 0;
@@ -1068,7 +1068,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p
      }
 
    evas_object_async_block(obj);
-   o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    _evas_image_cleanup(eo_obj, obj, o);
    if ((pixels->w != o->cur->image.w) || (pixels->h != o->cur->image.h)) return EINA_FALSE;
 
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 1a1ba6a3fe..9cc2284090 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -132,7 +132,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c
 
    g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers);
    if (!g) return;
-   Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *g_object = efl_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
    g_object->grabs = eina_list_remove(g_object->grabs, g);
    obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g);
    if (g->keyname) free(g->keyname);
@@ -162,7 +162,7 @@ _efl_canvas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const
    if (!keyname) return;
    g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers);
    if (!g) return;
-   Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *g_object = efl_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS);
    if (g_object->layer->evas->walking_grabs)
      {
         if (!g->delete_me)
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index bee7449b28..db615362c2 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -12,7 +12,7 @@ evas_object_inject(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas *e
    if (!obj) return;
    if (!e) return;
    if (obj->in_layer) return;
-   evas = eo_data_scope_get(e, EVAS_CANVAS_CLASS);
+   evas = efl_data_scope_get(e, EVAS_CANVAS_CLASS);
    if (!evas) return;
    evas_canvas_async_block(evas);
    lay = evas_layer_find(e, obj->cur->layer);
@@ -22,7 +22,7 @@ evas_object_inject(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas *e
         lay->layer = obj->cur->layer;
         evas_layer_add(lay);
      }
-   eo_data_ref(eo_obj, NULL);
+   efl_data_ref(eo_obj, NULL);
    lay->objects = (Evas_Object_Protected_Data *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj));
    lay->usage++;
    obj->layer = lay;
@@ -35,7 +35,7 @@ evas_object_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, int cl
    if (!obj->in_layer) return;
    if (!obj->layer->walking_objects)
      obj->layer->objects = (Evas_Object_Protected_Data *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects), EINA_INLIST_GET(obj));
-   eo_data_unref(eo_obj, obj);
+   efl_data_unref(eo_obj, obj);
    if (!obj->layer->walking_objects)
      {
         obj->layer->usage--;
@@ -57,7 +57,7 @@ evas_object_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, int cl
 Evas_Layer *
 evas_layer_new(Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_data_ref(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_ref(eo_e, EVAS_CANVAS_CLASS);
    Evas_Layer *lay;
 
    lay = calloc(1, sizeof(Evas_Layer));
@@ -123,7 +123,7 @@ evas_layer_free_objects(Evas_Layer *lay)
 void
 evas_layer_clean(Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Layer *tmp;
 
    while (e->layers)
@@ -137,7 +137,7 @@ evas_layer_clean(Evas *eo_e)
 Evas_Layer *
 evas_layer_find(Evas *eo_e, short layer_num)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Layer *layer;
 
    EINA_INLIST_FOREACH(e->layers, layer)
@@ -173,15 +173,15 @@ evas_layer_del(Evas_Layer *lay)
    e = lay->evas;
    e->layers = (Evas_Layer *)eina_inlist_remove(EINA_INLIST_GET(e->layers), EINA_INLIST_GET(lay));
 
-   eo_data_unref(e->evas, e);
+   efl_data_unref(e->evas, e);
    lay->evas = NULL;
 }
 
 static void
 _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *par_obj = efl_data_scope_get(par, EFL_CANVAS_OBJECT_CLASS);
 
    if (obj->delete_me) return;
    if (obj->cur->layer == l) return;
@@ -287,7 +287,7 @@ _efl_canvas_object_efl_gfx_stack_layer_get(Eo *eo_obj EINA_UNUSED,
 {
    if (obj->smart.parent)
      {
-        Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *smart_parent_obj = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
         return smart_parent_obj->cur->layer;
      }
    return obj->cur->layer;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index e0aa03a39b..8eb3c6e520 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -54,7 +54,7 @@ evas_init(void)
         goto shutdown_eina;
      }
 
-   eo_init();
+   efl_object_init();
 
 #ifdef BUILD_LOADER_EET
    eet_init();
@@ -146,7 +146,7 @@ evas_shutdown(void)
 #ifdef BUILD_LOADER_EET
    eet_shutdown();
 #endif
-   eo_shutdown();
+   efl_object_shutdown();
 
    eina_log_domain_unregister(_evas_log_dom_global);
 
@@ -164,14 +164,14 @@ evas_shutdown(void)
 EAPI Evas *
 evas_new(void)
 {
-   Evas_Object *eo_obj = eo_add(EVAS_CANVAS_CLASS, NULL);
+   Evas_Object *eo_obj = efl_add(EVAS_CANVAS_CLASS, NULL);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas_efl_object_constructor(Eo *eo_obj, Evas_Public_Data *e)
 {
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    e->evas = eo_obj;
    e->output.render_method = RENDER_METHOD_INVALID;
@@ -220,7 +220,7 @@ evas_free(Evas *eo_e)
    return;
    MAGIC_CHECK_END();
    evas_sync(eo_e);
-   eo_unref(eo_e);
+   efl_unref(eo_e);
 }
 
 EOLIAN static void
@@ -261,9 +261,9 @@ _evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e)
                {
                   if (!o->delete_me)
                     {
-                       if ((o->ref > 0) || (eo_ref_get(o->object) > 0))
+                       if ((o->ref > 0) || (efl_ref_get(o->object) > 0))
                          {
-                            ERR("obj(%p, %s) ref count(%d) is bigger than 0. This object couldn't be deleted", o, o->type, eo_ref_get(o->object));
+                            ERR("obj(%p, %s) ref count(%d) is bigger than 0. This object couldn't be deleted", o, o->type, efl_ref_get(o->object));
                             continue;
                          }
                        else
@@ -275,10 +275,10 @@ _evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e)
                }
              EINA_LIST_FREE(unrefs, eo_obj)
                {
-                  ERR("Killing Zombie Object [%p] ref=%i:%i\n", eo_obj, eo_ref_get(eo_obj), ___eo_ref2_get(eo_obj));
-                  ___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);
+                  ERR("Killing Zombie Object [%p] ref=%i:%i\n", eo_obj, efl_ref_get(eo_obj), ___efl_ref2_get(eo_obj));
+                  ___efl_ref2_reset(eo_obj);
+                  while (efl_ref_get(eo_obj) > 1) efl_unref(eo_obj);
+                  while (efl_ref_get(eo_obj) < 1) efl_ref(eo_obj);
                   efl_del(eo_obj);
                }
           }
@@ -350,7 +350,7 @@ _evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e)
    eina_spinlock_free(&(e->render.lock));
 
    e->magic = 0;
-   efl_destructor(eo_super(eo_e, MY_CLASS));
+   efl_destructor(efl_super(eo_e, MY_CLASS));
 }
 
 EOLIAN static Evas_Engine_Info*
@@ -613,7 +613,7 @@ _evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
 {
    if (klass == EVAS_CANVAS_CLASS)
      return eo_e;
-   return efl_provider_find(eo_super(eo_e, MY_CLASS), klass);
+   return efl_provider_find(efl_super(eo_e, MY_CLASS), klass);
 }
 
 Ector_Surface *
@@ -642,9 +642,9 @@ _image_data_unset(Evas_Object_Protected_Data *obj, Eina_List **list)
         return;
      }
 #define CHECK(TYPE, STRUCT, FREE) \
-   if (eo_isa(obj->object, TYPE))\
+   if (efl_isa(obj->object, TYPE))\
      {\
-        STRUCT *data = eo_data_scope_get(obj->object, TYPE);\
+        STRUCT *data = efl_data_scope_get(obj->object, TYPE);\
         FREE; \
         data->engine_data = NULL;\
      }
@@ -669,7 +669,7 @@ _image_data_unset(Evas_Object_Protected_Data *obj, Eina_List **list)
 EAPI Eina_List *
 _evas_canvas_image_data_unset(Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, MY_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, MY_CLASS);
    Evas_Layer *lay;
    Eina_List *list = NULL;
 
@@ -706,12 +706,12 @@ _image_data_regenerate(Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_change(eo_obj, obj);
 #define CHECK(TYPE, STRUCT, REGEN) \
-   if (eo_isa(eo_obj, TYPE))\
+   if (efl_isa(eo_obj, TYPE))\
      {\
-        STRUCT *data = eo_data_scope_get(eo_obj, TYPE);\
+        STRUCT *data = efl_data_scope_get(eo_obj, TYPE);\
         REGEN; \
      }
    CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
@@ -743,7 +743,7 @@ evas_output_framespace_set(Evas *eo_e, Evas_Coord x, Evas_Coord y, Evas_Coord w,
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if ((x == e->framespace.x) && (y == e->framespace.y) &&
        (w == e->framespace.w) && (h == e->framespace.h)) return;
@@ -764,7 +764,7 @@ evas_output_framespace_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (x) *x = e->framespace.x;
    if (y) *y = e->framespace.y;
@@ -779,7 +779,7 @@ evas_output_method_set(Evas *eo_e, int render_method)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    Evas_Module *em;
 
@@ -813,7 +813,7 @@ evas_output_method_get(const Evas *eo_e)
    return RENDER_METHOD_INVALID;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    return e->output.render_method;
 }
@@ -825,7 +825,7 @@ evas_output_size_set(Evas *eo_e, int w, int h)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if ((w == e->output.w) && (h == e->output.h)) return;
    if (w < 1) w = 1;
@@ -847,7 +847,7 @@ evas_output_size_get(const Evas *eo_e, int *w, int *h)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (w) *w = e->output.w;
    if (h) *h = e->output.h;
@@ -860,7 +860,7 @@ evas_output_viewport_set(Evas *eo_e, Evas_Coord x, Evas_Coord y, Evas_Coord w, E
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if ((x == e->viewport.x) && (y == e->viewport.y) &&
        (w == e->viewport.w) && (h == e->viewport.h)) return;
@@ -890,7 +890,7 @@ evas_output_viewport_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_Co
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (x) *x = e->viewport.x;
    if (y) *y = e->viewport.y;
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index dd00d298e6..113723c2d7 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -6,7 +6,7 @@ static void
 _evas_map_calc_geom_change(Evas_Object *eo_obj)
 {
    int is, was = 0;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return;
    evas_object_change(eo_obj, obj);
    evas_object_clip_dirty(eo_obj, obj);
@@ -37,7 +37,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj)
    const Evas_Map_Point *p, *p_end;
    Eina_Bool ch = EINA_FALSE;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return;
    if (!obj->map->cur.map) return;
    if (obj->map->prev.map)
@@ -117,7 +117,7 @@ evas_object_map_move_sync(Evas_Object *eo_obj)
    Evas_Coord diff_x, diff_y;
    int i, count;
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return;
 
    if ((!obj->map->cur.map->move_sync.enabled) ||
@@ -210,7 +210,7 @@ _evas_map_free(Evas_Object *eo_obj, Evas_Map *m)
 {
    if (eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if ((obj) && (obj->map->spans))
           {
              obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans);
@@ -454,7 +454,7 @@ _evas_object_map_parent_check(Evas_Object *eo_parent)
    const Evas_Object_Protected_Data *o;
 
    if (!eo_parent) return EINA_FALSE;
-   Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *parent = efl_data_scope_get(eo_parent, EFL_CANVAS_OBJECT_CLASS);
    if (!parent) return EINA_FALSE;
    list = evas_object_smart_members_get_direct(parent->smart.parent);
    EINA_INLIST_FOREACH(list, o)
@@ -524,7 +524,7 @@ _map_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
         Evas_Object_Protected_Data *parents = NULL;
         for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent)
           {
-             parents = eo_data_scope_get(eo_parents, EFL_CANVAS_OBJECT_CLASS);
+             parents = efl_data_scope_get(eo_parents, EFL_CANVAS_OBJECT_CLASS);
              if (!parents) break;
              parents->child_has_map = EINA_TRUE;
           }
@@ -539,7 +539,7 @@ _map_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
 EOLIAN void
 _efl_canvas_object_efl_gfx_map_map_enable_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool enabled)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    _map_map_enable_set(eo_obj, obj, enabled, EINA_TRUE);
 }
@@ -555,7 +555,7 @@ evas_object_map_enable_set(Efl_Gfx_Map *eo_obj, Eina_Bool enabled)
 EOLIAN Eina_Bool
 _efl_canvas_object_efl_gfx_map_map_enable_get(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    return obj->map->cur.usemap;
 }
 
@@ -914,7 +914,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return;
    if (m->count != 4)
@@ -936,7 +936,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return;
    if (m->count != 4)
@@ -1329,7 +1329,7 @@ evas_object_map_update(Evas_Object *eo_obj,
                        int imagew, int imageh,
                        int uvw, int uvh)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    const Evas_Map_Point *p, *p_end;
    RGBA_Map_Point *pts, *pt;
 
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 632f97fad5..1e75884894 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -4,8 +4,8 @@
 EAPI void
 evas_object_name_set(Evas_Object *eo_obj, const char *name)
 {
-   Evas_Object_Protected_Data *obj = eo_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ?
-            eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL;
+   Evas_Object_Protected_Data *obj = efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ?
+            efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL;
    if (!obj) return;
    if (obj->name)
      {
@@ -25,8 +25,8 @@ evas_object_name_set(Evas_Object *eo_obj, const char *name)
 EAPI const char *
 evas_object_name_get(const Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ?
-            eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL;
+   Evas_Object_Protected_Data *obj = efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ?
+            efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL;
    if (!obj) return NULL;
    return obj->name;
 }
@@ -44,7 +44,7 @@ _priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, i
    const Eina_Inlist *lst;
    Evas_Object_Protected_Data *child;
 
-   if (!eo_isa(eo_obj, EFL_CANVAS_GROUP_CLASS)) return NULL;
+   if (!efl_isa(eo_obj, EFL_CANVAS_GROUP_CLASS)) return NULL;
    lst = evas_object_smart_members_get_direct(eo_obj);
    EINA_INLIST_FOREACH(lst, child)
      {
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index d6c8eb96cf..e8d4dce2bb 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -39,7 +39,7 @@ static const Evas_Smart_Cb_Description _signals[] =
 static void _sizing_eval(Evas_Object *obj);
 
 #define EVAS_OBJECT_BOX_DATA_GET(o, ptr) \
-   Evas_Object_Box_Data *ptr = eo_data_scope_get(o, MY_CLASS)
+   Evas_Object_Box_Data *ptr = efl_data_scope_get(o, MY_CLASS)
 
 #define EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, ptr)                      \
    EVAS_OBJECT_BOX_DATA_GET(o, ptr);                                    \
@@ -161,7 +161,7 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
    return opt;
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
   { EFL_GFX_EVENT_RESIZE, _on_child_resize },
   { EFL_EVENT_DEL, _on_child_del },
   { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
@@ -382,7 +382,7 @@ _evas_box_efl_canvas_group_group_add(Eo *eo_obj, Evas_Object_Box_Data *priv)
 {
    Evas_Object_Smart_Clipped_Data *cso;
 
-   efl_canvas_group_add(eo_super(eo_obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(eo_obj, MY_CLASS));
    
    evas_object_event_callback_add
      (eo_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, eo_obj);
@@ -397,7 +397,7 @@ _evas_box_efl_canvas_group_group_add(Eo *eo_obj, Evas_Object_Box_Data *priv)
 
    // make sure evas box smart data is fully initialized and set (for legacy)
    // this assumes only box and smart clipped access the smart data
-   cso = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
+   cso = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
    priv->base = *cso;
    evas_object_smart_data_set(eo_obj, priv);
 }
@@ -420,7 +420,7 @@ _evas_box_efl_canvas_group_group_del(Eo *o, Evas_Object_Box_Data *priv)
    if (priv->layout.data && priv->layout.free_data)
      priv->layout.free_data(priv->layout.data);
 
-   efl_canvas_group_del(eo_super(o, MY_CLASS));
+   efl_canvas_group_del(efl_super(o, MY_CLASS));
 }
 
 EOLIAN static void
@@ -459,14 +459,14 @@ evas_object_box_add(Evas *evas)
    MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *obj = eo_add(MY_CLASS, evas);
+   Evas_Object *obj = efl_add(MY_CLASS, evas);
    return obj;
 }
 
 EOLIAN static Eo *
 _evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_object_smart_callbacks_descriptions_set(obj, _signals);
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 2077e21f63..5d04b1cf9a 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -43,7 +43,7 @@ struct _Evas_Object_Grid_Accessor
 };
 
 #define EVAS_OBJECT_GRID_DATA_GET(o, ptr)			\
-  Evas_Grid_Data *ptr = eo_data_scope_get(o, MY_CLASS)
+  Evas_Grid_Data *ptr = efl_data_scope_get(o, MY_CLASS)
 
 #define EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, ptr)			\
   EVAS_OBJECT_GRID_DATA_GET(o, ptr);					\
@@ -166,7 +166,7 @@ _evas_object_grid_smart_add(Evas_Object *o)
    priv = evas_object_smart_data_get(o);
    if (!priv)
      {
-        priv = eo_data_ref(o, MY_CLASS);
+        priv = efl_data_ref(o, MY_CLASS);
         evas_object_smart_data_set(o, priv);
      }
 
@@ -265,14 +265,14 @@ evas_object_grid_add(Evas *evas)
    MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *obj = eo_add(MY_CLASS, evas);
+   Evas_Object *obj = efl_add(MY_CLASS, evas);
    return obj;
 }
 
 EOLIAN static Eo *
 _evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_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 98989eecfc..975c34f920 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -171,10 +171,10 @@ _init_cow(void)
 EOLIAN static Eo *
 _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_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Colorspace cspace;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    evas_object_image_init(eo_obj);
 
@@ -203,7 +203,7 @@ _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 efl_finalize(eo_super(eo_obj, MY_CLASS));
+   return efl_finalize(efl_super(eo_obj, MY_CLASS));
 }
 
 void
@@ -344,7 +344,7 @@ _evas_image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Dat
 void
 _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orient orient)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int iw, ih;
 
    if (o->cur->orient == orient) return;
@@ -465,8 +465,8 @@ _efl_canvas_image_internal_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Evas_Image
 EOLIAN static void
 _efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Efl_Dbg_Info *root)
 {
-   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_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    const char *file, *key;
    if (o->cur->mmaped_source)
@@ -475,16 +475,16 @@ _efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *
      file = o->cur->u.file;
    key = o->cur->key;
 
-   EO_DBG_INFO_APPEND(group, "Image File", EINA_VALUE_TYPE_STRING, file);
-   EO_DBG_INFO_APPEND(group, "Key", EINA_VALUE_TYPE_STRING, key);
-   EO_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64,
+   EFL_DBG_INFO_APPEND(group, "Image File", EINA_VALUE_TYPE_STRING, file);
+   EFL_DBG_INFO_APPEND(group, "Key", EINA_VALUE_TYPE_STRING, key);
+   EFL_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64,
                           (uint64_t) (uintptr_t) evas_object_image_source_get(eo_obj));
 
    if (efl_image_load_error_get(eo_obj) != EFL_IMAGE_LOAD_ERROR_NONE)
      {
         Evas_Load_Error error = EVAS_LOAD_ERROR_GENERIC;
         error = (Evas_Load_Error) _evas_image_load_error_get(eo_obj);
-        EO_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING,
+        EFL_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING,
                            evas_load_error_str(error));
      }
 }
@@ -492,7 +492,7 @@ _efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *
 EOLIAN static void
 _efl_canvas_image_internal_efl_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (l < 0) l = 0;
    if (r < 0) r = 0;
@@ -528,7 +528,7 @@ _efl_canvas_image_internal_efl_image_border_get(Eo *eo_obj EINA_UNUSED, Evas_Ima
 EOLIAN static void
 _efl_canvas_image_internal_efl_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Border_Fill_Mode _fill)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Border_Fill_Mode fill = (Evas_Border_Fill_Mode) _fill;
 
    if (fill == o->cur->border.fill) return;
@@ -550,7 +550,7 @@ _efl_canvas_image_internal_efl_image_border_center_fill_get(Eo *eo_obj EINA_UNUS
 EOLIAN static void
 _efl_canvas_image_internal_efl_gfx_fill_fill_auto_set(Eo *eo_obj, Evas_Image_Data* o, Eina_Bool setting)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    setting = !!setting;
    o->filled_set = 1;
    if (o->filled == setting) return;
@@ -582,7 +582,7 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_auto_get(Eo *eo_obj EINA_UNUSED, Ev
 EOLIAN static void
 _efl_canvas_image_internal_efl_image_border_scale_set(Eo *eo_obj, Evas_Image_Data *o, double scale)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (scale == o->cur->border.scale) return;
    evas_object_async_block(obj);
@@ -603,7 +603,7 @@ _efl_canvas_image_internal_efl_image_border_scale_get(Eo *eo_obj EINA_UNUSED, Ev
 void
 _evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (w == 0) return;
    if (h == 0) return;
@@ -657,9 +657,9 @@ _efl_canvas_image_internal_efl_gfx_view_view_size_get(Eo *eo_obj, Evas_Image_Dat
    Evas_Object_Protected_Data *source = NULL;
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (o->cur->source)
-     source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+     source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
 
    if (o->cur->scene)
      {
@@ -677,7 +677,7 @@ _efl_canvas_image_internal_efl_gfx_view_view_size_get(Eo *eo_obj, Evas_Image_Dat
         uvh = source->proxy->h;
      }
    else if (source->type == o_type &&
-            ((Evas_Image_Data *)eo_data_scope_get(o->cur->source, MY_CLASS))->engine_data)
+            ((Evas_Image_Data *)efl_data_scope_get(o->cur->source, MY_CLASS))->engine_data)
      {
         uvw = source->cur->geometry.w;
         uvh = source->cur->geometry.h;
@@ -695,7 +695,7 @@ _efl_canvas_image_internal_efl_gfx_view_view_size_get(Eo *eo_obj, Evas_Image_Dat
 EOLIAN static void
 _efl_canvas_image_internal_efl_gfx_buffer_buffer_update_add(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Eina_Rectangle *r;
    int cnt;
 
@@ -738,7 +738,7 @@ _efl_canvas_image_internal_efl_gfx_buffer_buffer_update_add(Eo *eo_obj, Evas_Ima
 EOLIAN static void
 _efl_canvas_image_internal_efl_gfx_buffer_alpha_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool has_alpha)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_async_block(obj);
    if ((o->preloading) && (o->engine_data))
@@ -790,7 +790,7 @@ _efl_canvas_image_internal_efl_gfx_buffer_alpha_get(Eo *eo_obj EINA_UNUSED, Evas
 EOLIAN static void
 _efl_canvas_image_internal_efl_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool smooth_scale)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_async_block(obj);
    if (((smooth_scale) && (o->cur->smooth_scale)) ||
@@ -830,8 +830,8 @@ _efl_canvas_image_internal_efl_file_save(const Eo *eo_obj, Evas_Image_Data *o, c
    int imagew, imageh;
    void *pixels;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *source = (o->cur->source ? eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS) : NULL);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *source = (o->cur->source ? efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS) : NULL);
 
    evas_object_async_block(obj);
 
@@ -857,10 +857,10 @@ _efl_canvas_image_internal_efl_file_save(const Eo *eo_obj, Evas_Image_Data *o, c
         imageh = source->proxy->h;
      }
    else if (source->type == o_type &&
-            ((Evas_Image_Data *)eo_data_scope_get(o->cur->source, MY_CLASS))->engine_data)
+            ((Evas_Image_Data *)efl_data_scope_get(o->cur->source, MY_CLASS))->engine_data)
      {
         Evas_Image_Data *oi;
-        oi = eo_data_scope_get(o->cur->source, MY_CLASS);
+        oi = efl_data_scope_get(o->cur->source, MY_CLASS);
         pixels = oi->engine_data;
         imagew = oi->cur->image.w;
         imageh = oi->cur->image.h;
@@ -1016,8 +1016,8 @@ _on_image_native_surface_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_O
 Eina_Bool
 _evas_image_native_surface_set(Eo *eo_obj, Evas_Native_Surface *surf)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    evas_object_event_callback_del_full
      (eo_obj, EVAS_CALLBACK_DEL, _on_image_native_surface_del, NULL);
@@ -1038,8 +1038,8 @@ _evas_image_native_surface_set(Eo *eo_obj, Evas_Native_Surface *surf)
 Evas_Native_Surface *
 _evas_image_native_surface_get(const Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Native_Surface *surf = NULL;
 
    if (ENFN->image_native_get)
@@ -1051,7 +1051,7 @@ _evas_image_native_surface_get(const Evas_Object *eo_obj)
 EOLIAN static void
 _efl_canvas_image_internal_efl_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Image_Scale_Hint hint)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (o->scale_hint == hint) return;
    o->scale_hint = hint;
@@ -1084,7 +1084,7 @@ _efl_canvas_image_internal_efl_image_scale_hint_get(Eo *eo_obj EINA_UNUSED, Evas
 EOLIAN static void
 _efl_canvas_image_internal_efl_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Image_Content_Hint hint)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (o->content_hint == hint) return;
    o->content_hint = hint;
@@ -1137,7 +1137,7 @@ _evas_canvas_image_cache_reload(Eo *eo_e, Evas_Public_Data *e)
         layer->walking_objects++;
         EINA_INLIST_FOREACH(layer->objects, obj)
           {
-             if (eo_isa(obj->object, MY_CLASS))
+             if (efl_isa(obj->object, MY_CLASS))
                {
                   _evas_image_unload(obj->object, obj, 1);
                   evas_object_inform_call_image_unloaded(obj->object);
@@ -1154,9 +1154,9 @@ _evas_canvas_image_cache_reload(Eo *eo_e, Evas_Public_Data *e)
         layer->walking_objects++;
         EINA_INLIST_FOREACH(layer->objects, obj)
           {
-             if (eo_isa(obj->object, MY_CLASS))
+             if (efl_isa(obj->object, MY_CLASS))
                {
-                  Evas_Image_Data *o = eo_data_scope_get(obj->object, MY_CLASS);
+                  Evas_Image_Data *o = efl_data_scope_get(obj->object, MY_CLASS);
                   _evas_image_load(obj->object, obj, o);
                   o->changed = EINA_TRUE;
                   evas_object_change(obj->object, obj);
@@ -1206,7 +1206,7 @@ _evas_image_unload(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo
    Evas_Image_Data *o;
    Eina_Bool resize_call = EINA_FALSE;
 
-   o = eo_data_scope_get(eo_obj, MY_CLASS);
+   o = efl_data_scope_get(eo_obj, MY_CLASS);
    if ((!o->cur->u.file) ||
        (o->pixels_checked_out > 0)) return;
 
@@ -1363,22 +1363,22 @@ evas_object_image_figure_y_fill(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
 static void
 evas_object_image_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 }
 
 EOLIAN static void
 _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);
+   Evas_Object_Protected_Data *obj = efl_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);
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 void
@@ -1386,9 +1386,9 @@ _evas_object_image_free(Evas_Object *obj)
 {
    Evas_Image_Data *o;
 
-   EINA_SAFETY_ON_FALSE_RETURN(eo_isa(obj, MY_CLASS));
+   EINA_SAFETY_ON_FALSE_RETURN(efl_isa(obj, MY_CLASS));
 
-   o = eo_data_scope_get(obj, MY_CLASS);
+   o = efl_data_scope_get(obj, MY_CLASS);
 
    // eina_cow_free reset the pointer to the default read only state
    eina_cow_free(evas_object_image_load_opts_cow, (const Eina_Cow_Data**) &o->load_opts);
@@ -1400,7 +1400,7 @@ _evas_object_image_free(Evas_Object *obj)
 static void
 evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Eina_Rectangle *r;
 
    /* free obj */
@@ -1629,7 +1629,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
 EOLIAN static void
 _efl_canvas_image_internal_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Image_Data *o)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    o->changed = 1;
    evas_object_change(eo_obj, obj);
@@ -1646,7 +1646,7 @@ _efl_canvas_image_internal_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Image
                                                              const char *code, const char *name)
 {
    pd->has_filter = (code != NULL);
-   efl_gfx_filter_program_set(eo_super(obj, MY_CLASS), code, name);
+   efl_gfx_filter_program_set(efl_super(obj, MY_CLASS), code, name);
 }
 
 EOLIAN static Eina_Bool
@@ -1655,7 +1655,7 @@ _efl_canvas_image_internal_efl_canvas_filter_internal_filter_input_render(Eo *eo
                                                            int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
                                                            Eina_Bool do_async)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Filter_Context *filter = _filter;
    void *surface, *output;
    Eina_Bool input_stolen;
@@ -1793,10 +1793,10 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
 
    Evas_Object_Protected_Data *source =
       (o->cur->source ?
-       eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS):
+       efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS):
        NULL);
    if (source && (source->type == o_type))
-     oi = eo_data_scope_get(o->cur->source, MY_CLASS);
+     oi = efl_data_scope_get(o->cur->source, MY_CLASS);
 
    if (o->cur->scene)
      {
@@ -2160,7 +2160,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj,
    /* Proxy: Do it early */
    if (o->cur->source)
      {
-        Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
         if (source->proxy->redraw || source->changed)
           {
              /* XXX: Do I need to sort out the map here? */
@@ -2580,21 +2580,21 @@ evas_object_image_render_post(Evas_Object *eo_obj,
 
 static unsigned int evas_object_image_id_get(Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_IMAGE;
 }
 
 static unsigned int evas_object_image_visual_id_get(Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_IMAGE;
 }
 
 static void *evas_object_image_engine_data_get(Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
    return o->engine_data;
 }
@@ -2639,7 +2639,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj EINA_UNUSED,
         // FIXME: use proxy
         if (o->cur->source)
           {
-             Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *cur_source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
              EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
                {
                   state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source);
@@ -2831,7 +2831,7 @@ evas_object_image_is_inside(Evas_Object *eo_obj,
     */
    Evas_Object_Protected_Data *source =
       (o->cur->source ?
-       eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS):
+       efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS):
        NULL);
 
    if (o->cur->scene)
@@ -2860,10 +2860,10 @@ evas_object_image_is_inside(Evas_Object *eo_obj,
         uvh = imageh;
      }
    else if (source->type == o_type &&
-            ((Evas_Image_Data *)eo_data_scope_get(o->cur->source, MY_CLASS))->engine_data)
+            ((Evas_Image_Data *)efl_data_scope_get(o->cur->source, MY_CLASS))->engine_data)
      {
         Evas_Image_Data *oi;
-        oi = eo_data_scope_get(o->cur->source, MY_CLASS);
+        oi = efl_data_scope_get(o->cur->source, MY_CLASS);
         pixels = oi->engine_data;
         imagew = oi->cur->image.w;
         imageh = oi->cur->image.h;
@@ -3303,7 +3303,7 @@ _evas_image_data_convert_internal(Evas_Image_Data *o, void *data, Evas_Colorspac
 static void
 evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *einfo EINA_UNUSED)
 {
-   Evas_Image_Data *o = eo_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Coord w, h;
 
    efl_gfx_geometry_get(obj, NULL, NULL, &w, &h);
@@ -3315,22 +3315,22 @@ evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UN
 Eina_Bool
 _evas_object_image_preloading_get(const Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->preloading;
 }
 
 void
 _evas_object_image_preloading_set(Evas_Object *eo_obj, Eina_Bool preloading)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    o->preloading = preloading;
 }
 
 void
 _evas_object_image_preloading_check(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (ENFN->image_load_error_get)
       o->load_error = ENFN->image_load_error_get(ENDT, o->engine_data);
 }
@@ -3338,15 +3338,15 @@ _evas_object_image_preloading_check(Evas_Object *eo_obj)
 Evas_Object *
 _evas_object_image_videfl_parent_get(Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->video_surface ? o->pixels->video.parent : NULL;
 }
 
 void
 _evas_object_image_video_overlay_show(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (obj->cur->cache.clip.x != obj->prev->cache.clip.x ||
        obj->cur->cache.clip.y != obj->prev->cache.clip.y ||
@@ -3384,8 +3384,8 @@ _evas_object_image_video_overlay_show(Evas_Object *eo_obj)
 void
 _evas_object_image_video_overlay_hide(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (o->video_visible || o->created)
      {
@@ -3401,8 +3401,8 @@ _evas_object_image_video_overlay_hide(Evas_Object *eo_obj)
 void
 _evas_object_image_video_overlay_do(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Public_Data *e = obj->layer->evas;
 
    if (o->delayed.video_move)
@@ -3430,7 +3430,7 @@ _evas_object_image_video_overlay_do(Evas_Object *eo_obj)
 void *
 _evas_object_image_surface_get(Evas_Object *eo, Evas_Object_Protected_Data *obj)
 {
-   Evas_Image_Data *pd = eo_data_scope_get(eo, MY_CLASS);
+   Evas_Image_Data *pd = efl_data_scope_get(eo, MY_CLASS);
 
    if (pd->engine_data &&
        (pd->cur->image.w == obj->cur->geometry.w) &&
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 8c2144b441..cdce47fcc1 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -6,7 +6,7 @@
 void
 evas_object_inform_call_show(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter, NULL, NULL);
@@ -16,7 +16,7 @@ evas_object_inform_call_show(Evas_Object *eo_obj)
 void
 evas_object_inform_call_hide(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter, NULL, NULL);
@@ -35,7 +35,7 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
 void
 evas_object_inform_call_resize(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter, NULL, NULL);
@@ -45,7 +45,7 @@ evas_object_inform_call_resize(Evas_Object *eo_obj)
 void
 evas_object_inform_call_restack(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter, NULL, NULL);
@@ -55,7 +55,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj)
 void
 evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter, NULL, NULL);
@@ -65,7 +65,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj)
 void
 evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    EINA_SAFETY_ON_NULL_RETURN(obj);
 
    if (!_evas_object_image_preloading_get(eo_obj)) return;
@@ -80,7 +80,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
 void
 evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
 
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter, NULL, NULL);
@@ -90,7 +90,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
 void
 evas_object_inform_call_image_resize(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    _evas_object_event_new();
    evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter, NULL, NULL);
    _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index 485a1db49f..72d10f608d 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -9,7 +9,7 @@ static void evas_object_intercept_deinit(Evas_Object *eo_obj);
 static void
 evas_object_intercept_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj->interceptors)
      obj->interceptors = evas_mem_calloc(sizeof(Evas_Intercept_Func));
 }
@@ -17,7 +17,7 @@ evas_object_intercept_init(Evas_Object *eo_obj)
 static void
 evas_object_intercept_deinit(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj->interceptors) return;
    if ((obj->interceptors->show.func) ||
        (obj->interceptors->hide.func) ||
@@ -41,7 +41,7 @@ evas_object_intercept_deinit(Evas_Object *eo_obj)
 void
 evas_object_intercept_cleanup(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (obj->interceptors) free(obj->interceptors);
 }
 
@@ -203,7 +203,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected
      MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);                       \
      return;                                                            \
      MAGIC_CHECK_END();                                                 \
-     Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
+     Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
      if (!func) return;                                                 \
      evas_object_intercept_init(eo_obj);                                \
      if (!obj->interceptors) return;                                    \
@@ -220,7 +220,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected
      MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);                       \
      return NULL;                                                       \
      MAGIC_CHECK_END();                                                 \
-     Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
+     Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
      if (!func) return NULL;                                            \
      if (!obj->interceptors) return NULL;                               \
      obj->interceptors->Lower_Type.func = NULL;                         \
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 3597bd3a6e..00d8076402 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -97,7 +97,7 @@ evas_object_line_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(EVAS_LINE_CLASS, e);
+   Evas_Object *eo_obj = efl_add(EVAS_LINE_CLASS, e);
    return eo_obj;
 }
 
@@ -113,7 +113,7 @@ _evas_line_xy_set(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord x1, Evas_Coord y1,
    return;
    MAGIC_CHECK_END();
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if ((x1 == (obj->cur->geometry.x + o->cur.x1)) &&
        (y1 == (obj->cur->geometry.y + o->cur.y1)) &&
@@ -197,7 +197,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y
    const Evas_Line_Data *o = _pd;
 
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (x1) *x1 = obj->cur->geometry.x + o->cur.x1;
    if (y1) *y1 = obj->cur->geometry.y + o->cur.y1;
    if (x2) *x2 = obj->cur->geometry.x + o->cur.x2;
@@ -208,10 +208,10 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y
 static void
 evas_object_line_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 }
 
@@ -220,7 +220,7 @@ _evas_line_efl_object_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UN
 {
    Evas_Line_Data *o;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    evas_object_line_init(eo_obj);
 
@@ -374,21 +374,21 @@ evas_object_line_render_post(Evas_Object *eo_obj,
 
 static unsigned int evas_object_line_id_get(Evas_Object *eo_obj)
 {
-   Evas_Line_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_LINE;
 }
 
 static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj)
 {
-   Evas_Line_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SHAPE;
 }
 
 static void *evas_object_line_engine_data_get(Evas_Object *eo_obj)
 {
-   Evas_Line_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->engine_data;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 43d3fc9519..6af0303840 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -143,7 +143,7 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
      }
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
+EFL_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
                           { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
                           { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
 
@@ -153,9 +153,9 @@ _efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data
    Eo *parent = NULL;
    Evas *evas;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
    efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME);
-   eo_manual_free_set(eo_obj, EINA_TRUE);
+   efl_manual_free_set(eo_obj, EINA_TRUE);
 
    parent = efl_parent_get(eo_obj);
    evas = evas_object_evas_get(parent);
@@ -185,7 +185,7 @@ _efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data
 void
 evas_object_change_reset(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return;
    obj->changed = EINA_FALSE;
    obj->changed_move = EINA_FALSE;
@@ -198,7 +198,7 @@ evas_object_change_reset(Evas_Object *eo_obj)
 void
 evas_object_cur_prev(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return;
    if (!obj->map->prev.valid_map && obj->map->prev.map)
      {
@@ -235,13 +235,13 @@ evas_object_cur_prev(Evas_Object *eo_obj)
 void
 evas_object_free(Evas_Object *eo_obj, int clean_layer)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return;
    obj->clean_layer = clean_layer;
 
    int was_smart_child = 0;
 
-   if (eo_isa(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+   if (efl_isa(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
      _evas_object_image_free(eo_obj);
    evas_object_map_set(eo_obj, NULL);
    if (obj->map->prev.map) evas_map_free(obj->map->prev.map);
@@ -310,13 +310,13 @@ evas_object_free(Evas_Object *eo_obj, int clean_layer)
    eina_cow_free(evas_object_state_cow, (const Eina_Cow_Data**) &obj->prev);
    eina_cow_free(evas_object_3d_cow, (const Eina_Cow_Data**) &obj->data_3d);
    eina_cow_free(evas_object_mask_cow, (const Eina_Cow_Data**) &obj->mask);
-   eo_data_unref(eo_obj, obj->private_data);
+   efl_data_unref(eo_obj, obj->private_data);
    obj->private_data = NULL;
 
    /* Try to manual free, and if it fails, unset it so the next unref will
     * actually free the object. */
-   if (!eo_manual_free(eo_obj))
-      eo_manual_free_set(eo_obj, EINA_FALSE);
+   if (!efl_manual_free(eo_obj))
+      efl_manual_free_set(eo_obj, EINA_FALSE);
 }
 
 void
@@ -352,7 +352,7 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
      }
    EINA_LIST_FOREACH(obj->proxy->proxies, l, eo_obj2)
      {
-        obj2 = eo_data_scope_get(eo_obj2, MY_CLASS);
+        obj2 = efl_data_scope_get(eo_obj2, MY_CLASS);
 
         if (!obj2) continue;
         evas_object_change(eo_obj2, obj2);
@@ -363,7 +363,7 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
      }
    if (obj->smart.parent)
      {
-        Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, MY_CLASS);
+        Evas_Object_Protected_Data *smart_parent = efl_data_scope_get(obj->smart.parent, MY_CLASS);
         if (!smart_parent) return;
         evas_object_change(obj->smart.parent, smart_parent);
      }
@@ -392,7 +392,7 @@ evas_object_content_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 void
 evas_object_render_pre_visible_change(Eina_Array *rects, Evas_Object *eo_obj, int is_v, int was_v)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!obj) return;
    if (obj->is_smart) return;
@@ -418,7 +418,7 @@ evas_object_render_pre_visible_change(Eina_Array *rects, Evas_Object *eo_obj, in
 void
 evas_object_render_pre_clipper_change(Eina_Array *rects, Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!obj) return;
    if (obj->is_smart) return;
@@ -510,7 +510,7 @@ evas_object_render_pre_prev_cur_add(Eina_Array *rects, Evas_Object *eo_obj EINA_
 void
 evas_object_clip_changes_clean(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return;
 
    Eina_Rectangle *r;
@@ -522,7 +522,7 @@ evas_object_clip_changes_clean(Evas_Object *eo_obj)
 void
 evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *eo_obj, int is_v, int was_v EINA_UNUSED)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    Eina_Rectangle *r;
    Eina_List *l;
    unsigned int i;
@@ -679,9 +679,9 @@ evas_object_ref(Evas_Object *eo_obj)
    return;
    MAGIC_CHECK_END();
 
-   eo_ref(eo_obj);
+   efl_ref(eo_obj);
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return;
    obj->ref++;
 }
@@ -693,12 +693,12 @@ evas_object_unref(Evas_Object *eo_obj)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return;
 
    if (obj->ref == 0) return;
    obj->ref--;
-   eo_unref(eo_obj);
+   efl_unref(eo_obj);
    if ((obj->del_ref) && (obj->ref == 0)) evas_object_del(eo_obj);
 
 }
@@ -710,7 +710,7 @@ evas_object_ref_get(const Evas_Object *eo_obj)
    return 0;
    MAGIC_CHECK_END();
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!obj) return 0;
    return obj->ref;
 }
@@ -723,7 +723,7 @@ evas_object_del(Evas_Object *eo_obj)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!obj) return;
    evas_object_async_block(obj);
@@ -773,7 +773,7 @@ _efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data
    if (obj->name) evas_object_name_set(eo_obj, NULL);
    if (!obj->layer)
      {
-        eo_manual_free_set(eo_obj, EINA_FALSE);
+        efl_manual_free_set(eo_obj, EINA_FALSE);
         obj->clean_layer = 1;
         goto end;
      }
@@ -795,9 +795,9 @@ _efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data
    /* FIXME: Proxies should listen to source death */
    EINA_LIST_FOREACH_SAFE(obj->proxy->proxies, l, l2, proxy)
      {
-        if (eo_isa(proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+        if (efl_isa(proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
           evas_object_image_source_unset(proxy);
-        if (eo_isa(proxy, EFL_GFX_FILTER_INTERFACE))
+        if (efl_isa(proxy, EFL_GFX_FILTER_INTERFACE))
           efl_gfx_filter_source_set(proxy, NULL, eo_obj);
      }
 
@@ -830,7 +830,7 @@ end:
    evas_object_event_callback_all_del(eo_obj);
    evas_object_event_callback_cleanup(eo_obj);
 
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -1773,8 +1773,8 @@ evas_object_render_op_get(const Evas_Object *eo_obj)
 EOLIAN static void
 _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   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_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
    Efl_Dbg_Info *node;
    const char *name;
    double dblw, dblh;
@@ -1814,50 +1814,50 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
    propagate_event = efl_canvas_object_propagate_events_get(eo_obj);
    clipees_has = efl_canvas_object_clipees_has(eo_obj);
 
-   EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
+   EFL_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
 
    if (name)
-      EO_DBG_INFO_APPEND(group, "Name", EINA_VALUE_TYPE_STRING, name);
+      EFL_DBG_INFO_APPEND(group, "Name", EINA_VALUE_TYPE_STRING, name);
 
-   EO_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, layer);
+   EFL_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, layer);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Position");
-   EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, x);
-   EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, y);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Position");
+   EFL_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, x);
+   EFL_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, y);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Size");
-   EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
-   EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Size");
+   EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
+   EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
 
-   EO_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, scale);
+   EFL_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, scale);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Min size");
-   EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, minw);
-   EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, minh);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Min size");
+   EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, minw);
+   EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, minh);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Max size");
-   EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, maxw);
-   EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, maxh);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Max size");
+   EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, maxw);
+   EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, maxh);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Request size");
-   EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, requestw);
-   EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, requesth);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Request size");
+   EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, requestw);
+   EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, requesth);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Align");
-   EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_DOUBLE, dblx);
-   EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_DOUBLE, dbly);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Align");
+   EFL_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_DOUBLE, dblx);
+   EFL_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_DOUBLE, dbly);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Weight");
-   EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_DOUBLE, dblw);
-   EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_DOUBLE, dblh);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Weight");
+   EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_DOUBLE, dblw);
+   EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_DOUBLE, dblh);
 
-   node = EO_DBG_INFO_LIST_APPEND(group, "Color");
-   EO_DBG_INFO_APPEND(node, "r", EINA_VALUE_TYPE_INT, r);
-   EO_DBG_INFO_APPEND(node, "g", EINA_VALUE_TYPE_INT, g);
-   EO_DBG_INFO_APPEND(node, "b", EINA_VALUE_TYPE_INT, b);
-   EO_DBG_INFO_APPEND(node, "a", EINA_VALUE_TYPE_INT, a);
+   node = EFL_DBG_INFO_LIST_APPEND(group, "Color");
+   EFL_DBG_INFO_APPEND(node, "r", EINA_VALUE_TYPE_INT, r);
+   EFL_DBG_INFO_APPEND(node, "g", EINA_VALUE_TYPE_INT, g);
+   EFL_DBG_INFO_APPEND(node, "b", EINA_VALUE_TYPE_INT, b);
+   EFL_DBG_INFO_APPEND(node, "a", EINA_VALUE_TYPE_INT, a);
 
-   EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, focus);
+   EFL_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, focus);
 
      {
         const char *text = NULL;
@@ -1878,42 +1878,42 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
           }
 
         if (text)
-           EO_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, text);
+           EFL_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, text);
      }
 
-   EO_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, pass_event);
-   EO_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, repeat_event);
-   EO_DBG_INFO_APPEND(group, "Propagate Events", EINA_VALUE_TYPE_CHAR, propagate_event);
-   EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has);
+   EFL_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, pass_event);
+   EFL_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, repeat_event);
+   EFL_DBG_INFO_APPEND(group, "Propagate Events", EINA_VALUE_TYPE_CHAR, propagate_event);
+   EFL_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has);
 
    Evas_Object *clipper = NULL;
    clipper = efl_canvas_object_clip_get(eo_obj);
-   EO_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper);
+   EFL_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper);
 
    const Evas_Map *map = evas_object_map_get(eo_obj);
    if (map)
      {  /* Save map coords count info if object has map */
-        node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map");
+        node = EFL_DBG_INFO_LIST_APPEND(group, "Evas Map");
         int points_count = evas_map_count_get(map);
-        Efl_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points");
-        Efl_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV");
+        Efl_Dbg_Info *points = EFL_DBG_INFO_LIST_APPEND(node, "Points");
+        Efl_Dbg_Info *pointsuv = EFL_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);
-                  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);
+                  Efl_Dbg_Info *point = EFL_DBG_INFO_LIST_APPEND(points, "Points");
+                  EFL_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px);
+                  EFL_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py);
+                  EFL_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz);
                }
 
                {
                   double pu, pv;
                   evas_map_point_image_uv_get(map, i, &pu, &pv);
-                  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);
+                  Efl_Dbg_Info *point = EFL_DBG_INFO_LIST_APPEND(pointsuv, "Image UV");
+                  EFL_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu);
+                  EFL_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv);
                }
           }
      }
@@ -1927,7 +1927,7 @@ _efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_
         if ((obj->delete_me) || (!obj->layer)) return NULL;
         return obj->layer->evas->evas;
      }
-   return efl_provider_find(eo_super(eo_obj, MY_CLASS), klass);
+   return efl_provider_find(efl_super(eo_obj, MY_CLASS), klass);
 }
 
 EOLIAN Evas_Object*
@@ -1964,8 +1964,8 @@ _evas_canvas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eva
 EAPI Evas_Object *
 evas_object_top_at_pointer_get(const Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_isa(eo_e, EVAS_CANVAS_CLASS) ?
-            eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS) : NULL;
+   Evas_Public_Data *e = efl_isa(eo_e, EVAS_CANVAS_CLASS) ?
+            efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS) : NULL;
    if (!e) return NULL;
    return evas_canvas_object_top_at_xy_get((Eo *)eo_e, e->pointer.x, e->pointer.y, EINA_TRUE, EINA_TRUE);
 }
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 2f9fbc470a..7ed779b208 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -84,13 +84,13 @@ static const Evas_Object_Func object_func =
 EAPI Evas_Object *
 evas_object_polygon_add(Evas *e)
 {
-   return eo_add(MY_CLASS, e);
+   return efl_add(MY_CLASS, e);
 }
 
 EOLIAN static Eo *
 _efl_canvas_polygon_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED)
 {
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    evas_object_polygon_init(eo_obj);
 
@@ -100,7 +100,7 @@ _efl_canvas_polygon_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *
 EOLIAN static void
 _efl_canvas_polygon_point_add(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd, Evas_Coord x, Evas_Coord y)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Efl_Canvas_Polygon_Data *o = _pd;
    Efl_Canvas_Polygon_Point *p;
    Evas_Coord min_x, max_x, min_y, max_y;
@@ -207,7 +207,7 @@ _efl_canvas_polygon_point_add(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd, Evas_Coo
 EOLIAN static void
 _efl_canvas_polygon_points_clear(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Efl_Canvas_Polygon_Data *o = _pd;
    void *list_data;
    int is, was;
@@ -252,20 +252,20 @@ _efl_canvas_polygon_points_clear(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd)
 static void
 evas_object_polygon_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 }
 
 EOLIAN static void
 _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_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_polygon_free(eo_obj, obj, obj->private_data);
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 static void
@@ -441,21 +441,21 @@ evas_object_polygon_render_post(Evas_Object *eo_obj,
 
 static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Polygon_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_POLYGON;
 }
 
 static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Polygon_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SHAPE;
 }
 
 static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Polygon_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->engine_data;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 956ced2039..50a92481b6 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -95,14 +95,14 @@ evas_object_rectangle_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(EFL_CANVAS_RECTANGLE_CLASS, e);
+   Evas_Object *eo_obj = efl_add(EFL_CANVAS_RECTANGLE_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _efl_canvas_rectangle_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED)
 {
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    evas_object_rectangle_init(eo_obj);
 
@@ -113,10 +113,10 @@ _efl_canvas_rectangle_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Da
 static void
 evas_object_rectangle_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 }
 
@@ -381,21 +381,21 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
 
 static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_RECTANGLE;
 }
 
 static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SHAPE;
 }
 
 static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->engine_data;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 63b01ab084..b3d6acb0b8 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -7,8 +7,8 @@
 #define MY_CLASS_NAME_LEGACY "Evas_Object_Smart"
 
 #define EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, ...) \
-   Evas_Smart_Data *o = eo_isa(eo_obj, EFL_CANVAS_GROUP_CLASS) ? \
-     eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS) : NULL; \
+   Evas_Smart_Data *o = efl_isa(eo_obj, EFL_CANVAS_GROUP_CLASS) ? \
+     efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS) : NULL; \
    do { if (!o) { MAGIC_CHECK_FAILED(eo_obj,0,MAGIC_SMART) return __VA_ARGS__; } } while (0)
 
 extern Eina_Hash* signals_hash_table;
@@ -123,9 +123,9 @@ EAPI void
 evas_object_smart_data_set(Evas_Object *eo_obj, void *data)
 {
    EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj);
-   if (o->data) eo_data_unref(eo_obj, o->data);
+   if (o->data) efl_data_unref(eo_obj, o->data);
    o->data = data;
-   eo_data_ref(eo_obj, NULL);
+   efl_data_ref(eo_obj, NULL);
 }
 
 EAPI void *
@@ -146,7 +146,7 @@ evas_object_smart_interface_get(const Evas_Object *eo_obj,
    return NULL;
    MAGIC_CHECK_END();
 
-   if (!eo_isa(eo_obj, EFL_CANVAS_GROUP_CLASS)) return NULL;
+   if (!efl_isa(eo_obj, EFL_CANVAS_GROUP_CLASS)) return NULL;
 
    s = evas_object_smart_smart_get(eo_obj);
    if (!s) return NULL;
@@ -179,7 +179,7 @@ evas_object_smart_interface_data_get(const Evas_Object *eo_obj,
    return NULL;
    MAGIC_CHECK_END();
 
-   obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   obj = efl_data_scope_get(eo_obj, MY_CLASS);
    s = evas_object_smart_smart_get(eo_obj);
    if (!s) return NULL;
 
@@ -215,8 +215,8 @@ EOLIAN static void
 _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj)
 {
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *smart = efl_data_scope_get(smart_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart_Data *member_o = NULL;
 
    if ((!obj) || (!smart)) return;
@@ -261,14 +261,14 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
    obj->smart.parent_data = o;
    obj->smart.parent_object_data = smart;
    o->contained = eina_inlist_append(o->contained, EINA_INLIST_GET(obj));
-   eo_data_ref(eo_obj, NULL);
+   efl_data_ref(eo_obj, NULL);
    evas_object_smart_member_cache_invalidate(eo_obj, EINA_TRUE, EINA_TRUE,
                                              EINA_TRUE);
    obj->restack = 1;
 
    if (obj->is_smart)
      {
-        member_o = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS);
+        member_o = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS);
 
         if ((member_o->inherit_paragraph_direction) &&
             (member_o->paragraph_direction != o->paragraph_direction))
@@ -291,7 +291,7 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return;
    if (!obj->smart.parent) return;
    Evas_Object *smart_obj = obj->smart.parent;
@@ -301,19 +301,19 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
 EOLIAN static void
 _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart_Data *member_o;
 
    if (!obj->smart.parent) return;
 
    evas_object_async_block(obj);
-   Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *smart = efl_data_scope_get(smart_obj, EFL_CANVAS_OBJECT_CLASS);
    if (smart->smart.smart && smart->smart.smart->smart_class->member_del)
      smart->smart.smart->smart_class->member_del(smart_obj, eo_obj);
 
-   Evas_Smart_Data *o = eo_data_scope_get(smart_obj, MY_CLASS);
+   Evas_Smart_Data *o = efl_data_scope_get(smart_obj, MY_CLASS);
    o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(obj));
-   eo_data_unref(eo_obj, obj);
+   efl_data_unref(eo_obj, obj);
    o->member_count--;
    obj->smart.parent = NULL;
    evas_object_smart_member_cache_invalidate(eo_obj, EINA_TRUE, EINA_TRUE, EINA_TRUE);
@@ -327,7 +327,7 @@ _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUS
 
    if (obj->is_smart)
      {
-        member_o = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS);
+        member_o = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS);
 
         if ((member_o->inherit_paragraph_direction) &&
             (member_o->paragraph_direction != EVAS_BIDI_DIRECTION_NEUTRAL))
@@ -353,7 +353,7 @@ evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
    Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE);
 
    klass = eina_hash_find(_evas_smart_class_names_hash_table, type);
-   if (klass) type_check = eo_isa(eo_obj, klass);
+   if (klass) type_check = efl_isa(eo_obj, klass);
 
    /* Backward compatibility - walk over smart classes and compare type */
    if (EINA_FALSE == type_check)
@@ -382,7 +382,7 @@ evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type)
    Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE);
 
    klass = eina_hash_find(_evas_smart_class_names_hash_table, type);
-   if (klass) type_check = eo_isa(eo_obj, klass);
+   if (klass) type_check = efl_isa(eo_obj, klass);
 
    /* Backward compatibility - walk over smart classes and compare type */
    if (EINA_FALSE == type_check)
@@ -431,7 +431,7 @@ _efl_canvas_group_group_iterator_get_container(Evas_Object_Smart_Iterator *it)
 static void
 _efl_canvas_group_group_iterator_free(Evas_Object_Smart_Iterator *it)
 {
-   eo_unref(it->parent);
+   efl_unref(it->parent);
    free(it);
 }
 
@@ -440,7 +440,7 @@ EOLIAN static Eina_Iterator*
 _efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv)
 {
    Evas_Object_Smart_Iterator *it;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!priv->contained) return NULL;
 
@@ -449,7 +449,7 @@ _efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv
    if (!it) return NULL;
 
    EINA_MAGIC_SET(&it->iterator, EINA_MAGIC_ITERATOR);
-   it->parent = eo_ref(eo_obj);
+   it->parent = efl_ref(eo_obj);
    it->current = priv->contained;
 
    it->iterator.next = FUNC_ITERATOR_NEXT(_efl_canvas_group_group_iterator_next);
@@ -478,15 +478,15 @@ evas_object_smart_members_get_direct(const Evas_Object *eo_obj)
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   if (!eo_isa(eo_obj, MY_CLASS)) return NULL;
-   Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   if (!efl_isa(eo_obj, MY_CLASS)) return NULL;
+   Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->contained;
 }
 
 void
 _efl_canvas_group_group_members_all_del(Evas_Object *eo_obj)
 {
-   Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Protected_Data *memobj;
    Eina_Inlist *itrn;
    EINA_INLIST_FOREACH_SAFE(o->contained, itrn, memobj)
@@ -531,7 +531,7 @@ _evas_smart_class_ifaces_private_data_alloc(Evas_Object *eo_obj,
 
    if (!s->interfaces.size && !total_priv_sz) return;
 
-   obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   obj = efl_data_scope_get(eo_obj, MY_CLASS);
    obj->interface_privates = malloc(s->interfaces.size * sizeof(void *) + total_priv_sz);
    if (!obj->interface_privates)
      {
@@ -571,7 +571,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   eo_obj = eo_add(EFL_CANVAS_GROUP_CLASS, eo_e);
+   eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, eo_e);
    evas_object_smart_attach(eo_obj, s);
    return eo_obj;
 }
@@ -585,7 +585,7 @@ _efl_canvas_group_efl_object_constructor(Eo *eo_obj, Evas_Smart_Data *class_data
    smart->object = eo_obj;
    smart->inherit_paragraph_direction = EINA_TRUE;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
    evas_object_smart_init(eo_obj);
 
    efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY);
@@ -599,7 +599,7 @@ _efl_canvas_group_group_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->add) s->smart_class->add(eo_obj);
 }
@@ -614,7 +614,7 @@ _efl_canvas_group_group_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->resize) s->smart_class->resize(eo_obj, w, h);
 }
@@ -624,7 +624,7 @@ _efl_canvas_group_group_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Co
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->move) s->smart_class->move(eo_obj, x, y);
 }
@@ -634,7 +634,7 @@ _efl_canvas_group_group_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->show) s->smart_class->show(eo_obj);
 }
@@ -644,7 +644,7 @@ _efl_canvas_group_group_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->hide) s->smart_class->hide(eo_obj);
 }
@@ -654,7 +654,7 @@ _efl_canvas_group_group_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, in
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->color_set) s->smart_class->color_set(eo_obj, r, g, b, a);
 }
@@ -664,7 +664,7 @@ _efl_canvas_group_group_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Eva
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->clip_set) s->smart_class->clip_set(eo_obj, clip);
 }
@@ -674,7 +674,7 @@ _efl_canvas_group_group_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
 {
    // If this function is reached, so we do nothing except trying to call
    // the function of the legacy smart class.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart *s = obj->smart.smart;
    if (s && s->smart_class->clip_unset) s->smart_class->clip_unset(eo_obj);
 }
@@ -686,8 +686,8 @@ _efl_canvas_group_group_no_render_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED
    Evas_Object_Smart_Clipped_Data *cso;
    Evas_Object *cso_clipper;
 
-   if (eo_isa(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS))
-     cso = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
+   if (efl_isa(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS))
+     cso = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
    else
      cso = evas_object_smart_data_get(eo_obj);
    cso_clipper = cso ? cso->clipper : NULL;
@@ -745,7 +745,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event,
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
-   o = eo_data_scope_get(eo_obj, MY_CLASS);
+   o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!event) return;
    if (!func) return;
@@ -771,7 +771,7 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   o = eo_data_scope_get(eo_obj, MY_CLASS);
+   o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
 
    if (!event) return NULL;
@@ -803,7 +803,7 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas
    return NULL;
    MAGIC_CHECK_END();
    if (!event) return NULL;
-   o = eo_data_scope_get(eo_obj, MY_CLASS);
+   o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
 
    const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
@@ -870,7 +870,7 @@ evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, const Evas_Smart_
    if (class_descriptions) *class_descriptions = NULL;
    if (class_count) *class_count = 0;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (obj->smart.smart && class_descriptions)
       *class_descriptions = obj->smart.smart->callbacks.array;
    if (obj->smart.smart && class_count)
@@ -894,7 +894,7 @@ evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name,
         return;
      }
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (class_description)
      *class_description = evas_smart_cb_description_find
         (&obj->smart.smart->callbacks, name);
@@ -907,7 +907,7 @@ evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name,
 EOLIAN static void
 _efl_canvas_group_group_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    // XXX: do i need this?
    if (!obj || !obj->layer || obj->delete_me) return;
@@ -943,7 +943,7 @@ _efl_canvas_group_group_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_
 EOLIAN static void
 _efl_canvas_group_group_calculate(Eo *eo_obj, Evas_Smart_Data *o)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj->smart.smart || !obj->smart.smart->smart_class->calculate)
      return;
@@ -975,7 +975,7 @@ evas_call_smarts_calculate(Evas *eo_e)
 {
    Evas_Smart_Data *o;
    Eina_Clist *elem;
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    evas_canvas_async_block(e);
    evas_event_freeze(eo_e);
@@ -988,7 +988,7 @@ evas_call_smarts_calculate(Evas *eo_e)
         /* move the item to the processed list */
         o = EINA_CLIST_ENTRY(elem, Evas_Smart_Data, calc_entry);
         eina_clist_remove(&o->calc_entry);
-        obj = eo_data_scope_get(o->object, EFL_CANVAS_OBJECT_CLASS);
+        obj = efl_data_scope_get(o->object, EFL_CANVAS_OBJECT_CLASS);
 
         if (obj->delete_me) continue;
         eina_clist_add_tail(&e->calc_done, &o->calc_entry);
@@ -1019,7 +1019,7 @@ evas_call_smarts_calculate(Evas *eo_e)
 EOLIAN static void
 _efl_canvas_group_group_change(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    evas_object_change(eo_obj, obj);
    efl_canvas_group_need_recalculate_set(eo_obj, 1);
@@ -1028,7 +1028,7 @@ _efl_canvas_group_group_change(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
 Eina_Bool
 evas_object_smart_changed_get(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *o2;
    Eina_Bool has_map = EINA_FALSE;
 
@@ -1069,7 +1069,7 @@ evas_object_smart_changed_get(Evas_Object *eo_obj)
 void
 evas_object_smart_del(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart_Data *sobj;
    Evas_Smart *s;
    unsigned int i;
@@ -1093,7 +1093,7 @@ evas_object_smart_del(Evas_Object *eo_obj)
           }
      }
 
-   sobj = eo_data_scope_get(eo_obj, MY_CLASS);
+   sobj = efl_data_scope_get(eo_obj, MY_CLASS);
    free(sobj->interface_privates);
    sobj->interface_privates = NULL;
 
@@ -1118,7 +1118,7 @@ evas_object_update_bounding_box(Evas_Object *eo_obj, Evas_Object_Protected_Data
 
    if (obj->is_smart)
      {
-        s = s == NULL ? eo_data_scope_get(eo_obj, MY_CLASS) : s;
+        s = s == NULL ? efl_data_scope_get(eo_obj, MY_CLASS) : s;
 
         x = s->cur.bounding_box.x;
         y = s->cur.bounding_box.y;
@@ -1240,7 +1240,7 @@ evas_object_smart_bounding_box_get(Evas_Object *eo_obj,
                                    Evas_Coord_Rectangle *cur_bounding_box,
                                    Evas_Coord_Rectangle *prev_bounding_box)
 {
-   Evas_Smart_Data *s = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Smart_Data *s = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (cur_bounding_box) memcpy(cur_bounding_box,
                                 &s->cur.bounding_box,
@@ -1253,14 +1253,14 @@ evas_object_smart_bounding_box_get(Evas_Object *eo_obj,
 void
 evas_object_smart_cleanup(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (obj->smart.parent)
      evas_object_smart_member_del(eo_obj);
 
    if (obj->is_smart)
      {
-        Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+        Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
         if (o->calc_entry.next)
           eina_clist_remove(&o->calc_entry);
 
@@ -1325,7 +1325,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_obj,
    return;
    MAGIC_CHECK_END();
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *member;
 
    if (pass_events)
@@ -1336,7 +1336,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_obj,
      obj->parent_cache.src_invisible_valid = EINA_FALSE;
 
    if (!obj->is_smart) return;
-   Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    EINA_INLIST_FOREACH(o->contained, member)
      {
         Evas_Object *eo_member = member->object;
@@ -1350,8 +1350,8 @@ void
 evas_object_smart_member_raise(Evas_Object *eo_member)
 {
    Evas_Smart_Data *o;
-   Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
-   o = eo_data_scope_get(member->smart.parent, MY_CLASS);
+   Evas_Object_Protected_Data *member = efl_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
+   o = efl_data_scope_get(member->smart.parent, MY_CLASS);
    o->contained = eina_inlist_demote(o->contained, EINA_INLIST_GET(member));
 }
 
@@ -1359,8 +1359,8 @@ void
 evas_object_smart_member_lower(Evas_Object *eo_member)
 {
    Evas_Smart_Data *o;
-   Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
-   o = eo_data_scope_get(member->smart.parent, MY_CLASS);
+   Evas_Object_Protected_Data *member = efl_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
+   o = efl_data_scope_get(member->smart.parent, MY_CLASS);
    o->contained = eina_inlist_promote(o->contained, EINA_INLIST_GET(member));
 }
 
@@ -1368,9 +1368,9 @@ void
 evas_object_smart_member_stack_above(Evas_Object *eo_member, Evas_Object *eo_other)
 {
    Evas_Smart_Data *o;
-   Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EFL_CANVAS_OBJECT_CLASS);
-   o = eo_data_scope_get(member->smart.parent, MY_CLASS);
+   Evas_Object_Protected_Data *member = efl_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *other = efl_data_scope_get(eo_other, EFL_CANVAS_OBJECT_CLASS);
+   o = efl_data_scope_get(member->smart.parent, MY_CLASS);
    o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member));
    o->contained = eina_inlist_append_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other));
 }
@@ -1379,9 +1379,9 @@ void
 evas_object_smart_member_stack_below(Evas_Object *eo_member, Evas_Object *eo_other)
 {
    Evas_Smart_Data *o;
-   Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EFL_CANVAS_OBJECT_CLASS);
-   o = eo_data_scope_get(member->smart.parent, MY_CLASS);
+   Evas_Object_Protected_Data *member = efl_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *other = efl_data_scope_get(eo_other, EFL_CANVAS_OBJECT_CLASS);
+   o = efl_data_scope_get(member->smart.parent, MY_CLASS);
    o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member));
    o->contained = eina_inlist_prepend_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other));
 }
@@ -1426,7 +1426,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected
    MAGIC_CHECK_END();
 
    evas_object_async_block(obj);
-   os = eo_data_scope_get(eo_obj, MY_CLASS);
+   os = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!os->update_boundingbox_needed) return;
    os->update_boundingbox_needed = EINA_FALSE;
@@ -1442,7 +1442,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected
 
         if (o->is_smart)
           {
-             Evas_Smart_Data *s = eo_data_scope_get(o->object, MY_CLASS);
+             Evas_Smart_Data *s = efl_data_scope_get(o->object, MY_CLASS);
 
              evas_object_smart_bounding_box_update(o->object, o);
 
@@ -1490,11 +1490,11 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected
 static void
 evas_object_smart_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    obj->is_smart = EINA_TRUE;
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
 }
 
 static void
@@ -1527,21 +1527,21 @@ evas_object_smart_render_post(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Prote
 
 static unsigned int evas_object_smart_id_get(Evas_Object *eo_obj)
 {
-   Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SMART;
 }
 
 static unsigned int evas_object_smart_visual_id_get(Evas_Object *eo_obj)
 {
-   Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_CONTAINER;
 }
 
 static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
 {
-   Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
    return o->engine_data;
 }
@@ -1572,7 +1572,7 @@ _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
 
         if (o->is_smart)
           {
-             member_o = eo_data_scope_get(o->object, EFL_CANVAS_GROUP_CLASS);
+             member_o = efl_data_scope_get(o->object, EFL_CANVAS_GROUP_CLASS);
 
              if ((member_o->inherit_paragraph_direction) &&
                  (member_o->paragraph_direction != dir))
@@ -1588,7 +1588,7 @@ EOLIAN static void
 _efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o,
                                                             Evas_BiDi_Direction dir)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Smart_Data *parent;
 
    if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) ||
@@ -1602,7 +1602,7 @@ _efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Sma
 
         if (obj->smart.parent)
           {
-             parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_GROUP_CLASS);
+             parent = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_GROUP_CLASS);
 
              if (parent)
                parent_dir = parent->paragraph_direction;
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index a43a36a095..834271dbcf 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -4,8 +4,8 @@
 #define MY_CLASS EFL_CANVAS_GROUP_CLIPPED_CLASS
 
 #define CSO_DATA_GET(eo_obj, ptr)                                           \
-  Evas_Object_Smart_Clipped_Data *ptr = (eo_isa(eo_obj, MY_CLASS) ?         \
-        eo_data_scope_get(eo_obj, MY_CLASS) :                               \
+  Evas_Object_Smart_Clipped_Data *ptr = (efl_isa(eo_obj, MY_CLASS) ?         \
+        efl_data_scope_get(eo_obj, MY_CLASS) :                               \
         evas_object_smart_data_get(eo_obj));
 
 #define CSO_DATA_GET_OR_RETURN(eo_obj, ptr)                                 \
@@ -40,9 +40,9 @@ evas_object_smart_clipped_clipper_get(const Evas_Object *eo_obj)
 {
    Evas_Object_Smart_Clipped_Data *obj;
 
-   if (!eo_isa(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS))
+   if (!efl_isa(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS))
      return NULL;
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLIPPED_CLASS);
    return obj->clipper;
 }
 
@@ -92,7 +92,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
    _efl_canvas_group_group_members_all_del(eo_obj);
 
    /* If it's a legacy smart object, we should free the cso. */
-   if (!eo_isa(eo_obj, MY_CLASS))
+   if (!efl_isa(eo_obj, MY_CLASS))
       free(cso);
 
    evas_object_smart_data_set(eo_obj, NULL);
@@ -199,7 +199,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
 EOLIAN static void
 _efl_canvas_group_clipped_efl_canvas_group_group_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
 {
-   efl_canvas_group_member_add(eo_super(eo_obj, MY_CLASS), member);
+   efl_canvas_group_member_add(efl_super(eo_obj, MY_CLASS), member);
    evas_object_smart_clipped_smart_member_add(eo_obj, member);
 }
 
@@ -218,7 +218,7 @@ EOLIAN static void
 _efl_canvas_group_clipped_efl_canvas_group_group_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
 {
    evas_object_smart_clipped_smart_member_del(eo_obj, member);
-   efl_canvas_group_member_del(eo_super(eo_obj, MY_CLASS), member);
+   efl_canvas_group_member_del(efl_super(eo_obj, MY_CLASS), member);
 }
 
 EAPI void
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index d920124168..d8a79af023 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -97,7 +97,7 @@ struct _Evas_Object_Table_Accessor
 };
 
 #define EVAS_OBJECT_TABLE_DATA_GET(o, ptr)                              \
-   Evas_Table_Data *ptr = eo_data_scope_get(o, MY_CLASS)
+   Evas_Table_Data *ptr = efl_data_scope_get(o, MY_CLASS)
 
 #define EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, ptr)                    \
    EVAS_OBJECT_TABLE_DATA_GET(o, ptr);                                  \
@@ -264,7 +264,7 @@ _on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED)
    evas_object_smart_changed(table);
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
   { EFL_CANVAS_OBJECT_EVENT_DEL, _on_child_del },
   { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
 );
@@ -902,7 +902,7 @@ _evas_table_efl_canvas_group_group_add(Eo *obj, Evas_Table_Data *priv)
    priv->expand_h = 0;
    priv->expand_v = 0;
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -926,7 +926,7 @@ _evas_table_efl_canvas_group_group_del(Eo *obj, Evas_Table_Data *priv)
         priv->cache = NULL;
      }
 
-   efl_canvas_group_del(eo_super(obj, MY_CLASS));
+   efl_canvas_group_del(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -967,14 +967,14 @@ evas_object_table_add(Evas *evas)
    MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *obj = eo_add(MY_CLASS, evas);
+   Evas_Object *obj = efl_add(MY_CLASS, evas);
    return obj;
 }
 
 EOLIAN static Eo *
 _evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 1bbbb62029..2e4a418adf 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -151,7 +151,7 @@ _evas_object_text_char_coords_get(const Evas_Object *eo_obj,
       const Evas_Text_Data *o,
       size_t pos, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Text_Item *it;
 
    EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
@@ -272,7 +272,7 @@ static int
 _evas_object_text_last_up_to_pos(const Evas_Object *eo_obj,
       const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Text_Item *it;
    int pos = -1;
 
@@ -328,7 +328,7 @@ _evas_object_text_char_at_coords(const Evas_Object *eo_obj,
       const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy,
       Evas_Coord *rx, Evas_Coord *ry, Evas_Coord *rw, Evas_Coord *rh)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Text_Item *it;
 
    EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
@@ -372,14 +372,14 @@ evas_object_text_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(EVAS_TEXT_CLASS, e);
+   Evas_Object *eo_obj = efl_add(EVAS_TEXT_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_text_efl_object_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
 {
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
    evas_object_text_init(eo_obj);
 
    return eo_obj;
@@ -388,7 +388,7 @@ _evas_text_efl_object_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
 EOLIAN static void
 _evas_text_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Text_Data *o, const char *font_source)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((o->cur.source) && (font_source) &&
        (!strcmp(o->cur.source, font_source)))
      return;
@@ -410,7 +410,7 @@ _evas_text_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Text
 EOLIAN static void
 _evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Eina_Bool is, was = EINA_FALSE;
    Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
    Eina_Bool source_invisible = EINA_FALSE;
@@ -687,7 +687,7 @@ _evas_object_text_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, i
 static void
 _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *text)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    EvasBiDiStrIndex *v_to_l = NULL;
    Evas_Coord advance = 0, width = 0;
    size_t pos, visual_pos;
@@ -994,7 +994,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
 EOLIAN static void
 _evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_async_block(obj);
    EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -1010,7 +1010,7 @@ _evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h)
 EOLIAN static void
 _evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (o->cur.ellipsis == ellipsis) return;
 
@@ -1033,26 +1033,26 @@ _evas_text_ellipsis_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
 EOLIAN static void
 _evas_text_efl_object_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   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_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    const char *text;
    int size;
    efl_text_properties_font_get(eo_obj, &text, &size);
-   EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
-   EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
+   EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
+   EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
 
    text = efl_text_properties_font_source_get(eo_obj);
-   EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
+   EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
 
    text = efl_text_get(eo_obj);
-   EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text);
+   EFL_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text);
 }
 
 EOLIAN static void
 _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int is, was, len;
    Eina_Unicode *text;
 
@@ -1097,7 +1097,7 @@ _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text)
 EOLIAN static void
 _evas_text_bidi_delimiters_set(Eo *eo_obj, Evas_Text_Data *o, const char *delim)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    eina_stringshare_replace(&o->bidi_delimiters, delim);
 }
@@ -1118,7 +1118,7 @@ EOLIAN static Evas_BiDi_Direction
 _evas_text_direction_get(Eo *eo_obj, Evas_Text_Data *o)
 {
 #ifdef BIDI_SUPPORT
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (o->inherit_paragraph_direction)
      {
@@ -1172,7 +1172,7 @@ _evas_text_max_descent_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
 EOLIAN static Evas_Coord
 _evas_text_inset_get(Eo *eo_obj, Evas_Text_Data *o)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Coord inset = 0;
    if (!o->font) return inset;
    if (!o->items) return inset;
@@ -1220,7 +1220,7 @@ _evas_text_char_pos_get(const Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord
    if (!o->font) return ret;
    if (!o->items || (pos < 0)) return ret;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    Eina_Bool int_ret = _evas_object_text_char_coords_get(eo_obj, o, (size_t) pos,
             &x, &y, &w, &h);
@@ -1287,7 +1287,7 @@ _evas_text_char_coords_get(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Ev
         rw += rx;
         rx = 0;
      }
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((rx + rw) > obj->cur->geometry.w) rw = obj->cur->geometry.w - rx;
    if (rw < 0) rw = 0;
    if (ry < 0)
@@ -1309,7 +1309,7 @@ _evas_text_char_coords_get(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Ev
 EOLIAN static void
 _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int pl = 0, pr = 0, pt = 0, pb = 0, l = 0, r = 0, t = 0, b = 0;
    int w = 0, h = 0;
 
@@ -1325,7 +1325,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style)
    if (o->items) w = obj->cur->geometry.w + (l - pl) + (r - pr);
    h = obj->cur->geometry.h + (t - pt) + (b - pb);
 
-   efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), w, h);
+   efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), w, h);
    evas_object_change(eo_obj, obj);
 }
 
@@ -1338,7 +1338,7 @@ _evas_text_style_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
 EOLIAN static void
 _evas_text_shadow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((o->cur.shadow.r == r) && (o->cur.shadow.g == g) &&
        (o->cur.shadow.b == b) && (o->cur.shadow.a == a))
      return;
@@ -1363,7 +1363,7 @@ _evas_text_shadow_color_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, int *r, i
 EOLIAN static void
 _evas_text_glow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((o->cur.glow.r == r) && (o->cur.glow.g == g) &&
        (o->cur.glow.b == b) && (o->cur.glow.a == a))
      return;
@@ -1388,7 +1388,7 @@ _evas_text_glow_color_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, int *r, int
 EOLIAN static void
 _evas_text_glow2_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((o->cur.glow2.r == r) && (o->cur.glow2.g == g) &&
        (o->cur.glow2.b == b) && (o->cur.glow2.a == a))
      return;
@@ -1413,7 +1413,7 @@ _evas_text_glow2_color_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, int *r, in
 EOLIAN static void
 _evas_text_outline_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((o->cur.outline.r == r) && (o->cur.outline.g == g) &&
        (o->cur.outline.b == b) && (o->cur.outline.a == a))
      return;
@@ -1608,10 +1608,10 @@ evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int
 static void
 evas_object_text_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 
    Evas_Text_Data *o = obj->private_data;
@@ -1627,15 +1627,15 @@ evas_object_text_init(Evas_Object *eo_obj)
 EOLIAN static void
 _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_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_text_free(eo_obj, obj);
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 static void
 evas_object_text_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 {
-   Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    /* free obj */
    _evas_object_text_items_clear(o);
@@ -1685,7 +1685,7 @@ evas_font_draw_async_check(Evas_Object_Protected_Data *obj,
 EOLIAN static void
 _evas_text_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Text_Data *o)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    _evas_object_text_items_clear(o);
    o->changed = 1;
@@ -2134,7 +2134,7 @@ evas_object_text_render_post(Evas_Object *eo_obj,
 static unsigned int
 evas_object_text_id_get(Evas_Object *eo_obj)
 {
-   Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_TEXT;
 }
@@ -2142,7 +2142,7 @@ evas_object_text_id_get(Evas_Object *eo_obj)
 static unsigned int
 evas_object_text_visual_id_get(Evas_Object *eo_obj)
 {
-   Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SHAPE;
 }
@@ -2150,7 +2150,7 @@ evas_object_text_visual_id_get(Evas_Object *eo_obj)
 static void *
 evas_object_text_engine_data_get(Evas_Object *eo_obj)
 {
-   Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
    return o->font;
 }
@@ -2197,8 +2197,8 @@ evas_object_text_scale_update(Evas_Object *eo_obj,
 void
 _evas_object_text_rehint(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    int is, was;
 
    if (!o->font) return;
@@ -2230,8 +2230,8 @@ _evas_object_text_rehint(Evas_Object *eo_obj)
 static void
 _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
 
@@ -2293,11 +2293,11 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
              int min;
 
              min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w;
-             efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), min, h + t + b);
+             efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), min, h + t + b);
           }
         else
           {
-             efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), w + l + r, h + t + b);
+             efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), w + l + r, h + t + b);
           }
 ////        obj->cur->cache.geometry.validity = 0;
      }
@@ -2305,7 +2305,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
      {
         int t = 0, b = 0, l = 0, r = 0;
         _evas_object_text_pad_get(eo_obj, o, &l, &r, &t, &b);
-        efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), 0, o->max_ascent + o->max_descent + t + b);
+        efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), 0, o->max_ascent + o->max_descent + t + b);
 ////        obj->cur->cache.geometry.validity = 0;
      }
    o->last_computed.w = obj->cur->geometry.w;
@@ -2357,7 +2357,7 @@ EOLIAN static void
 _evas_text_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Text_Data *pd EINA_UNUSED, const char *code, const char *name)
 {
    pd->has_filter = (code != NULL);
-   efl_gfx_filter_program_set(eo_super(obj, MY_CLASS), code, name);
+   efl_gfx_filter_program_set(efl_super(obj, MY_CLASS), code, name);
 }
 
 /* deprecated */
@@ -2379,7 +2379,7 @@ _evas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data
                                                      Evas_BiDi_Direction dir)
 {
 #ifdef BIDI_SUPPORT
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) ||
        (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT)))
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index fb003ca134..ec3c372306 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -631,7 +631,7 @@ static const Evas_Object_Func object_func =
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
    return; \
    MAGIC_CHECK_END(); \
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
 #define TB_HEAD_RETURN(x) \
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
@@ -839,7 +839,7 @@ _style_match_tag(const Evas_Textblock_Style *ts, const char *s, size_t tag_len,
 static void
 _nodes_clear(const Evas_Object *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    /* First, clear all annotations that may have spawned format nodes. */
    _evas_textblock_annotations_clear(o);
@@ -872,7 +872,7 @@ _nodes_clear(const Evas_Object *eo_obj)
 static void
 _format_unref_free(const Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    fmt->ref--;
    if (fmt->ref > 0) return;
    if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc);
@@ -1904,7 +1904,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
      }
    else if (cmd == text_valignstr)
      {
-        Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+        Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
         char *endptr = NULL;
         double val = strtod(param, &endptr);
         o->valign = val;
@@ -2374,7 +2374,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
           fmt->ellipsis = -1.0;
         else
           {
-             Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+             Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
              o->have_ellipsis = 1;
           }
      }
@@ -2401,7 +2401,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
      }
    else if (cmd == replacement_charstr)
      {
-        Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+        Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
         eina_stringshare_replace(&o->repch, param);
      }
    else if (cmd == underline_dash_widthstr)
@@ -2623,7 +2623,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char
 static Evas_Object_Textblock_Format *
 _format_dup(Evas_Object *eo_obj, const Evas_Object_Textblock_Format *fmt)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Textblock_Format *fmt2;
 
    fmt2 = calloc(1, sizeof(Evas_Object_Textblock_Format));
@@ -2708,7 +2708,7 @@ _layout_format_ascent_descent_adjust(const Evas_Object *eo_obj,
       Evas_Object_Textblock_Format *fmt)
 {
    int ascent, descent;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (fmt->font.font)
      {
@@ -2774,7 +2774,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj,
         else
           {
              Evas_Object_Protected_Data *obj =
-                eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+                efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              asc = ENFN->font_max_ascent_get(ENDT,
                    it->format->font.font);
           }
@@ -2796,7 +2796,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj,
         else
           {
              Evas_Object_Protected_Data *obj =
-                eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+                efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              desc = ENFN->font_max_descent_get(ENDT,
                    it->format->font.font);
           }
@@ -2849,7 +2849,7 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj,
         if (fmt)
           {
              Evas_Object_Protected_Data *obj =
-               eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+               efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              asc = ENFN->font_ascent_get(ENDT, fmt->font.font);
              desc = ENFN->font_descent_get(ENDT, fmt->font.font);
           }
@@ -3037,7 +3037,7 @@ static void
 _paragraph_clear(const Evas_Object *obj,
       Evas_Object_Textblock_Paragraph *par)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS);
 
    while (par->lines)
      {
@@ -3074,7 +3074,7 @@ _paragraph_clear(const Evas_Object *obj,
 static void
 _paragraph_free(const Evas_Object *eo_obj, Evas_Object_Textblock_Paragraph *par)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    _paragraph_clear(eo_obj, par);
 
      {
@@ -3127,7 +3127,7 @@ _paragraphs_clear(const Evas_Object *eo_obj, Evas_Object_Textblock_Paragraph *pa
 static void
 _paragraphs_free(const Evas_Object *eo_obj, Evas_Object_Textblock_Paragraph *pars)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    o->num_paragraphs = 0;
 
@@ -3425,7 +3425,7 @@ _layout_calculate_format_item_size(const Evas_Object *eo_obj,
       Evas_Coord *maxascent, Evas_Coord *maxdescent,
       Evas_Coord *_y, Evas_Coord *_w, Evas_Coord *_h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* Adjust sizes according to current line height/scale */
    Evas_Coord w, h;
    const char *p, *s;
@@ -3787,7 +3787,7 @@ _layout_text_cutoff_get(Ctxt *c, Evas_Object_Textblock_Format *fmt,
            c->marginr - c->x - ti->x_adjustment;
         if (x < 0)
           x = 0;
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
         return ENFN->font_last_up_to_pos(ENDT, fmt->font.font,
               &ti->text_props, x, 0);
      }
@@ -3897,7 +3897,7 @@ _text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti)
    int dx = 0, minx = 0, maxx = 0, shx1, shx2;
 
    tw = th = 0;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
    if (fmt->font.font)
      ENFN->font_string_size_get(ENDT, fmt->font.font,
            &ti->text_props, &tw, &th);
@@ -4130,7 +4130,7 @@ skip:
 
         script = evas_common_language_script_type_get(str, script_len);
 
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
         while (script_len > 0)
           {
              Evas_Font_Instance *cur_fi = NULL;
@@ -4232,7 +4232,7 @@ _layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node_Format *n, const cha
 static void
 _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    void *of;
 
    of = fmt->font.font;
@@ -4834,7 +4834,7 @@ _layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it)
 
    if (ellip_ti->parent.format->font.font)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
         /* It's only 1 char anyway, we don't need the run end. */
         (void) ENFN->font_run_end_get(ENDT,
               ellip_ti->parent.format->font.font, &script_fi, &cur_fi,
@@ -5019,7 +5019,7 @@ _item_get_cutoff(Ctxt *c, Evas_Object_Textblock_Item *it, Evas_Coord x)
 {
    int pos = -1;
    Evas_Object_Textblock_Text_Item *ti;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
 
    ti = (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(it) : NULL;
    if (ti && ti->parent.format->font.font)
@@ -5997,8 +5997,8 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t,
 static void
 _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Text_Data *o = eo_data_ref(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_ref(eo_obj, MY_CLASS);
    Ctxt ctxt, *c;
    int style_pad_l = 0, style_pad_r = 0, style_pad_t = 0, style_pad_b = 0;
 
@@ -6192,8 +6192,8 @@ _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret)
 static void
 _relayout(const Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h,
          &o->formatted.w, &o->formatted.h);
    o->formatted.valid = 1;
@@ -6226,7 +6226,7 @@ _relayout(const Evas_Object *eo_obj)
 static inline void
 _relayout_if_needed(Evas_Object *eo_obj, const Efl_Canvas_Text_Data *o)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    evas_object_textblock_coords_recalc(eo_obj, obj, obj->private_data);
    if (!o->formatted.valid)
@@ -6252,7 +6252,7 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex
 {
    Evas_Object_Textblock_Paragraph *found_par;
    Evas_Object_Textblock_Line *ln;
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    _relayout_if_needed(eo_obj, o);
 
@@ -6309,7 +6309,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
 {
    Evas_Object_Textblock_Paragraph *par;
    Evas_Object_Textblock_Line *ln;
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    par = _layout_find_paragraph_by_line_no(o, line);
    if (par)
@@ -6329,21 +6329,21 @@ evas_object_textblock_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _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);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Efl_Canvas_Text_Data *o;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 
    o = obj->private_data;
@@ -6393,8 +6393,8 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
 
    EINA_LIST_FOREACH(ts->objects, l, eo_obj)
      {
-        Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         evas_object_async_block(obj);
         _evas_textblock_invalidate_all(o);
         _evas_textblock_changed(o, eo_obj);
@@ -6629,9 +6629,9 @@ _textblock_style_generic_set(Evas_Object *eo_obj, Evas_Textblock_Style *ts,
 EAPI void
 evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    _textblock_style_generic_set(eo_obj, (Evas_Textblock_Style *) ts, &(o->style));
 }
 
@@ -6657,7 +6657,7 @@ EOLIAN static void
 _efl_canvas_text_style_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, const char *key, const char *style)
 {
    // FIXME: Make key value behaviour.
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    Evas_Textblock_Style *ts;
@@ -6708,9 +6708,9 @@ end:
 EAPI Evas_Textblock_Style *
 evas_object_textblock_style_get(const Eo *eo_obj EINA_UNUSED)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->style;
 }
 
@@ -6726,8 +6726,8 @@ _efl_canvas_text_style_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, cons
 EAPI void
 evas_object_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Style *ts)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    Evas_Textblock_Style *old_ts = _style_by_key_find(o, _STYLE_USER);
@@ -6745,9 +6745,9 @@ evas_object_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Style *ts)
 EAPI const Evas_Textblock_Style*
 evas_object_textblock_style_user_peek(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER);
    return ts;
 }
@@ -6755,7 +6755,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj)
 EAPI void
 evas_object_textblock_style_user_pop(Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    efl_canvas_text_style_set(eo_obj, _STYLE_USER, NULL);
@@ -6764,8 +6764,8 @@ evas_object_textblock_style_user_pop(Eo *eo_obj)
 EAPI void
 evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (o->repch) eina_stringshare_del(o->repch);
    if (ch) o->repch = eina_stringshare_add(ch);
@@ -6778,7 +6778,7 @@ evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch)
 EOLIAN static void
 _efl_canvas_text_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Eina_Bool mode)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (o->legacy_newline == mode)
       return;
@@ -6803,8 +6803,8 @@ _efl_canvas_text_is_empty_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o)
 EAPI void
 evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (align < 0.0) align = 0.0;
    else if (align > 1.0) align = 1.0;
@@ -6816,14 +6816,14 @@ evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align)
 EAPI double
 evas_object_textblock_valign_get(const Efl_Canvas_Text *obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS);
    return o->valign;
 }
 
 EOLIAN static void
 _efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, const char *delim)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    eina_stringshare_replace(&o->bidi_delimiters, delim);
 }
@@ -6837,7 +6837,7 @@ _efl_canvas_text_bidi_delimiters_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Dat
 EAPI const char *
 evas_object_textblock_replace_char_get(const Efl_Canvas_Text *obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS);
    return o->repch;
 }
 
@@ -7023,7 +7023,7 @@ evas_textblock_string_escape_get(const char *string, int *len_ret)
 static void
 _cursor_emit_if_changed(Efl_Canvas_Text_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (cur->changed)
      {
         cur->changed = EINA_FALSE;
@@ -7054,9 +7054,9 @@ _prepend_escaped_char(Efl_Canvas_Text_Cursor *cur_obj, const char *s,
 EAPI void
 evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (text == o->markup_text)
      {
         /* Text is the same and already stringshared, do nothing */
@@ -7075,7 +7075,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
 
    _nodes_clear(eo_obj);
 
-   Efl_Canvas_Text_Cursor_Data *co = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *co = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    co->node = _evas_textblock_node_text_new();
    o->text_nodes = _NODE_TEXT(eina_inlist_append(
             EINA_INLIST_GET(o->text_nodes),
@@ -7112,10 +7112,10 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
 EAPI void
 evas_object_textblock_text_markup_prepend(Efl_Canvas_Text_Cursor *cur_obj, const char *text)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return;
    Evas_Object *eo_obj = cur->obj;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_HEAD();
    if (text)
@@ -7321,9 +7321,9 @@ evas_object_textblock_text_markup_get(Eo *eo_obj)
    Evas_Object_Textblock_Node_Text *n;
    Eina_Strbuf *txt = NULL;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    const char *markup;
    if (o->markup_text)
      {
@@ -7615,7 +7615,7 @@ void
 _obstacle_del_cb(void *data, const Eo_Event *event)
 {
    Eo *eo_obj = data;
-   Efl_Canvas_Text_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
    Eina_List *i;
    Evas_Textblock_Obstacle *obs;
 
@@ -7660,7 +7660,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj,
 {
    Evas_Textblock_Obstacle *obs;
 
-   if (!eo_isa(eo_obs, EFL_CANVAS_OBJECT_CLASS))
+   if (!efl_isa(eo_obs, EFL_CANVAS_OBJECT_CLASS))
       return EINA_FALSE;
    obs = _obstacle_find(obj, eo_obs);
    if (obs) return EINA_FALSE;
@@ -7685,7 +7685,7 @@ _efl_canvas_text_obstacle_del(Eo *eo_obj, Efl_Canvas_Text_Data *obj,
    Evas_Textblock_Obstacle *obs;
    Eina_List *i;
 
-   if (!eo_isa(eo_obs, EFL_CANVAS_OBJECT_CLASS))
+   if (!efl_isa(eo_obs, EFL_CANVAS_OBJECT_CLASS))
       return EINA_FALSE;
 
    EINA_LIST_FOREACH(obj->obstacles, i, obs)
@@ -7763,7 +7763,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti)
 
    if (hyphen_ti->parent.format->font.font)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS);
         /* It's only 1 char anyway, we don't need the run end. */
         (void) ENFN->font_run_end_get(ENDT,
               hyphen_ti->parent.format->font.font, &script_fi, &cur_fi,
@@ -7858,12 +7858,12 @@ _evas_textblock_cursor_nodes_merge(Efl_Canvas_Text_Cursor_Data *cur)
 
    len = eina_ustrbuf_length_get(cur->node->unicode);
 
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next);
    _evas_textblock_nodes_merge(o, cur->node);
    _evas_textblock_cursors_update_offset(cur, nnode, 0, len);
    _evas_textblock_cursors_set_node(o, nnode, cur->node);
-   Efl_Canvas_Text_Cursor_Data *co = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *co = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (nnode == co->node)
      {
         co->node = cur->node;
@@ -8067,7 +8067,7 @@ _evas_textblock_cursor_init(Efl_Canvas_Text_Cursor_Data *cur, const Evas_Object
 {
    cur->obj = (Eo *) tb;
 
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    cur->node = o->text_nodes;
    cur->pos = 0;
 }
@@ -8081,7 +8081,7 @@ _efl_canvas_text_cursor_text_object_set(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd
         return;
      }
 
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(tb, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(tb, MY_CLASS);
    _evas_textblock_cursor_init(pd, tb);
    o->cursors = eina_list_append(o->cursors, obj);
 }
@@ -8097,15 +8097,15 @@ evas_object_textblock_cursor_new(const Eo *eo_obj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
    // XXX; Discarding const here
-   return eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) eo_obj,
-         efl_canvas_text_cursor_text_object_set(eo_self, eo_obj));
+   return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) eo_obj,
+         efl_canvas_text_cursor_text_object_set(efl_self, eo_obj));
 }
 
 EOLIAN static void
 _efl_canvas_text_cursor_efl_object_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
-   efl_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS));
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   efl_destructor(efl_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS));
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    if (cur_obj == o->cursor) return;
    o->cursors = eina_list_remove(o->cursors, cur_obj);
 }
@@ -8120,7 +8120,7 @@ EAPI Eina_Bool
 _evas_textblock_cursor_is_format(const Efl_Canvas_Text_Cursor_Data *cur)
 {
    if ((!cur) || (!cur->node)) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    return (_evas_textblock_cursor_node_format_at_pos_get(cur)) ?
       EINA_TRUE : EINA_FALSE;
@@ -8129,16 +8129,16 @@ _evas_textblock_cursor_is_format(const Efl_Canvas_Text_Cursor_Data *cur)
 EAPI Eina_Bool
 evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_is_format(cur);
 }
 
 EAPI const Eina_List *
 evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!strcmp(anchor, "a"))
      return o->anchors_a;
    else if (!strcmp(anchor, "item"))
@@ -8149,18 +8149,18 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor)
 EAPI const Evas_Object_Textblock_Node_Format*
 evas_textblock_node_format_first_get(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->format_nodes;
 }
 
 EAPI const Evas_Object_Textblock_Node_Format*
 evas_textblock_node_format_last_get(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL;
 }
 
@@ -8189,9 +8189,9 @@ evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Fo
 
    fmt = n;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    do
      {
         const char *fstr = fmt->orig_format;
@@ -8290,9 +8290,9 @@ found:
 static void
 _canvas_text_cursor_paragraph_first(Efl_Canvas_Text_Cursor_Data *cur)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    cur->node = o->text_nodes;
    cur->pos = 0;
 }
@@ -8310,9 +8310,9 @@ _canvas_text_cursor_paragraph_last(Efl_Canvas_Text_Cursor_Data *cur)
 {
    Evas_Object_Textblock_Node_Text *node;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    node = o->text_nodes;
    if (node)
      {
@@ -8339,7 +8339,7 @@ static Eina_Bool
 _evas_textblock_cursor_paragraph_next(Efl_Canvas_Text_Cursor_Data *cur)
 {
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
    /* If there is a current text node, return the next text node (if exists)
@@ -8362,7 +8362,7 @@ _evas_textblock_cursor_paragraph_next(Efl_Canvas_Text_Cursor_Data *cur)
 EAPI Eina_Bool
 evas_textblock_cursor_paragraph_next(Efl_Canvas_Text_Cursor *obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_paragraph_next(cur);
 }
@@ -8379,7 +8379,7 @@ _evas_textblock_cursor_paragraph_prev(Efl_Canvas_Text_Cursor_Data *cur)
 {
    Evas_Object_Textblock_Node_Text *node;
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
    /* If the current node is a text node, just get the prev if any,
@@ -8405,7 +8405,7 @@ _evas_textblock_cursor_paragraph_prev(Efl_Canvas_Text_Cursor_Data *cur)
 EAPI Eina_Bool
 evas_textblock_cursor_paragraph_prev(Efl_Canvas_Text_Cursor *obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_paragraph_prev(cur);
 }
@@ -8428,9 +8428,9 @@ evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur_obj)
 {
    Evas_Object_Textblock_Node_Format *node;
 
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
    /* If the current node is a format node, just get the next if any,
@@ -8467,9 +8467,9 @@ EAPI Eina_Bool
 evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur_obj)
 {
    const Evas_Object_Textblock_Node_Format *node;
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
    node = evas_textblock_cursor_format_get(cur_obj);
@@ -8509,13 +8509,13 @@ evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur_obj)
 EAPI Eina_Bool
 evas_textblock_cursor_word_start(Efl_Canvas_Text_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    const Eina_Unicode *text;
    size_t i;
    char *breaks;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
 
@@ -8577,13 +8577,13 @@ _efl_canvas_text_cursor_word_start(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Te
 EAPI Eina_Bool
 evas_textblock_cursor_word_end(Efl_Canvas_Text_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    const Eina_Unicode *text;
    size_t i;
    char *breaks;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
 
@@ -8643,7 +8643,7 @@ _evas_textblock_cursor_char_next(Efl_Canvas_Text_Cursor_Data *cur)
    const Eina_Unicode *text;
 
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
 
@@ -8679,7 +8679,7 @@ _evas_textblock_cursor_char_next(Efl_Canvas_Text_Cursor_Data *cur)
 EAPI Eina_Bool
 evas_textblock_cursor_char_next(Efl_Canvas_Text_Cursor *obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_char_next(cur);
 }
@@ -8709,7 +8709,7 @@ _evas_textblock_cursor_char_prev(Efl_Canvas_Text_Cursor_Data *cur)
 EAPI Eina_Bool
 evas_textblock_cursor_char_prev(Efl_Canvas_Text_Cursor *obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_char_prev(cur);
 }
@@ -8725,7 +8725,7 @@ static void
 _evas_textblock_cursor_paragraph_char_first(Efl_Canvas_Text_Cursor_Data *cur)
 {
    if (!cur) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    cur->pos = 0;
 }
@@ -8743,7 +8743,7 @@ _evas_textblock_cursor_paragraph_char_last(Efl_Canvas_Text_Cursor_Data *cur)
    int ind;
 
    if (!cur) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node);
    ind = eina_ustrbuf_length_get(cur->node->unicode);
@@ -8798,10 +8798,10 @@ _efl_canvas_text_cursor_line_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canv
    Evas_Object_Textblock_Line *ln = NULL;
    Evas_Object_Textblock_Item *it = NULL;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -8821,10 +8821,10 @@ _evas_textblock_cursor_line_char_last(Efl_Canvas_Text_Cursor_Data *cur)
    Evas_Object_Textblock_Item *it = NULL;
 
    if (!cur) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -9314,10 +9314,10 @@ _efl_canvas_text_cursor_position_get(Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cu
    size_t npos = 0;
 
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, 0);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    n = o->text_nodes;
    while (n != cur->node)
      {
@@ -9333,9 +9333,9 @@ _evas_textblock_cursor_pos_set(Efl_Canvas_Text_Cursor_Data *cur, int _pos)
    Evas_Object_Textblock_Node_Text *n;
    size_t pos;
    if (!cur) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
 
    if (_pos < 0)
@@ -9385,12 +9385,12 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur_obj, int line)
 {
    Evas_Object_Textblock_Line *ln;
 
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -9482,19 +9482,19 @@ _evas_textblock_cursor_compare(const Efl_Canvas_Text_Cursor_Data *cur1,
 EOLIAN static int
 _efl_canvas_text_cursor_compare(const Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cursor_Data *cur, const Efl_Canvas_Text_Cursor *cur2_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_compare(cur1, cur2);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_text_cursor_equal(const Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cursor_Data *cur, const Efl_Canvas_Text_Cursor *cur2_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return ((cur->node == cur2->node) && (cur->pos == cur2->pos));
 }
 
@@ -9524,7 +9524,7 @@ static EOLIAN void
 _efl_canvas_text_cursor_copy(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur,
       const Efl_Canvas_Text_Cursor *src_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *src = eo_data_scope_get(src_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *src = efl_data_scope_get(src_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
 
    if (!efl_canvas_text_cursor_equal(cur_obj, src_obj))
      {
@@ -9591,7 +9591,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Canvas_Text_Cursor_Data *cur,
    Evas_Object_Textblock_Node_Text *n;
 
    if (!cur) return;
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    n = _evas_textblock_node_text_new();
    o->text_nodes = _NODE_TEXT(eina_inlist_append_relative(
@@ -9673,7 +9673,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o,
       Evas_Object_Textblock_Node_Text *new_node)
 {
    Eina_List *l;
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    Efl_Canvas_Text_Cursor *data_obj;
 
    if (n == cur->node)
@@ -9685,7 +9685,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o,
    EINA_LIST_FOREACH(o->cursors, l, data_obj)
      {
         Efl_Canvas_Text_Cursor_Data *data =
-           eo_data_scope_get(data_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+           efl_data_scope_get(data_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
         if (n == data->node)
           {
              data->pos = 0;
@@ -9737,9 +9737,9 @@ _evas_textblock_cursors_update_offset(const Efl_Canvas_Text_Cursor_Data *cur,
    Eina_List *l;
    Efl_Canvas_Text_Cursor *ocur_obj;
    Efl_Canvas_Text_Cursor_Data *ocur;
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
-   ocur = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   ocur = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (cur != ocur)
      {
         _cursor_update_offset(ocur, o, n, start, offset);
@@ -9747,7 +9747,7 @@ _evas_textblock_cursors_update_offset(const Efl_Canvas_Text_Cursor_Data *cur,
 
    EINA_LIST_FOREACH(o->cursors, l, ocur_obj)
      {
-        ocur = eo_data_scope_get(ocur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+        ocur = efl_data_scope_get(ocur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
         if (ocur != cur)
           {
              _cursor_update_offset(ocur, o, n, start, offset);
@@ -9765,7 +9765,7 @@ _evas_textblock_cursors_update_offset(const Efl_Canvas_Text_Cursor_Data *cur,
 static void
 _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Eina_List *l;
    Efl_Canvas_Text_Cursor *data_obj;
    LYDBG("ZZ: invalidate 1 %p\n", eo_obj);
@@ -9808,10 +9808,10 @@ _evas_textblock_cursor_text_append(Efl_Canvas_Text_Cursor_Data *cur, const char
    int len = 0;
 
    if (!cur) return 0;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    text = eina_unicode_utf8_to_unicode(_text, &len);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    n = cur->node;
    if (n)
@@ -9870,7 +9870,7 @@ _evas_textblock_cursor_text_append(Efl_Canvas_Text_Cursor_Data *cur, const char
    n->dirty = EINA_TRUE;
    free(text);
 
-   main_cur = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   main_cur = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!main_cur->node)
       main_cur->node = o->text_nodes;
    return len;
@@ -9879,7 +9879,7 @@ _evas_textblock_cursor_text_append(Efl_Canvas_Text_Cursor_Data *cur, const char
 EAPI int
 evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur_obj, const char *_text)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_text_append(cur, _text);
 }
 
@@ -9889,7 +9889,7 @@ _evas_textblock_cursor_text_prepend(Efl_Canvas_Text_Cursor_Data *cur, const char
    int len;
    /*append is essentially prepend without advancing */
    if (!cur) return 0;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    len = _evas_textblock_cursor_text_append(cur, _text);
    if (len == 0) return 0;
@@ -9900,7 +9900,7 @@ _evas_textblock_cursor_text_prepend(Efl_Canvas_Text_Cursor_Data *cur, const char
 EAPI int
 evas_textblock_cursor_text_prepend(Efl_Canvas_Text_Cursor *cur_obj, const char *_text)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_text_prepend(cur, _text);
 }
 
@@ -10089,10 +10089,10 @@ _evas_textblock_cursor_format_append(Efl_Canvas_Text_Cursor_Data *cur,
    Eina_Bool is_visible;
 
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if ((!format) || (format[0] == 0)) return EINA_FALSE;
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    /* We should always have at least one text node */
    if (!o->text_nodes)
      {
@@ -10213,7 +10213,7 @@ _evas_textblock_cursor_format_append(Efl_Canvas_Text_Cursor_Data *cur,
 
    _evas_textblock_changed(o, cur->obj);
 
-   Efl_Canvas_Text_Cursor_Data *ocur = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *ocur = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!ocur->node)
       ocur->node = o->text_nodes;
 
@@ -10224,7 +10224,7 @@ _evas_textblock_cursor_format_append(Efl_Canvas_Text_Cursor_Data *cur,
 EAPI Eina_Bool
 evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur_obj, const char *format)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_format_append(cur, format, NULL, EINA_FALSE);
 }
 
@@ -10234,7 +10234,7 @@ _evas_textblock_cursor_format_prepend(Efl_Canvas_Text_Cursor_Data *cur, const ch
    Eina_Bool is_visible;
 
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    /* append is essentially prepend without advancing */
    is_visible = _evas_textblock_cursor_format_append(cur, format, NULL, EINA_FALSE);
@@ -10250,7 +10250,7 @@ _evas_textblock_cursor_format_prepend(Efl_Canvas_Text_Cursor_Data *cur, const ch
 EAPI Eina_Bool
 evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur_obj, const char *format)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_format_prepend(cur, format);
 }
 
@@ -10262,9 +10262,9 @@ _evas_textblock_cursor_char_delete(Efl_Canvas_Text_Cursor_Data *cur)
    int chr, ind, ppos;
 
    if (!cur || !cur->node) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    n = cur->node;
 
    text = eina_ustrbuf_string_get(n->unicode);
@@ -10342,7 +10342,7 @@ _efl_canvas_text_cursor_char_delete(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cu
 EAPI void
 evas_textblock_cursor_range_delete(Efl_Canvas_Text_Cursor *cur1_obj, Evas_Textblock_Cursor *cur2_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return;
    efl_canvas_text_range_delete(cur->obj, cur1_obj, cur2_obj);
 }
@@ -10355,14 +10355,14 @@ _efl_canvas_text_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *pd E
    Evas_Object_Textblock_Node_Text *n1, *n2;
    Eina_Bool should_merge = EINA_FALSE, reset_cursor = EINA_FALSE;
 
-   Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur1 || !cur1->node) return;
    if (!cur2 || !cur2->node) return;
    if (cur1->obj != cur2->obj) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur1->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
    if (evas_textblock_cursor_compare(cur1_obj, cur2_obj) > 0)
      {
         Efl_Canvas_Text_Cursor *tc_obj;
@@ -10469,9 +10469,9 @@ _efl_canvas_text_cursor_content_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Cursor_
 EAPI char *
 evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur || !cur->node) return NULL;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (evas_textblock_cursor_format_is_visible_get(cur_obj))
      {
@@ -10672,13 +10672,13 @@ evas_textblock_cursor_range_formats_get(const Efl_Canvas_Text_Cursor *cur1_obj,
    Eina_List *ret = NULL;
    Evas_Object_Textblock_Node_Text *n1, *n2;
    Evas_Object_Textblock_Node_Format *first, *last;
-   const Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   const Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur1 || !cur1->node) return NULL;
    if (!cur2 || !cur2->node) return NULL;
    if (cur1->obj != cur2->obj) return NULL;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    eo_obj = cur1->obj;
    TB_HEAD_RETURN(NULL);
@@ -10747,7 +10747,7 @@ _evas_textblock_cursor_range_text_get(const Efl_Canvas_Text_Cursor_Data *cur1, c
 
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (format == EVAS_TEXTBLOCK_TEXT_MARKUP)
       return _evas_textblock_cursor_range_text_markup_get(cur1, cur2);
@@ -10761,8 +10761,8 @@ _evas_textblock_cursor_range_text_get(const Efl_Canvas_Text_Cursor_Data *cur1, c
 EAPI char *
 evas_textblock_cursor_range_text_get(const Efl_Canvas_Text_Cursor *cur1_obj, const Evas_Textblock_Cursor *cur2_obj, Evas_Textblock_Text_Type format)
 {
-   const Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   const Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_range_text_get(cur1, cur2, format);
 }
 
@@ -10772,8 +10772,8 @@ _efl_canvas_text_range_text_get(Eo *eo_obj EINA_UNUSED,
       const Efl_Canvas_Text_Cursor *cur1_obj,
       const Evas_Textblock_Cursor *cur2_obj)
 {
-   const Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   const Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_range_text_get(cur1, cur2, EVAS_TEXTBLOCK_TEXT_PLAIN);
 }
 
@@ -10781,9 +10781,9 @@ EAPI const char *
 evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur_obj)
 {
    Efl_Canvas_Text_Cursor_Data cur1, cur2;
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return NULL;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, NULL);
    if (cur->node->utf8)
@@ -10805,9 +10805,9 @@ EAPI int
 evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur_obj)
 {
    int len;
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, -1);
    len = eina_ustrbuf_length_get(cur->node->unicode);
@@ -10821,9 +10821,9 @@ evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur
 EAPI const Evas_Object_Textblock_Node_Format *
 evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return NULL;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, NULL);
    return _evas_textblock_cursor_node_format_at_pos_get(cur);
@@ -10874,7 +10874,7 @@ _evas_textblock_cursor_at_format_set(Efl_Canvas_Text_Cursor_Data *cur,
       const Evas_Object_Textblock_Node_Format *fmt)
 {
    if (!fmt || !cur) return;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    cur->node = fmt->text_node;
    cur->pos = _evas_textblock_node_format_pos_get(fmt);
@@ -10883,7 +10883,7 @@ _evas_textblock_cursor_at_format_set(Efl_Canvas_Text_Cursor_Data *cur,
 EAPI void
 evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur_obj, const Evas_Object_Textblock_Node_Format *fmt)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    _evas_textblock_cursor_at_format_set(cur, fmt);
 }
 
@@ -10893,7 +10893,7 @@ _evas_textblock_cursor_format_is_visible_get(const Efl_Canvas_Text_Cursor_Data *
    const Eina_Unicode *text;
 
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node, EINA_FALSE);
    if (!_evas_textblock_cursor_is_format(cur)) return EINA_FALSE;
@@ -10904,7 +10904,7 @@ _evas_textblock_cursor_format_is_visible_get(const Efl_Canvas_Text_Cursor_Data *
 EAPI Eina_Bool
 evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_format_is_visible_get(cur);
 }
 
@@ -10931,7 +10931,7 @@ _find_layout_line_by_item(Evas_Object_Textblock_Paragraph *par, Evas_Object_Text
 EAPI Eina_Bool
 evas_textblock_cursor_geometry_bidi_get(const Efl_Canvas_Text_Cursor *cur_obj, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2, Evas_Textblock_Cursor_Type ctype)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
    return efl_canvas_text_cursor_geometry_get(cur_obj,
          (ctype == EVAS_TEXTBLOCK_CURSOR_BEFORE) ?
@@ -10943,8 +10943,8 @@ EOLIAN static Eina_Bool
 _efl_canvas_text_cursor_geometry_get(Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cursor_Data *cur, Efl_Canvas_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2)
 {
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    evas_object_async_block(obj);
 
    _relayout_if_needed(cur->obj, o);
@@ -11128,11 +11128,11 @@ EAPI int
 evas_textblock_cursor_geometry_get(const Efl_Canvas_Text_Cursor *cur_obj, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype)
 {
    int ret = -1;
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -11210,9 +11210,9 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
    int pos;
    Eina_Bool previous_format;
 
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -11254,7 +11254,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
         if (pos < 0) pos = 0;
         if (ti->parent.format->font.font)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
              query_func(ENDT,
                    ti->parent.format->font.font,
                    &ti->text_props,
@@ -11319,9 +11319,9 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
 EAPI int
 evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur_obj, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    return _evas_textblock_cursor_char_pen_geometry_common_get(
          ENFN->font_char_coords_get, cur_obj, cx, cy, cw, ch);
@@ -11330,9 +11330,9 @@ evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur_obj, Ev
 EAPI int
 evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur_obj, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    return _evas_textblock_cursor_char_pen_geometry_common_get(
          ENFN->font_pen_coords_get, cur_obj, cx, cy, cw, ch);
@@ -11345,11 +11345,11 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur_obj, Ev
    Evas_Object_Textblock_Item *it = NULL;
    int x, y, w, h;
 
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -11376,7 +11376,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur_obj, Ev
 EAPI Eina_Bool
 evas_textblock_cursor_visible_range_get(Efl_Canvas_Text_Cursor *start_obj, Evas_Textblock_Cursor *end_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(start_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(start_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return efl_canvas_text_visible_range_get(cur->obj, start_obj, end_obj);
 }
 
@@ -11387,11 +11387,11 @@ _efl_canvas_text_visible_range_get(Eo *eo_obj EINA_UNUSED,
 {
    Evas *eo_e;
    Evas_Coord cy, ch;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_HEAD_RETURN(EINA_FALSE);
    eo_e = evas_object_evas_get(eo_obj);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    cy = 0 - obj->cur->geometry.y;
    ch = e->viewport.h;
    evas_textblock_cursor_line_coord_set(start_obj, cy);
@@ -11405,15 +11405,15 @@ _efl_canvas_text_visible_range_get(Eo *eo_obj EINA_UNUSED,
 EAPI Eina_Bool
 evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur_obj,  Evas_Coord x, Evas_Coord y)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    Evas_Object_Textblock_Paragraph *found_par;
    Evas_Object_Textblock_Line *ln;
    Evas_Object_Textblock_Item *it = NULL;
    Eina_Bool ret = EINA_FALSE;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -11551,11 +11551,11 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur_obj, Evas_Coord
    Evas_Object_Textblock_Paragraph *found_par;
    Evas_Object_Textblock_Line *ln;
 
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return -1;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -11696,7 +11696,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
    cur = (cur1) ? cur1 : cur2;
 
    if (!cur) return NULL;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
 
    /* Find the first and last items */
    it1 = it2 = NULL;
@@ -11973,7 +11973,7 @@ _line_fill_rect_get(const Evas_Object_Textblock_Line *ln,
 EAPI Eina_Iterator *
 evas_textblock_cursor_range_simple_geometry_get(const Efl_Canvas_Text_Cursor *cur1_obj, const Evas_Textblock_Cursor *cur2_obj)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return NULL;
    return efl_canvas_text_range_geometry_get(cur->obj, cur1_obj, cur2_obj);
 }
@@ -11988,12 +11988,12 @@ _efl_canvas_text_range_geometry_get(Eo *eo_obj EINA_UNUSED,
    Eina_List *rects = NULL;
    Eina_Iterator *itr = NULL;
 
-   const Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   const Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur1 || !cur1->node) return NULL;
    if (!cur2 || !cur2->node) return NULL;
    if (cur1->obj != cur2->obj) return NULL;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    _relayout_if_needed(cur1->obj, o);
@@ -12095,14 +12095,14 @@ evas_textblock_cursor_range_geometry_get(const Efl_Canvas_Text_Cursor *cur1_obj,
    Eina_List *rects = NULL;
    Evas_Textblock_Rectangle *tr;
 
-   const Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   const Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur1 = efl_data_scope_get(cur1_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   const Efl_Canvas_Text_Cursor_Data *cur2 = efl_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur1 || !cur1->node) return NULL;
    if (!cur2 || !cur2->node) return NULL;
    if (cur1->obj != cur2->obj) return NULL;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur1->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
 
    _relayout_if_needed(cur1->obj, o);
 
@@ -12174,9 +12174,9 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Canvas_Text_Cursor_Dat
    Evas_Coord x, y, w, h;
 
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -12199,7 +12199,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Canvas_Text_Cursor_Dat
 EAPI Eina_Bool
 evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur_obj, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    return _evas_textblock_cursor_format_item_geometry_get(cur, cx, cy, cw, ch);
 }
 
@@ -12208,9 +12208,9 @@ evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur_obj)
 {
    Eina_Bool ret = EINA_FALSE;
    Efl_Canvas_Text_Cursor_Data cur2;
-   Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *cur = efl_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
    if (!cur) return EINA_FALSE;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    _evas_textblock_cursor_init(&cur2, cur->obj);
@@ -12230,9 +12230,9 @@ evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_
 
    Evas_Object_Textblock_Line *ln;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    _relayout_if_needed((Evas_Object *)eo_obj, o);
 
@@ -12252,9 +12252,9 @@ _evas_object_textblock_clear(Evas_Object *eo_obj)
    Efl_Canvas_Text_Cursor *cur;
    Efl_Canvas_Text_Cursor_Data *co;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (o->paragraphs)
      {
         _paragraphs_free(eo_obj, o->paragraphs);
@@ -12262,13 +12262,13 @@ _evas_object_textblock_clear(Evas_Object *eo_obj)
      }
 
    _nodes_clear(eo_obj);
-   co = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   co = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    co->node = NULL;
    co->pos = 0;
    co->changed = EINA_TRUE;
    EINA_LIST_FOREACH(o->cursors, l, cur)
      {
-        co = eo_data_scope_get(cur, EFL_CANVAS_TEXT_CURSOR_CLASS);
+        co = efl_data_scope_get(cur, EFL_CANVAS_TEXT_CURSOR_CLASS);
         co->node = NULL;
         co->pos = 0;
         co->changed = EINA_TRUE;
@@ -12292,7 +12292,7 @@ evas_object_textblock_clear(Evas_Object *eo_obj)
 EOLIAN static void
 _efl_canvas_text_size_formatted_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *w, Evas_Coord *h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    _relayout_if_needed(eo_obj, o);
 
@@ -12531,7 +12531,7 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj,
 EOLIAN static void
 _efl_canvas_text_size_native_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *w, Evas_Coord *h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (!o->native.valid)
      {
@@ -12565,7 +12565,7 @@ _efl_canvas_text_size_native_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord
 EOLIAN static void
 _efl_canvas_text_style_insets_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    _relayout_if_needed(eo_obj, o);
 
@@ -12578,9 +12578,9 @@ _efl_canvas_text_style_insets_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coor
 EOLIAN static void
 _efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
+   efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
    if (!root) return;
-   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
    Efl_Dbg_Info *node;
 
    const char *style;
@@ -12595,23 +12595,23 @@ _efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EIN
    if (shorttext[37])
      strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */
 
-   EO_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, style);
-   EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, shorttext);
+   EFL_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, style);
+   EFL_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, shorttext);
 
      {
         int w, h;
         efl_canvas_text_size_formatted_get(eo_obj, &w, &h);
-        node = EO_DBG_INFO_LIST_APPEND(group, "Formatted size");
-        EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
-        EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
+        node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size");
+        EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
+        EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
      }
 
      {
         int w, h;
         efl_canvas_text_size_native_get(eo_obj, &w, &h);
-        node = EO_DBG_INFO_LIST_APPEND(group, "Native size");
-        EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
-        EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
+        node = EFL_DBG_INFO_LIST_APPEND(group, "Native size");
+        EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
+        EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
      }
 }
 
@@ -12619,7 +12619,7 @@ _efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EIN
 static void
 evas_object_textblock_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Efl_Canvas_Text_Data *o;
    static Eina_Bool linebreak_init = EINA_FALSE;
 
@@ -12631,7 +12631,7 @@ evas_object_textblock_init(Evas_Object *eo_obj)
      }
 
    o = obj->private_data;
-   Efl_Canvas_Text_Cursor_Data *co = eo_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *co = efl_data_scope_get(o->cursor, EFL_CANVAS_TEXT_CURSOR_CLASS);
    co->obj = eo_obj;
    evas_object_textblock_text_markup_set(eo_obj, "");
 
@@ -12645,13 +12645,13 @@ EOLIAN static void
 _efl_canvas_text_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED)
 {
    evas_object_textblock_free(eo_obj);
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 static void
 evas_object_textblock_free(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    _evas_object_textblock_clear(eo_obj);
    evas_object_textblock_style_set(eo_obj, NULL);
@@ -13407,21 +13407,21 @@ evas_object_textblock_render_post(Evas_Object *eo_obj,
 
 static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_TEXTBLOCK;
 }
 
 static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_CUSTOM;
 }
 
 static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
    return o->engine_data;
 }
@@ -13461,8 +13461,8 @@ evas_object_textblock_scale_update(Evas_Object *eo_obj EINA_UNUSED,
 void
 _evas_object_textblock_rehint(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Textblock_Paragraph *par;
    Evas_Object_Textblock_Line *ln;
 
@@ -13497,7 +13497,7 @@ _efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
                                                            Evas_BiDi_Direction dir)
 {
 #ifdef BIDI_SUPPORT
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) ||
        (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT)))
@@ -13565,7 +13565,7 @@ _efl_canvas_text_cursor_text_append(Efl_Canvas_Text_Cursor_Data *cur,
    const char *off = text;
    int len = 0;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    while (*off)
@@ -13624,7 +13624,7 @@ _canvas_text_get_all(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED)
 EOLIAN static const char *
 _efl_canvas_text_efl_text_text_get(Eo *eo_obj, Efl_Canvas_Text_Data *o)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
    free(o->utf8);
@@ -13924,8 +13924,8 @@ _efl_canvas_text_annotation_insert(Eo *eo_obj, Efl_Canvas_Text_Data *o,
       Efl_Canvas_Text_Cursor *start_obj, Efl_Canvas_Text_Cursor *end_obj,
       const char *format)
 {
-   Efl_Canvas_Text_Cursor_Data *start = eo_data_scope_get(start_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   Efl_Canvas_Text_Cursor_Data *end = eo_data_scope_get(end_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *start = efl_data_scope_get(start_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *end = efl_data_scope_get(end_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
 
    return _textblock_annotation_insert(eo_obj, o, start, end, format,
          EINA_FALSE);
@@ -13937,8 +13937,8 @@ _efl_canvas_text_range_annotations_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_D
 {
    Eina_List *lst = NULL;
    Efl_Canvas_Text_Annotation *it;
-   Efl_Canvas_Text_Cursor_Data *start = eo_data_scope_get(start_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
-   Efl_Canvas_Text_Cursor_Data *end = eo_data_scope_get(end_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *start = efl_data_scope_get(start_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
+   Efl_Canvas_Text_Cursor_Data *end = efl_data_scope_get(end_obj, EFL_CANVAS_TEXT_CURSOR_CLASS);
 
    EINA_INLIST_FOREACH(o->annotations, it)
      {
@@ -13963,7 +13963,7 @@ EOLIAN static Efl_Canvas_Text_Annotation *
 _efl_canvas_text_cursor_object_item_insert(Eo *cur_obj EINA_UNUSED,
          Efl_Canvas_Text_Cursor_Data *cur, const char *format)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    Efl_Canvas_Text_Annotation *ret =
       _textblock_annotation_insert(cur->obj, o, cur, cur, format, EINA_TRUE);
    efl_event_callback_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL);
@@ -13997,7 +13997,7 @@ _efl_canvas_text_object_item_geometry_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EI
 {
    Efl_Canvas_Text_Cursor_Data cur;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    _relayout_if_needed(eo_obj, o);
 
@@ -14015,7 +14015,7 @@ _efl_canvas_text_object_item_geometry_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EI
 EAPI Eina_Bool
 _evas_textblock_check_item_node_link(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Textblock_Paragraph *par;
    Evas_Object_Textblock_Line *ln;
    Evas_Object_Textblock_Item *it;
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 62316ea6bb..1942a4c570 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -151,10 +151,10 @@ static const Evas_Object_Func object_func =
 static void
 evas_object_textgrid_init(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 
    Evas_Textgrid_Data *o = obj->private_data;
@@ -200,7 +200,7 @@ evas_object_textgrid_rows_clear(Evas_Object *eo_obj)
 {
    int i;
 
-   Evas_Textgrid_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o->cur.rows) return;
    for (i = 0; i < o->cur.h; i++)
      {
@@ -214,7 +214,7 @@ static void
 evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 {
    Evas_Object_Textgrid_Color *c;
-   Evas_Textgrid_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    /* free obj */
    evas_object_textgrid_rows_clear(eo_obj);
@@ -243,10 +243,10 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 EOLIAN static void
 _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_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_textgrid_free(eo_obj, obj);
-   eo_data_unref(eo_obj, obj->private_data);
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_data_unref(eo_obj, obj->private_data);
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 static void
@@ -824,7 +824,7 @@ evas_object_textgrid_render_post(Evas_Object *eo_obj,
 static unsigned int
 evas_object_textgrid_id_get(Evas_Object *eo_obj)
 {
-   Evas_Textgrid_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_TEXTGRID;
 }
@@ -832,7 +832,7 @@ evas_object_textgrid_id_get(Evas_Object *eo_obj)
 static unsigned int
 evas_object_textgrid_visual_id_get(Evas_Object *eo_obj)
 {
-   Evas_Textgrid_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SHAPE;
 }
@@ -840,7 +840,7 @@ evas_object_textgrid_visual_id_get(Evas_Object *eo_obj)
 static void *
 evas_object_textgrid_engine_data_get(Evas_Object *eo_obj)
 {
-   Evas_Textgrid_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
    return o->font_normal; /* TODO: why ? */
 }
@@ -895,14 +895,14 @@ evas_object_textgrid_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(EVAS_TEXTGRID_CLASS, e);
+   Evas_Object *eo_obj = efl_add(EVAS_TEXTGRID_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_textgrid_efl_object_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
 {
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    evas_object_textgrid_init(eo_obj);
 
@@ -913,7 +913,7 @@ EOLIAN static void
 _evas_textgrid_size_set(Eo *eo_obj, Evas_Textgrid_Data *o, int w, int h)
 {
    int i;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if ((h <= 0) || (w <= 0)) return;
 
@@ -962,7 +962,7 @@ _evas_textgrid_size_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int *w, i
 EOLIAN static void
 _evas_textgrid_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_source)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if ((!font_source) || (!*font_source))
      return;
@@ -1052,7 +1052,7 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
                                             const char *font_name,
                                             Evas_Font_Size font_size)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Eina_Bool is, was = EINA_FALSE;
    Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
    Eina_Bool source_invisible = EINA_FALSE;
@@ -1271,7 +1271,7 @@ _evas_textgrid_palette_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas_Textgrid_Pale
 
    Eina_Array *palette;
    Evas_Object_Textgrid_Color *color, *c;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int count, i;
 
    if ((idx < 0) || (idx > 255)) return;
@@ -1393,7 +1393,7 @@ _evas_textgrid_supported_font_styles_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas
    /* FIXME: to do */
    if (styles)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         o->changed = 1;
         evas_object_change(eo_obj, obj);
      }
@@ -1418,7 +1418,7 @@ EOLIAN static Evas_Textgrid_Cell*
 _evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y)
 {
    Evas_Textgrid_Cell *ret;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if ((y < 0) || (y >= o->cur.h)) ret = NULL;
 
@@ -1430,7 +1430,7 @@ _evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o,
 EOLIAN static void
 _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int i, x2;
    
    RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, o->cur.w, o->cur.h);
@@ -1462,25 +1462,25 @@ _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w
 EOLIAN static void
 _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   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_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
    Efl_Dbg_Info *node;
 
    const char *text;
    int size;
    efl_text_properties_font_get(eo_obj, &text, &size);
-   EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
-   EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
+   EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
+   EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
 
    text = efl_text_properties_font_source_get(eo_obj);
-   EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
+   EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
 
      {
         int w, h;
         evas_obj_textgrid_size_get(eo_obj, &w, &h);
-        node = EO_DBG_INFO_LIST_APPEND(group, "Grid size");
-        EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
-        EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
+        node = EFL_DBG_INFO_LIST_APPEND(group, "Grid size");
+        EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
+        EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
      }
 }
 
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index 18522481e3..ccc247ee8c 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -67,7 +67,7 @@ evas_object_vg_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
 
    // Ask backend to return the main Ector_Surface
 
@@ -88,7 +88,7 @@ _cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED)
 
    /* unref all renderer and may also destroy them async */
    while ((renderer = eina_array_pop(&pd->cleanup)))
-     eo_unref(renderer);
+     efl_unref(renderer);
 }
 
 void
@@ -97,32 +97,32 @@ _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);
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (pd->engine_data)
      obj->layer->evas->engine.func->ector_free(pd->engine_data);
 
    efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
 
-   eo_unref(pd->root);
+   efl_unref(pd->root);
    pd->root = NULL;
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 Eo *
 _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);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    /* set up methods (compulsory) */
    obj->func = &object_func;
-   obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
+   obj->private_data = efl_data_ref(eo_obj, MY_CLASS);
    obj->type = o_type;
 
    /* root node */
-   pd->root = eo_add(EFL_VG_ROOT_NODE_CLASS, eo_obj);
-   eo_ref(pd->root);
+   pd->root = efl_add(EFL_VG_ROOT_NODE_CLASS, eo_obj);
+   efl_ref(pd->root);
 
    eina_array_step_set(&pd->cleanup, sizeof(pd->cleanup), 8);
 
@@ -146,13 +146,13 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd,
                 void *output, void *context, void *surface, Efl_VG *n,
                 Eina_Array *clips, Eina_Bool do_async)
 {
-   if (eo_isa(n, EFL_VG_CONTAINER_CLASS))
+   if (efl_isa(n, EFL_VG_CONTAINER_CLASS))
      {
         Efl_VG_Container_Data *vc;
         Efl_VG *child;
         Eina_List *l;
 
-        vc = eo_data_scope_get(n, EFL_VG_CONTAINER_CLASS);
+        vc = efl_data_scope_get(n, EFL_VG_CONTAINER_CLASS);
 
         EINA_LIST_FOREACH(vc->children, l, child)
           _evas_vg_render(obj, vd,
@@ -163,12 +163,12 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd,
      {
         Efl_VG_Data *nd;
 
-        nd = eo_data_scope_get(n, EFL_VG_CLASS);
+        nd = efl_data_scope_get(n, EFL_VG_CLASS);
 
         obj->layer->evas->engine.func->ector_renderer_draw(output, context, surface, vd->engine_data, nd->renderer, clips, do_async);
 
         if (do_async)
-          eina_array_push(&vd->cleanup, eo_ref(nd->renderer));
+          eina_array_push(&vd->cleanup, efl_ref(nd->renderer));
      }
 }
 
@@ -262,7 +262,7 @@ evas_object_vg_render_pre(Evas_Object *eo_obj,
 
    // FIXME: for now the walking Evas_VG_Node tree doesn't trigger any damage
    // So just forcing it here if necessary
-   rnd = eo_data_scope_get(vd->root, EFL_VG_CLASS);
+   rnd = efl_data_scope_get(vd->root, EFL_VG_CLASS);
 
    // Once the destructor has been called, root node will be zero
    // and a full redraw is still necessary.
@@ -372,7 +372,7 @@ evas_object_vg_render_post(Evas_Object *eo_obj,
 static unsigned int
 evas_object_vg_id_get(Evas_Object *eo_obj)
 {
-   Evas_VG_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_VG;
 }
@@ -380,7 +380,7 @@ evas_object_vg_id_get(Evas_Object *eo_obj)
 static unsigned int
 evas_object_vg_visual_id_get(Evas_Object *eo_obj)
 {
-   Evas_VG_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return 0;
    return MAGIC_OBJ_SHAPE;
 }
@@ -388,7 +388,7 @@ evas_object_vg_visual_id_get(Evas_Object *eo_obj)
 static void *
 evas_object_vg_engine_data_get(Evas_Object *eo_obj)
 {
-   Evas_VG_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->engine_data;
 }
 
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 25931752ec..b28ce65ddd 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -19,7 +19,7 @@ evas_out_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
@@ -30,10 +30,10 @@ _evas_out_efl_object_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
    Evas_Public_Data *e;
 
    eo_parent = efl_parent_get(eo_obj);
-   e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    if (!e) return NULL;
    e->outputs = eina_list_append(e->outputs, eo_obj);
@@ -48,7 +48,7 @@ _evas_out_efl_object_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 EAPI void
 evas_output_del(Evas_Out *evo)
 {
-   eo_unref(evo);
+   efl_unref(evo);
 }
 
 EOLIAN static void
@@ -58,7 +58,7 @@ _evas_out_efl_object_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
    Evas_Public_Data *e;
 
    eo_parent = efl_parent_get(eo_obj);
-   e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
    if (!e) return;
    // XXX: need to free output and context one they get allocated one day
@@ -66,7 +66,7 @@ _evas_out_efl_object_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);
-   efl_destructor(eo_super(eo_obj, MY_CLASS));
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -75,7 +75,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 = efl_parent_get(eo_e);
-   e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
    evas_canvas_async_block(e);
    eo_dat->x = x;
    eo_dat->y = y;
@@ -100,7 +100,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 = efl_parent_get(eo_e);
-   e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
+   e = efl_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_render.c b/src/lib/evas/canvas/evas_render.c
index 8426ac3a0b..496c4b2f9f 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -71,7 +71,7 @@ rend_dbg(const char *txt)
 do                                  \
 {                                   \
    eina_array_push(array, obj);     \
-   eo_data_ref(obj->object, NULL);  \
+   efl_data_ref(obj->object, NULL);  \
 } while (0)
 
 #define OBJS_ARRAY_CLEAN(array)                       \
@@ -80,7 +80,7 @@ do                                  \
    Eina_Array_Iterator iterator;                      \
    unsigned int idx;                                  \
    EINA_ARRAY_ITER_NEXT(array, idx, item, iterator)   \
-      eo_data_unref(item->object, item);              \
+      efl_data_unref(item->object, item);              \
    eina_array_clean(array);                           \
 }
 
@@ -90,7 +90,7 @@ do                                  \
    Eina_Array_Iterator iterator;                      \
    unsigned int idx;                                  \
    EINA_ARRAY_ITER_NEXT(array, idx, item, iterator)   \
-      eo_data_unref(item->object, item);              \
+      efl_data_unref(item->object, item);              \
    eina_array_flush(array);                           \
 }
 
@@ -256,7 +256,7 @@ _evas_render_had_map(Evas_Object_Protected_Data *obj)
 static Eina_Bool
 _evas_render_is_relevant(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    return ((evas_object_is_visible(eo_obj, obj) && (!obj->cur->have_clipees)) ||
            (evas_object_was_visible(eo_obj, obj) && (!obj->prev->have_clipees)));
 }
@@ -316,7 +316,7 @@ _evas_proxy_redraw_set(Evas_Public_Data *e, Evas_Object_Protected_Data *obj,
 
    EINA_LIST_FOREACH(obj->proxy->proxies, l, eo_proxy)
      {
-        proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
+        proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
 
         /* Flag need redraw on proxy too */
         EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, proxy->proxy,
@@ -508,7 +508,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
    Eina_Bool map, hmap, can_map;
    int is_active;
 
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    //Need pre render for the children of mapped object.
    //But only when they have changed.
    if (mapped_parent && (!obj->changed)) return EINA_FALSE;
@@ -934,7 +934,7 @@ pending_change(void *data, void *gdata EINA_UNUSED)
      {
         evas_object_change_reset(eo_obj);
      }
-   if (!obj->changed) eo_data_unref(eo_obj, obj);
+   if (!obj->changed) efl_data_unref(eo_obj, obj);
    return obj->changed ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -950,7 +950,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj)
    Evas_Coord xc1, yc1, xc2, yc2;
    int i;
    Eina_Bool nooverlay;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *tmp = NULL;
    Evas_Coord imgw, imgh;
    unsigned int caps;
@@ -961,11 +961,11 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj)
 
    /* Check if any one is the stack make this object mapped */
    eo_tmp = eo_obj;
-   tmp = eo_data_scope_get(eo_tmp, EFL_CANVAS_OBJECT_CLASS);
+   tmp = efl_data_scope_get(eo_tmp, EFL_CANVAS_OBJECT_CLASS);
    while (tmp && !(_evas_render_has_map(tmp) && !_evas_render_can_map(tmp)))
      {
         eo_tmp = tmp->smart.parent;
-        tmp = eo_data_scope_get(eo_tmp, EFL_CANVAS_OBJECT_CLASS);
+        tmp = efl_data_scope_get(eo_tmp, EFL_CANVAS_OBJECT_CLASS);
      }
 
    if (tmp && _evas_render_has_map(tmp) && !_evas_render_can_map(tmp))
@@ -1079,7 +1079,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj)
             (current->cur->visible) &&
             (!current->delete_me) &&
             (current->cur->cache.clip.visible) &&
-            (!eo_isa(eo_current, EFL_CANVAS_GROUP_CLASS)))
+            (!efl_isa(eo_current, EFL_CANVAS_GROUP_CLASS)))
           {
              Eina_Bool included = EINA_FALSE;
 
@@ -1831,7 +1831,7 @@ void
 evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy,
                             Evas_Object_Protected_Data *proxy_obj, Eina_Bool do_async)
 {
-   Evas_Public_Data *evas = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Object_Protected_Data *source;
    Eina_Bool source_clip = EINA_FALSE;
    int level = 1;
@@ -1843,7 +1843,7 @@ evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_
 #endif
 
    if (!eo_source) return;
-   source = eo_data_scope_get(eo_source, EFL_CANVAS_OBJECT_CLASS);
+   source = efl_data_scope_get(eo_source, EFL_CANVAS_OBJECT_CLASS);
 
    w = source->cur->geometry.w;
    h = source->cur->geometry.h;
@@ -1882,7 +1882,7 @@ evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_
         ENFN->rectangle_draw(ENDT, ctx, proxy_write->surface, 0, 0, w, h, do_async);
         ENFN->context_free(ENDT, ctx);
 
-        if (eo_isa(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+        if (efl_isa(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
           source_clip = _evas_image_proxy_source_clip_get(eo_proxy);
 
         Evas_Proxy_Render_Data proxy_render_data = {
@@ -1938,7 +1938,7 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
 
    RD(level, "evas_render_mask_subrender(%p, prev: %p)\n", mask, prev_mask);
 
-   is_image = eo_isa(mask->object, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   is_image = efl_isa(mask->object, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    x = mask->cur->geometry.x;
    y = mask->cur->geometry.y;
@@ -2134,7 +2134,7 @@ _evas_render_cutout_add(Evas_Public_Data *e, void *context, Evas_Object_Protecte
              Evas_Object_Protected_Data *oo;
 
              eo_oo = obj->object;
-             oo = eo_data_scope_get(eo_oo, EFL_CANVAS_OBJECT_CLASS);
+             oo = efl_data_scope_get(eo_oo, EFL_CANVAS_OBJECT_CLASS);
              while (oo->cur->clipper)
                {
                   if ((oo->cur->clipper->map->cur.map_parent
@@ -2464,7 +2464,7 @@ evas_render_updates_internal(Evas *eo_e,
    return EINA_FALSE;
    MAGIC_CHECK_END();
 
-   e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e->changed) return EINA_FALSE;
 
    if (e->rendering)
@@ -2806,7 +2806,7 @@ evas_render_updates_internal(Evas *eo_e,
 
         if (do_async)
           {
-             eo_ref(eo_e);
+             efl_ref(eo_e);
              e->rendering = EINA_TRUE;
              _rendering_evases = eina_list_append(_rendering_evases, e);
              if (haveup)
@@ -2885,7 +2885,7 @@ evas_render_updates_internal(Evas *eo_e,
           {
              Evas_Object_Protected_Data *smart_parent;
 
-             smart_parent = eo_data_scope_get(obj->smart.parent,
+             smart_parent = efl_data_scope_get(obj->smart.parent,
                                               EFL_CANVAS_OBJECT_CLASS);
              evas_object_change(obj->smart.parent, smart_parent);
           }
@@ -3001,7 +3001,7 @@ evas_render_wakeup(Evas *eo_e)
    Render_Updates *ru;
    Eina_Bool haveup = EINA_FALSE;
    Eina_List *ret_updates = NULL;
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    eina_spinlock_take(&(e->render.lock));
    EINA_LIST_FREE(e->render.updates, ru)
@@ -3050,7 +3050,7 @@ evas_render_wakeup(Evas *eo_e)
 
    evas_render_updates_free(ret_updates);
 
-   eo_unref(eo_e);
+   efl_unref(eo_e);
 
 #ifdef EVAS_RENDER_DEBUG_TIMING
    _accumulate_time(0, EINA_TRUE);
@@ -3143,7 +3143,7 @@ evas_render_updates_internal_wait(Evas *eo_e,
                                   unsigned char do_draw)
 {
    Eina_List *ret = NULL;
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (e->render2) return _evas_render2_updates_wait(eo_e, e);
    else
      {
@@ -3264,7 +3264,7 @@ _evas_canvas_sync(Eo *eo_e, Evas_Public_Data *e)
 void
 _evas_render_dump_map_surfaces(Evas_Object *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((obj->map->cur.map) && obj->map->surface)
      {
         obj->layer->evas->engine.func->image_free
@@ -3369,7 +3369,7 @@ evas_render_invalidate(Evas *eo_e)
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
    MAGIC_CHECK_END();
-   e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    OBJS_ARRAY_CLEAN(&e->active_objects);
    OBJS_ARRAY_CLEAN(&e->render_objects);
@@ -3391,7 +3391,7 @@ evas_render_object_recalc(Evas_Object *eo_obj)
    return;
    MAGIC_CHECK_END();
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if ((!obj->changed) && (obj->delete_me < 2))
      {
        Evas_Public_Data *e;
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index 8f3fd54cea..f3d86f7f28 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -161,7 +161,7 @@ _efl_canvas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_D
      }
    if (eo_obj == eo_above) return;
    if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return;
-   Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *above = efl_data_scope_get(eo_above, EFL_CANVAS_OBJECT_CLASS);
    if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above))
      {
         evas_object_inform_call_restack(eo_obj);
@@ -243,7 +243,7 @@ _efl_canvas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_D
      }
    if (eo_obj == eo_below) return;
    if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return;
-   Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *below = efl_data_scope_get(eo_below, EFL_CANVAS_OBJECT_CLASS);
    if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
      {
         evas_object_inform_call_restack(eo_obj);
diff --git a/src/lib/evas/canvas/evas_textblock_hyphenation.x b/src/lib/evas/canvas/evas_textblock_hyphenation.x
index bdcf37f92c..684b44032c 100644
--- a/src/lib/evas/canvas/evas_textblock_hyphenation.x
+++ b/src/lib/evas/canvas/evas_textblock_hyphenation.x
@@ -17,7 +17,7 @@ static size_t     _hyphen_clients = 0;
 static void
 _dicts_hyphen_init(Eo *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!o->hyphenating)
      {
@@ -93,7 +93,7 @@ _dicts_hyphen_free(void)
 static inline void
 _dicts_hyphen_detach(Eo *eo_obj)
 {
-   Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
+   Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!o->hyphenating) return;
    o->hyphenating = EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c
index f706b70d4a..a03ad9cf3d 100644
--- a/src/lib/evas/canvas/evas_touch_point.c
+++ b/src/lib/evas/canvas/evas_touch_point.c
@@ -4,7 +4,7 @@
 void
 _evas_touch_point_append(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Touch_Point *point;
 
    /* create new Evas_Coord_Touch_Point */
@@ -19,7 +19,7 @@ _evas_touch_point_append(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y)
 void
 _evas_touch_point_update(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y, Evas_Touch_Point_State state)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Eina_List *l;
    Evas_Coord_Touch_Point *point = NULL;
 
@@ -38,7 +38,7 @@ _evas_touch_point_update(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y, Evas_To
 void
 _evas_touch_point_remove(Evas *eo_e, int id)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Eina_List *l;
    Evas_Coord_Touch_Point *point = NULL;
 
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index dac9472cea..350a621dd1 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -29,7 +29,7 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED,
      {
         if (flag & EFL_GFX_CHANGE_FLAG_MATRIX)
           {
-             child_nd = eo_data_scope_get(child, EFL_VG_CLASS);
+             child_nd = efl_data_scope_get(child, EFL_VG_CLASS);
              child_nd->flags |= EFL_GFX_CHANGE_FLAG_MATRIX;
           }
         _evas_vg_render_pre(child, s, current);
@@ -44,9 +44,9 @@ _efl_vg_container_efl_object_constructor(Eo *obj,
 
    pd->names = eina_hash_stringshared_new(NULL);
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_container_render_pre;
    nd->data = pd;
    nd->flags = EFL_GFX_CHANGE_FLAG_ALL;
@@ -58,7 +58,7 @@ static void
 _efl_vg_container_efl_object_destructor(Eo *obj,
                                      Efl_VG_Container_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 
    eina_hash_free(pd->names);
    pd->names = NULL;
@@ -121,11 +121,11 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
    Eo *from_child, *to_child, *child;
 
    //1. check if both the object are containers
-   if (!(eo_isa(from, EFL_VG_CONTAINER_CLASS) &&
-         eo_isa(to, EFL_VG_CONTAINER_CLASS)))
+   if (!(efl_isa(from, EFL_VG_CONTAINER_CLASS) &&
+         efl_isa(to, EFL_VG_CONTAINER_CLASS)))
      return EINA_FALSE;
 
-   r = efl_vg_interpolate(eo_super(obj, EFL_VG_CONTAINER_CLASS), from, to, pos_map);
+   r = efl_vg_interpolate(efl_super(obj, EFL_VG_CONTAINER_CLASS), from, to, pos_map);
 
    if (!r) return EINA_FALSE;
 
@@ -135,8 +135,8 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
      {
         res &= eina_iterator_next(from_it, (void **)&from_child);
         res &= eina_iterator_next(to_it, (void **)&to_child);
-        if (!res && (eo_class_get(from_child) != eo_class_get(to_child) ||
-            (eo_class_get(child) != eo_class_get(from_child))))
+        if (!res && (efl_class_get(from_child) != efl_class_get(to_child) ||
+            (efl_class_get(child) != efl_class_get(from_child))))
           {
              r = EINA_FALSE;
              break;
@@ -160,25 +160,25 @@ _efl_vg_container_efl_vg_dup(Eo *obj,
    Eina_List *l;
    Eo *child;
 
-   efl_vg_dup(eo_super(obj, EFL_VG_CONTAINER_CLASS), from);
+   efl_vg_dup(efl_super(obj, EFL_VG_CONTAINER_CLASS), from);
 
-   fromd = eo_data_scope_get(from, EFL_VG_CONTAINER_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_CONTAINER_CLASS);
 
    EINA_LIST_FREE(pd->children, child)
-     eo_unref(child);
+     efl_unref(child);
 
    EINA_LIST_FOREACH(fromd->children, l, child)
      {
         // By setting parent, we automatically reference
         // this new object as a child of obj. Magic at work !
-        (void) eo_add(eo_class_get(child), obj, efl_vg_dup(eo_self, child));
+        (void) efl_add(efl_class_get(child), obj, efl_vg_dup(efl_self, child));
      }
 }
 
 EAPI Efl_VG*
 evas_vg_container_add(Efl_VG *parent)
 {
-   return eo_add(EFL_VG_CONTAINER_CLASS, parent);
+   return efl_add(EFL_VG_CONTAINER_CLASS, parent);
 }
 
 #include "efl_vg_container.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index 492bafbcb3..12f8b3d504 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -63,10 +63,10 @@ _efl_vg_gradient_efl_vg_interpolate(Eo *obj,
    double from_map;
    Eina_Bool r;
 
-   r = efl_vg_interpolate(eo_super(obj, EFL_VG_GRADIENT_CLASS), from, to, pos_map);
+   r = efl_vg_interpolate(efl_super(obj, EFL_VG_GRADIENT_CLASS), from, to, pos_map);
 
-   fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
-   tod = eo_data_scope_get(to, EFL_VG_GRADIENT_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
+   tod = efl_data_scope_get(to, EFL_VG_GRADIENT_CLASS);
    from_map = 1.0 - pos_map;
 
    if (!r) return EINA_FALSE;
@@ -101,9 +101,9 @@ _efl_vg_gradient_efl_vg_dup(Eo *obj,
 {
    Efl_VG_Gradient_Data *fromd;
 
-   efl_vg_dup(eo_super(obj, EFL_VG_GRADIENT_CLASS), from);
+   efl_vg_dup(efl_super(obj, EFL_VG_GRADIENT_CLASS), from);
 
-   fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
 
    efl_gfx_gradient_stop_set(obj, fromd->colors, fromd->colors_count);
    efl_gfx_gradient_spread_set(obj, fromd->s);
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index 713ceeb814..11fb903210 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -69,7 +69,7 @@ _efl_vg_gradient_linear_render_pre(Eo *obj,
 
    nd->flags = EFL_GFX_CHANGE_FLAG_NONE;
 
-   gd = eo_data_scope_get(obj, EFL_VG_GRADIENT_CLASS);
+   gd = efl_data_scope_get(obj, EFL_VG_GRADIENT_CLASS);
    EFL_VG_COMPUTE_MATRIX(current, parent, nd);
 
    if (!nd->renderer)
@@ -94,9 +94,9 @@ _efl_vg_gradient_linear_efl_object_constructor(Eo *obj,
 {
    Efl_VG_Data *nd;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_gradient_linear_render_pre;
    nd->data = pd;
 
@@ -106,7 +106,7 @@ _efl_vg_gradient_linear_efl_object_constructor(Eo *obj,
 static void
 _efl_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -114,7 +114,7 @@ _efl_vg_gradient_linear_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Linear_Data *
 {
    Efl_VG_Data *nd;
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    EINA_RECTANGLE_SET(r,
                       nd->x + pd->start.x, nd->y + pd->start.y,
                       pd->end.x - pd->start.x, pd->end.y - pd->start.x);
@@ -130,12 +130,12 @@ _efl_vg_gradient_linear_efl_vg_interpolate(Eo *obj,
    double from_map;
    Eina_Bool r;
 
-   r = efl_vg_interpolate(eo_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from, to, pos_map);
+   r = efl_vg_interpolate(efl_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from, to, pos_map);
 
    if (!r) return EINA_FALSE;
 
-   fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_LINEAR_CLASS);
-   tod = eo_data_scope_get(to, EFL_VG_GRADIENT_LINEAR_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_LINEAR_CLASS);
+   tod = efl_data_scope_get(to, EFL_VG_GRADIENT_LINEAR_CLASS);
    from_map = 1.0 - pos_map;
 
 #define INTP(Pd, From, To, Member, From_Map, Pos_Map)   \
@@ -158,9 +158,9 @@ _efl_vg_gradient_linear_efl_vg_dup(Eo *obj,
 {
    Efl_VG_Gradient_Linear_Data *fromd;
 
-   efl_vg_dup(eo_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from);
+   efl_vg_dup(efl_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from);
 
-   fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_LINEAR_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_LINEAR_CLASS);
 
    efl_gfx_gradient_linear_start_set(obj, fromd->start.x, fromd->start.y);
    efl_gfx_gradient_linear_end_set(obj, fromd->end.x, fromd->end.y);
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 39516a8479..a83c016a38 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -85,7 +85,7 @@ _efl_vg_gradient_radial_render_pre(Eo *obj,
 
    nd->flags = EFL_GFX_CHANGE_FLAG_NONE;
 
-   gd = eo_data_scope_get(obj, EFL_VG_GRADIENT_CLASS);
+   gd = efl_data_scope_get(obj, EFL_VG_GRADIENT_CLASS);
    EFL_VG_COMPUTE_MATRIX(current, parent, nd);
 
    if (!nd->renderer)
@@ -110,9 +110,9 @@ _efl_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_VG_Gradient_Radial_D
 {
    Efl_VG_Data *nd;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_gradient_radial_render_pre;
    nd->data = pd;
 
@@ -123,7 +123,7 @@ static void
 _efl_vg_gradient_radial_efl_object_destructor(Eo *obj,
                                            Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -131,7 +131,7 @@ _efl_vg_gradient_radial_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_Data *
 {
    Efl_VG_Data *nd;
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    EINA_RECTANGLE_SET(r,
                       nd->x + pd->center.x - pd->radius,
                       nd->y + pd->center.y - pd->radius,
@@ -148,12 +148,12 @@ _efl_vg_gradient_radial_efl_vg_interpolate(Eo *obj,
    double from_map;
    Eina_Bool r;
 
-   r = efl_vg_interpolate(eo_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from, to, pos_map);
+   r = efl_vg_interpolate(efl_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from, to, pos_map);
 
    if (!r) return EINA_FALSE;
 
-   fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_RADIAL_CLASS);
-   tod = eo_data_scope_get(to, EFL_VG_GRADIENT_RADIAL_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_RADIAL_CLASS);
+   tod = efl_data_scope_get(to, EFL_VG_GRADIENT_RADIAL_CLASS);
    from_map = 1.0 - pos_map;
 
 #define INTP(Pd, From, To, Member, From_Map, Pos_Map)   \
@@ -177,9 +177,9 @@ _efl_vg_gradient_radial_efl_vg_dup(Eo *obj,
 {
    Efl_VG_Gradient_Radial_Data *fromd;
 
-   efl_vg_dup(eo_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from);
+   efl_vg_dup(efl_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from);
 
-   fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_RADIAL_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_RADIAL_CLASS);
 
    efl_gfx_gradient_radial_focal_set(obj, fromd->focal.x, fromd->focal.y);
    efl_gfx_gradient_radial_center_set(obj, fromd->center.x, fromd->center.y);
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index b1c788290d..0111adb9a1 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -199,8 +199,8 @@ _efl_vg_mask_set(Eo *obj EINA_UNUSED,
 {
    Efl_VG *tmp = pd->mask;
 
-   pd->mask = eo_ref(r);
-   eo_unref(tmp);
+   pd->mask = efl_ref(r);
+   efl_unref(tmp);
 
    _efl_vg_changed(obj);
 }
@@ -240,22 +240,22 @@ _efl_vg_parent_checked_get(Eo *obj,
    *cd = NULL;
    *parent = efl_parent_get(obj);
 
-   if (eo_isa(*parent, EFL_VG_CONTAINER_CLASS))
+   if (efl_isa(*parent, EFL_VG_CONTAINER_CLASS))
      {
-        *cd = eo_data_scope_get(*parent, EFL_VG_CONTAINER_CLASS);
+        *cd = efl_data_scope_get(*parent, EFL_VG_CONTAINER_CLASS);
         if (!*cd)
           {
              ERR("Can't get EFL_VG_CONTAINER_CLASS data.");
              goto on_error;
           }
      }
-   else if (eo_isa(*parent, EVAS_VG_CLASS))
+   else if (efl_isa(*parent, EVAS_VG_CLASS))
      {
         goto on_error;
      }
    else if (*parent != NULL)
      {
-        ERR("Parent of unauthorized class '%s'.", eo_class_name_get(eo_class_get(*parent)));
+        ERR("Parent of unauthorized class '%s'.", efl_class_name_get(efl_class_get(*parent)));
         goto on_error;
      }
 
@@ -274,7 +274,7 @@ _efl_vg_efl_object_constructor(Eo *obj,
    Efl_VG_Container_Data *cd = NULL;
    Eo *parent;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    if (!_efl_vg_parent_checked_get(obj, &parent, &cd)) {
         ERR("Failed");
@@ -308,7 +308,7 @@ _efl_vg_efl_object_destructor(Eo *obj, Efl_VG_Data *pd)
         pd->intp = NULL;
      }
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static void
@@ -363,9 +363,9 @@ _efl_vg_efl_object_parent_set(Eo *obj,
    Efl_VG_Container_Data *old_cd = NULL;
    Eo *old_parent;
 
-   if (eo_isa(parent, EFL_VG_CONTAINER_CLASS))
+   if (efl_isa(parent, EFL_VG_CONTAINER_CLASS))
      {
-        cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
+        cd = efl_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
         if (!cd)
           {
              ERR("Can't get EFL_VG_CONTAINER_CLASS data from %p.", parent);
@@ -392,7 +392,7 @@ _efl_vg_efl_object_parent_set(Eo *obj,
         if (pd->name) eina_hash_del(old_cd->names, pd->name, obj);
      }
 
-   efl_parent_set(eo_super(obj, MY_CLASS), parent);
+   efl_parent_set(efl_super(obj, MY_CLASS), parent);
    if (cd)
      {
         cd->children = eina_list_append(cd->children, obj);
@@ -418,8 +418,8 @@ _efl_vg_efl_gfx_stack_raise(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
    Eo *parent;
 
    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);
+   if (!efl_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
+   cd = efl_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
    // FIXME: this could become slow with to much object
    lookup = eina_list_data_find_list(cd->children, obj);
@@ -448,8 +448,8 @@ _efl_vg_efl_gfx_stack_stack_above(Eo *obj,
    Eo *parent;
 
    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);
+   if (!efl_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
+   cd = efl_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
    // FIXME: this could become slow with to much object
    lookup = eina_list_data_find_list(cd->children, obj);
@@ -478,8 +478,8 @@ _efl_vg_efl_gfx_stack_stack_below(Eo *obj,
    Eo *parent;
 
    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);
+   if (!efl_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
+   cd = efl_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
    // FIXME: this could become slow with to much object
    lookup = eina_list_data_find_list(cd->children, obj);
@@ -506,8 +506,8 @@ _efl_vg_efl_gfx_stack_lower(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
    Eo *parent;
 
    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);
+   if (!efl_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
+   cd = efl_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
 
    // FIXME: this could become slow with to much object
    lookup = eina_list_data_find_list(cd->children, obj);
@@ -531,7 +531,7 @@ _efl_vg_root_parent_get(Eo *obj)
 {
    Eo *parent;
 
-   if (eo_isa(obj, EFL_VG_ROOT_NODE_CLASS))
+   if (efl_isa(obj, EFL_VG_ROOT_NODE_CLASS))
      return obj;
 
    parent = efl_parent_get(obj);
@@ -550,13 +550,13 @@ _efl_vg_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r)
 
    eina_array_push(a, root);
 
-   if (eo_isa(root, EFL_VG_CONTAINER_CLASS))
+   if (efl_isa(root, EFL_VG_CONTAINER_CLASS))
      {
         Efl_VG_Container_Data *cd;
         Eina_List *l;
         Eo *child;
 
-        cd = eo_data_scope_get(root, EFL_VG_CONTAINER_CLASS);
+        cd = efl_data_scope_get(root, EFL_VG_CONTAINER_CLASS);
         EINA_LIST_FOREACH(cd->children, l, child)
           _efl_vg_walk_down_at(child, a, r);
      }
@@ -678,8 +678,8 @@ _efl_vg_interpolate(Eo *obj,
    double from_map;
    Eina_Bool r = EINA_TRUE;
 
-   fromd = eo_data_scope_get(from, EFL_VG_CLASS);
-   tod = eo_data_scope_get(to, EFL_VG_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_CLASS);
+   tod = efl_data_scope_get(to, EFL_VG_CLASS);
    from_map = 1.0 - pos_map;
 
    efl_del(pd->renderer);
@@ -754,7 +754,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from)
    Efl_VG_Data *fromd;
    Eo *parent = NULL;
 
-   fromd = eo_data_scope_get(from, EFL_VG_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_CLASS);
    if (pd->name != fromd->name)
      {
         eina_stringshare_del(pd->name);
@@ -790,7 +790,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from)
    _efl_vg_clean_object(&pd->mask);
    if (fromd->mask)
      {
-        pd->mask = eo_add(eo_class_get(fromd->mask), obj, efl_vg_dup(eo_self, pd->mask));
+        pd->mask = efl_add(efl_class_get(fromd->mask), obj, efl_vg_dup(efl_self, pd->mask));
      }
 
    pd->x = fromd->x;
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index 87f327bcd2..8d85915fc1 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -75,7 +75,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
 
    // FIXME: Prevent infinite loop
    if (child)
-     child_nd = eo_data_scope_get(child, EFL_VG_CLASS);
+     child_nd = efl_data_scope_get(child, EFL_VG_CLASS);
    if (child_nd)
      child_nd->render_pre(child, m, s, child_nd->data, child_nd);
 
@@ -102,7 +102,7 @@ _efl_vg_realloc(void *from, unsigned int sz)
 static inline void
 _efl_vg_clean_object(Eo **obj)
 {
-   if (*obj) eo_unref(*obj);
+   if (*obj) efl_unref(*obj);
    *obj = NULL;
 }
 
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 9925b7963a..8e2d1b0cad 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -36,7 +36,7 @@ static void
 _evas_vg_root_node_changed(void *data, const Eo_Event *event)
 {
    Efl_VG_Root_Node_Data *pd = data;
-   Efl_VG_Data *bd = eo_data_scope_get(event->object, EFL_VG_CLASS);
+   Efl_VG_Data *bd = efl_data_scope_get(event->object, EFL_VG_CLASS);
 
    if (bd->changed) return;
    bd->changed = EINA_TRUE;
@@ -50,15 +50,15 @@ _efl_vg_root_node_efl_object_parent_set(Eo *obj,
                                      Eo *parent)
 {
    // Nice little hack, jump over parent parent_set in Efl_VG_Root
-   efl_parent_set(eo_super(obj, EFL_VG_CLASS), parent);
-   if (parent && !eo_isa(parent, EVAS_VG_CLASS))
+   efl_parent_set(efl_super(obj, EFL_VG_CLASS), parent);
+   if (parent && !efl_isa(parent, EVAS_VG_CLASS))
      {
         ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
      }
    else
      {
         pd->parent = parent;
-        pd->data = parent ? eo_data_scope_get(parent, EFL_CANVAS_OBJECT_CLASS) : NULL;
+        pd->data = parent ? efl_data_scope_get(parent, EFL_CANVAS_OBJECT_CLASS) : NULL;
      }
 }
 
@@ -72,20 +72,20 @@ _efl_vg_root_node_efl_object_constructor(Eo *obj,
 
    // We are copying here the code of the vg container to make it possible to
    // enforce that the root node is the only one to attach to an Evas_Object_VG
-   cd = eo_data_scope_get(obj, EFL_VG_CONTAINER_CLASS);
+   cd = efl_data_scope_get(obj, EFL_VG_CONTAINER_CLASS);
    cd->children = NULL;
    cd->names = eina_hash_stringshared_new(NULL);
 
    // Nice little hack, jump over parent constructor in Efl_VG_Root
-   obj = efl_constructor(eo_super(obj, EFL_VG_CLASS));
+   obj = efl_constructor(efl_super(obj, EFL_VG_CLASS));
    parent = efl_parent_get(obj);
    efl_vg_name_set(obj, "root");
-   if (!eo_isa(parent, EVAS_VG_CLASS)) {
+   if (!efl_isa(parent, EVAS_VG_CLASS)) {
         ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
         return NULL;
    }
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _evas_vg_root_node_render_pre;
    nd->data = cd;
 
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 5b0a0c8b38..dc44a0881a 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -32,8 +32,8 @@ _efl_vg_shape_fill_set(Eo *obj EINA_UNUSED,
 {
    Efl_VG *tmp = pd->fill;
 
-   pd->fill = eo_ref(f);
-   eo_unref(tmp);
+   pd->fill = efl_ref(f);
+   efl_unref(tmp);
 
    _efl_vg_changed(obj);
 }
@@ -55,7 +55,7 @@ _efl_vg_shape_efl_gfx_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
         return EINA_TRUE;
      }
 
-   return efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
+   return efl_gfx_color_part_set(efl_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
 }
 
 static Eina_Bool
@@ -69,7 +69,7 @@ _efl_vg_shape_efl_gfx_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
         return EINA_TRUE;
      }
 
-   return efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
+   return efl_gfx_color_part_get(efl_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
 }
 
 static void
@@ -79,8 +79,8 @@ _efl_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
 {
    Efl_VG *tmp = pd->fill;
 
-   pd->stroke.fill = eo_ref(f);
-   eo_unref(tmp);
+   pd->stroke.fill = efl_ref(f);
+   efl_unref(tmp);
 
    _efl_vg_changed(obj);
 }
@@ -99,8 +99,8 @@ _efl_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
 {
    Efl_VG *tmp = pd->stroke.marker;
 
-   pd->stroke.marker = eo_ref(m);
-   eo_unref(tmp);
+   pd->stroke.marker = efl_ref(m);
+   efl_unref(tmp);
 
    _efl_vg_changed(obj);
 }
@@ -155,14 +155,14 @@ _efl_vg_shape_efl_object_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
 {
    Efl_VG_Data *nd;
 
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    efl_gfx_shape_stroke_scale_set(obj, 1);
    efl_gfx_shape_stroke_location_set(obj, 0.5);
    efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT);
    efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER);
 
-   nd = eo_data_scope_get(obj, EFL_VG_CLASS);
+   nd = efl_data_scope_get(obj, EFL_VG_CLASS);
    nd->render_pre = _efl_vg_shape_render_pre;
    nd->data = pd;
 
@@ -172,7 +172,7 @@ _efl_vg_shape_efl_object_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
 static void
 _efl_vg_shape_efl_object_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool
@@ -184,10 +184,10 @@ _efl_vg_shape_efl_vg_interpolate(Eo *obj,
    Efl_VG_Shape_Data *fromd, *tod;
    Eina_Bool r;
 
-   fromd = eo_data_scope_get(from, EFL_VG_SHAPE_CLASS);
-   tod = eo_data_scope_get(to, EFL_VG_SHAPE_CLASS);
+   fromd = efl_data_scope_get(from, EFL_VG_SHAPE_CLASS);
+   tod = efl_data_scope_get(to, EFL_VG_SHAPE_CLASS);
 
-   r = efl_vg_interpolate(eo_super(obj, MY_CLASS), from, to, pos_map);
+   r = efl_vg_interpolate(efl_super(obj, MY_CLASS), from, to, pos_map);
 
    r &= efl_gfx_shape_interpolate(obj, from, to, pos_map);
 
@@ -213,29 +213,29 @@ _efl_vg_shape_efl_vg_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Efl_V
    Efl_VG_Shape_Data *fromd;
    Eo *fill = NULL, *stroke_fill = NULL, *stroke_marker = NULL;
 
-   efl_vg_dup(eo_super(obj, MY_CLASS), from);
+   efl_vg_dup(efl_super(obj, MY_CLASS), from);
 
-   fromd = eo_data_scope_get(from, MY_CLASS);
+   fromd = efl_data_scope_get(from, MY_CLASS);
 
    if (fromd->fill)
      {
-        fill = eo_add(eo_class_get(fromd->fill), NULL, efl_vg_dup(eo_self, fromd->fill));
+        fill = efl_add(efl_class_get(fromd->fill), NULL, efl_vg_dup(efl_self, fromd->fill));
         efl_vg_shape_fill_set(obj, fill);
-        eo_unref(fill);
+        efl_unref(fill);
      }
 
    if (fromd->stroke.fill)
      {
-        stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), NULL, efl_vg_dup(eo_self, fromd->stroke.fill));
+        stroke_fill = efl_add(efl_class_get(fromd->stroke.fill), NULL, efl_vg_dup(efl_self, fromd->stroke.fill));
         efl_vg_shape_stroke_fill_set(obj, stroke_fill);
-        eo_unref(stroke_fill);
+        efl_unref(stroke_fill);
      }
 
    if (fromd->stroke.marker)
      {
-        stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), NULL, efl_vg_dup(eo_self, fromd->stroke.marker));
+        stroke_marker = efl_add(efl_class_get(fromd->stroke.marker), NULL, efl_vg_dup(efl_self, fromd->stroke.marker));
         efl_vg_shape_stroke_marker_set(obj, stroke_marker);
-        eo_unref(stroke_marker);
+        efl_unref(stroke_marker);
      }
 
    efl_gfx_shape_dup(obj, from);
@@ -454,7 +454,7 @@ evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
 EAPI Efl_VG*
 evas_vg_shape_add(Efl_VG *parent)
 {
-   return eo_add(EFL_VG_SHAPE_CLASS, parent);
+   return efl_add(EFL_VG_SHAPE_CLASS, parent);
 }
 
 #include "efl_vg_shape.eo.c"
diff --git a/src/lib/evas/canvas/render2/evas_render2.c b/src/lib/evas/canvas/render2/evas_render2.c
index 532718af67..3a690bed81 100644
--- a/src/lib/evas/canvas/render2/evas_render2.c
+++ b/src/lib/evas/canvas/render2/evas_render2.c
@@ -92,7 +92,7 @@ _evas_render2(Eo *eo_e, Evas_Public_Data *e)
    // bock any susbequent rneders from doing this walk
    eina_lock_take(&(e->lock_objects));
    // gain a reference
-   eo_ref(eo_e);
+   efl_ref(eo_e);
    // put into the "i'm rendering" pool
    e->rendering = EINA_TRUE;
    _rendering = eina_list_append(_rendering, eo_e);
diff --git a/src/lib/evas/canvas/render2/evas_render2_old.c b/src/lib/evas/canvas/render2/evas_render2_old.c
index 62c9b955ec..f1699f3665 100644
--- a/src/lib/evas/canvas/render2/evas_render2_old.c
+++ b/src/lib/evas/canvas/render2/evas_render2_old.c
@@ -137,7 +137,7 @@ _evas_render2_updates_clean(Evas_Public_Data *e)
 static void
 _evas_render2_stage_last(Eo *eo_e, Eina_Bool make_updates, Eina_Bool do_async)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Eina_List *ret_updates = NULL;
    Evas_Event_Render_Post post;
 
@@ -364,7 +364,7 @@ Eina_Bool
 _evas_render2_begin(Eo *eo_e, Eina_Bool make_updates,
                     Eina_Bool do_draw, Eina_Bool do_async)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    // if nothing changed at all since last render - skip this frame
    if (!e->changed) return EINA_FALSE;
@@ -389,7 +389,7 @@ _evas_render2_begin(Eo *eo_e, Eina_Bool make_updates,
         if (do_async)
           {
              // ref the canvas so it stays while threads work
-             eo_ref(eo_e);
+             efl_ref(eo_e);
              // track canvas in list of things going in the background
              e->rendering = EINA_TRUE;
              _rendering = eina_list_append(_rendering, eo_e);
@@ -423,7 +423,7 @@ _evas_render2_end(Eo *eo_e)
    // or pixel upload if needed here
    _evas_render2_stage_last(eo_e, EINA_TRUE, EINA_TRUE);
    // release canvas object ref
-   eo_unref(eo_e);
+   efl_unref(eo_e);
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -432,7 +432,7 @@ _evas_render2_end(Eo *eo_e)
 void
 _evas_render2_idle_flush(Eo *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    // wait for rendering to finish so we don't mess up shared resources
    _evas_render2_wait(eo_e);
@@ -456,7 +456,7 @@ _evas_render2_idle_flush(Eo *eo_e)
 void
 _evas_render2_dump(Eo *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    // freeze core cache system async work
    evas_cache_async_freeze();
@@ -480,6 +480,6 @@ _evas_render2_dump(Eo *eo_e)
 void
 _evas_render2_wait(Eo *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    while (e->rendering) evas_async_events_process_blocking();
 }
diff --git a/src/lib/evas/canvas/render2/evas_render2_th_main.c b/src/lib/evas/canvas/render2/evas_render2_th_main.c
index 72146b4629..70d8973b86 100644
--- a/src/lib/evas/canvas/render2/evas_render2_th_main.c
+++ b/src/lib/evas/canvas/render2/evas_render2_th_main.c
@@ -4,7 +4,7 @@
    do                                  \
    {                                   \
       eina_array_push(array, obj);     \
-      eo_data_ref(obj->object, NULL);  \
+      efl_data_ref(obj->object, NULL);  \
    } while (0)
 
 #define OBJS_ARRAY_CLEAN(array)                          \
@@ -14,7 +14,7 @@
       Eina_Array_Iterator iterator;                      \
       unsigned int idx;                                  \
       EINA_ARRAY_ITER_NEXT(array, idx, item, iterator)   \
-      eo_data_unref(item->object, item);                 \
+      efl_data_unref(item->object, item);                 \
       eina_array_clean(array);                           \
    } while (0)
 
@@ -297,7 +297,7 @@ _evas_render2_th_main_do(Eo *eo_e, Evas_Public_Data *e)
      {
         EINA_LIST_FREE(updates_list, rect) free(rect);
      }
-   eo_unref(eo_e);
+   efl_unref(eo_e);
 }
 
 static void *
diff --git a/src/lib/evas/common3d/save_load/evas_model_load_save_common.c b/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
index 42fd47cf66..8c129148bf 100644
--- a/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
+++ b/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
@@ -161,7 +161,7 @@ evas_model_load_aabb_add_to_frame(Evas_Canvas3D_Mesh *mesh,
                                    Evas_Model_Load_Save_Stride stride)
 {
    Evas_Canvas3D_Mesh_Data *pd;
-   pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
    if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, frame, stride.positions))
      {
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index 9eb8c2ead7..8c9bdc859f 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -105,24 +105,24 @@ evas_filter_context_proxy_render_all(Evas_Filter_Context *ctx, Eo *eo_obj,
    Eina_List *li;
 
    if (!ctx->has_proxies) return;
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    EINA_LIST_FOREACH(ctx->buffers, li, fb)
      if (fb->source)
        {
           // TODO: Lock current object as proxyrendering (see image obj)
-          source = eo_data_scope_get(fb->source, EFL_CANVAS_OBJECT_CLASS);
+          source = efl_data_scope_get(fb->source, EFL_CANVAS_OBJECT_CLASS);
           _assert(fb->w == source->cur->geometry.w);
           _assert(fb->h == source->cur->geometry.h);
           if (source->proxy->surface && !source->proxy->redraw)
             {
                XDBG("Source already rendered: '%s' of type '%s'",
-                   fb->source_name, eo_class_name_get(eo_class_get(fb->source)));
+                   fb->source_name, efl_class_name_get(efl_class_get(fb->source)));
             }
           else
             {
                XDBG("Source needs to be rendered: '%s' of type '%s' (%s)",
-                   fb->source_name, eo_class_name_get(eo_class_get(fb->source)),
+                   fb->source_name, efl_class_name_get(efl_class_get(fb->source)),
                    source->proxy->redraw ? "redraw" : "no surface");
                evas_render_proxy_subrender(ctx->evas->evas, fb->source, eo_obj, obj, do_async);
             }
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index d45b883a92..d95809316a 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -2357,7 +2357,7 @@ _filter_program_buffers_set(Evas_Filter_Program *pgm)
                   Evas_Filter_Proxy_Binding *bind = tup->data;
                   Evas_Object_Protected_Data *obj;
 
-                  obj = eo_data_scope_get(bind->eo_source, EFL_CANVAS_OBJECT_CLASS);
+                  obj = efl_data_scope_get(bind->eo_source, EFL_CANVAS_OBJECT_CLASS);
                   buf->w = obj->cur->geometry.w;
                   buf->h = obj->cur->geometry.h;
                }
@@ -2879,7 +2879,7 @@ _buffers_update(Evas_Filter_Context *ctx, Evas_Filter_Program *pgm)
              fb->source_name = eina_stringshare_ref(pb->name);
              fb->ctx->has_proxies = EINA_TRUE;
 
-             source = eo_data_scope_get(fb->source, EFL_CANVAS_OBJECT_CLASS);
+             source = efl_data_scope_get(fb->source, EFL_CANVAS_OBJECT_CLASS);
              if ((source->cur->geometry.w != buf->w) ||
                  (source->cur->geometry.h != buf->h))
                pgm->changed = EINA_TRUE;
@@ -3000,7 +3000,7 @@ evas_filter_program_state_set(Evas_Filter_Program *pgm, Evas_Object *eo_obj,
 
    efl_gfx_color_get(eo_obj, &pgm->state.color.r, &pgm->state.color.g, &pgm->state.color.b, &pgm->state.color.a);
 
-   if (eo_isa(eo_obj, EVAS_TEXT_CLASS))
+   if (efl_isa(eo_obj, EVAS_TEXT_CLASS))
      {
         evas_obj_text_shadow_color_get(eo_obj, &pgm->state.text.shadow.r, &pgm->state.text.shadow.g, &pgm->state.text.shadow.b, &pgm->state.text.shadow.a);
         evas_obj_text_outline_color_get(eo_obj, &pgm->state.text.outline.r, &pgm->state.text.outline.g, &pgm->state.text.outline.b, &pgm->state.text.outline.a);
diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x
index 5778d85096..9794d99b4e 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -95,7 +95,7 @@ evas_event_freezes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte
    if (obj->parent_cache.freeze_events_valid)
      return obj->parent_cache.freeze_events;
    if (!obj->smart.parent) return 0;
-   Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *smart_parent_pd = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
    obj->parent_cache.freeze_events =
       evas_event_freezes_through(obj->smart.parent, smart_parent_pd);
    obj->parent_cache.freeze_events_valid = EINA_TRUE;
@@ -109,7 +109,7 @@ evas_event_passes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected
    if (obj->parent_cache.pass_events_valid)
      return obj->parent_cache.pass_events;
    if (!obj->smart.parent) return 0;
-   Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *smart_parent_pd = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
    obj->parent_cache.pass_events =
       evas_event_passes_through(obj->smart.parent, smart_parent_pd);
    obj->parent_cache.pass_events_valid = EINA_TRUE;
@@ -127,7 +127,7 @@ evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
    if (!obj->smart.parent) return 0;
    if (obj->mask->is_mask) return 0;
    Evas_Object_Protected_Data *smart_parent_pd =
-      eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+      efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
    obj->parent_cache.src_invisible =
       evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd);
    obj->parent_cache.src_invisible_valid = EINA_TRUE;
@@ -330,7 +330,7 @@ evas_object_clip_recalc(Evas_Object_Protected_Data *obj)
              if (EINA_LIKELY(obj->smart.parent != NULL))
                {
                   Evas_Object_Protected_Data *parent =
-                        eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+                        efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
                   if (parent->clip.mask)
                     {
                        if (parent->clip.mask != obj->clip.mask)
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 0d41ab6ff7..47113527e3 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -587,8 +587,8 @@ MAGIC_CHECK_FAILED(o, t, m)
 
 // helper function for legacy EAPI implementations
 #define EVAS_OBJ_GET_OR_RETURN(o, ...) ({ \
-   Evas_Object_Protected_Data *_obj = eo_isa(o, EFL_CANVAS_OBJECT_CLASS) ? \
-     eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; \
+   Evas_Object_Protected_Data *_obj = efl_isa(o, EFL_CANVAS_OBJECT_CLASS) ? \
+     efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; \
    if (!_obj) { MAGIC_CHECK_FAILED(o,0,0) return __VA_ARGS__; } \
    _obj; })
 
@@ -601,19 +601,19 @@ MAGIC_CHECK_FAILED(o, t, m)
 /* DEBUG mode: fail, but normally just ERR(). This also returns if NULL. */
 #ifdef DEBUG
 #define EVAS_OBJECT_LEGACY_API(_eo, ...) \
-   do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \
+   do { Evas_Object_Protected_Data *_o = efl_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \
       if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \
       if (EINA_UNLIKELY(!_o->legacy)) { \
-         char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", eo_class_name_get(_o->object)); \
+         char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", efl_class_name_get(_o->object)); \
          EINA_SAFETY_ERROR(buf); \
          return __VA_ARGS__; \
    } } while (0)
 #else
 #define EVAS_OBJECT_LEGACY_API(_eo, ...) \
-   do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \
+   do { Evas_Object_Protected_Data *_o = efl_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \
       if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \
       if (EINA_UNLIKELY(!_o->legacy)) { \
-         char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", eo_class_name_get(_o->object)); \
+         char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", efl_class_name_get(_o->object)); \
          EINA_SAFETY_ERROR(buf); \
    } } while (0)
 #endif
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index c232ecbcbe..13851a7586 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -52,7 +52,7 @@ _elm_web_none_efl_canvas_group_group_add(Eo *obj, Elm_Web_None_Data *_pd EINA_UN
    elm_object_text_set(resize_obj, "WebKit not supported!");
    elm_widget_resize_object_set(obj, resize_obj, EINA_TRUE);
 
-   efl_canvas_group_add(eo_super(obj, MY_CLASS));
+   efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 }
 
diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c
index cde1449878..9b43e87d0a 100644
--- a/src/modules/emotion/generic/emotion_generic.c
+++ b/src/modules/emotion/generic/emotion_generic.c
@@ -1118,7 +1118,7 @@ em_format_get(void *ef EINA_UNUSED)
 }
 
 static void
-em_video_data_size_get(void *data, int *w, int *h)
+em_videfl_data_size_get(void *data, int *w, int *h)
 {
    Emotion_Generic_Video *ev = data;
 
@@ -1684,7 +1684,7 @@ static const Emotion_Engine em_template_engine =
    em_seekable, /* seekable */
    em_frame_done, /* frame_done */
    em_format_get, /* format_get */
-   em_video_data_size_get, /* video_data_size_get */
+   em_videfl_data_size_get, /* videfl_data_size_get */
    em_yuv_rows_get, /* yuv_rows_get */
    em_bgra_data_get, /* bgra_data_get */
    em_event_feed, /* event_feed */
diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.c b/src/modules/emotion/gstreamer/emotion_gstreamer.c
index 82506753a8..82770b1590 100644
--- a/src/modules/emotion/gstreamer/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer/emotion_gstreamer.c
@@ -656,7 +656,7 @@ em_format_get(void *video)
 }
 
 static void
-em_video_data_size_get(void *video, int *w, int *h)
+em_videfl_data_size_get(void *video, int *w, int *h)
 {
    Emotion_Gstreamer_Video *ev;
    Emotion_Video_Stream    *vstream;
@@ -1168,7 +1168,7 @@ static const Emotion_Engine em_engine =
    em_seekable, /* seekable */
    em_frame_done, /* frame_done */
    em_format_get, /* format_get */
-   em_video_data_size_get, /* video_data_size_get */
+   em_videfl_data_size_get, /* videfl_data_size_get */
    em_yuv_rows_get, /* yuv_rows_get */
    em_bgra_data_get, /* bgra_data_get */
    em_event_feed, /* event_feed */
diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.c b/src/modules/emotion/gstreamer1/emotion_gstreamer.c
index 3a76595e92..b11b4f9416 100644
--- a/src/modules/emotion/gstreamer1/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.c
@@ -559,7 +559,7 @@ em_format_get(void *video)
 }
 
 static void
-em_video_data_size_get(void *video, int *w, int *h)
+em_videfl_data_size_get(void *video, int *w, int *h)
 {
    em_size_get(video, w, h);
 }
@@ -1079,7 +1079,7 @@ static const Emotion_Engine em_engine =
    em_seekable, /* seekable */
    em_frame_done, /* frame_done */
    em_format_get, /* format_get */
-   em_video_data_size_get, /* video_data_size_get */
+   em_videfl_data_size_get, /* videfl_data_size_get */
    em_yuv_rows_get, /* yuv_rows_get */
    em_bgra_data_get, /* bgra_data_get */
    em_event_feed, /* event_feed */
diff --git a/src/modules/emotion/libvlc/emotion_libvlc.c b/src/modules/emotion/libvlc/emotion_libvlc.c
index 83ed56815d..f994e4d8d9 100644
--- a/src/modules/emotion/libvlc/emotion_libvlc.c
+++ b/src/modules/emotion/libvlc/emotion_libvlc.c
@@ -803,7 +803,7 @@ em_format_get(void *video EINA_UNUSED)
 }
 
 static void
-em_video_data_size_get(void *video EINA_UNUSED, int *w EINA_UNUSED, int *h EINA_UNUSED)
+em_videfl_data_size_get(void *video EINA_UNUSED, int *w EINA_UNUSED, int *h EINA_UNUSED)
 {
 }
 
@@ -1345,7 +1345,7 @@ static const Emotion_Engine em_engine =
    em_seekable, /* seekable */
    em_frame_done, /* frame_done */
    em_format_get, /* format_get */
-   em_video_data_size_get, /* video_data_size_get */
+   em_videfl_data_size_get, /* videfl_data_size_get */
    em_yuv_rows_get, /* yuv_rows_get */
    em_bgra_data_get, /* bgra_data_get */
    em_event_feed, /* event_feed */
diff --git a/src/modules/emotion/xine/emotion_xine.c b/src/modules/emotion/xine/emotion_xine.c
index 14e3b481fb..4a9ac91be3 100644
--- a/src/modules/emotion/xine/emotion_xine.c
+++ b/src/modules/emotion/xine/emotion_xine.c
@@ -630,7 +630,7 @@ em_format_get(void *ef)
 }
 
 static void
-em_video_data_size_get(void *ef, int *w, int *h)
+em_videfl_data_size_get(void *ef, int *w, int *h)
 {
    Emotion_Xine_Video *ev;
    volatile Emotion_Xine_Video_Frame *fr;
@@ -1519,7 +1519,7 @@ static const Emotion_Engine em_engine =
      em_seekable, /* seekable */
      em_frame_done, /* frame_done */
      em_format_get, /* format_get */
-     em_video_data_size_get, /* video_data_size_get */
+     em_videfl_data_size_get, /* videfl_data_size_get */
      em_yuv_rows_get, /* yuv_rows_get */
      em_bgra_data_get, /* bgra_data_get */
      em_event_feed, /* event_feed */
diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index 21dff7d753..791be8b9d3 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -136,7 +136,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine *re;
    Evas_Engine_Info_Buffer *info;
 
diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index e3cd01e576..6aecbc6c25 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -80,7 +80,7 @@ eng_setup(Evas *evas, void *einfo)
    info = (Evas_Engine_Info_Drm *)einfo;
    if (!info) return 0;
 
-   epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (!epd) return 0;
 
    re = epd->engine.data.output;
diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c
index 648b54f89a..50fe3fb8c9 100644
--- a/src/modules/evas/engines/eglfs/evas_engine.c
+++ b/src/modules/evas/engines/eglfs/evas_engine.c
@@ -703,7 +703,7 @@ eng_setup(Evas *evas, void *in)
    if (!(info = (Evas_Engine_Info_Eglfs *)in)) return 0;
 
    /* try to get the evas public data */
-   if (!(epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0;
+   if (!(epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0;
 
    s = getenv("EVAS_GL_SWAP_MODE");
    if (s)
diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index 36d651526f..8de58080d3 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -91,7 +91,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine *re;
    Evas_Engine_Info_FB *info;
 
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 1cd81c784f..224a59297f 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -90,7 +90,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine            *re;
    Evas_Engine_Info_GL_Cocoa *info;
 
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c b/src/modules/evas/engines/gl_common/evas_gl_3d.c
index bb99434133..83cc0738ee 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c
@@ -22,7 +22,7 @@
    while (eina_iterator_next(it, &ptr))                                                            \
      {                                                                                             \
         Evas_Canvas3D_Node_Mesh *nm = (Evas_Canvas3D_Node_Mesh *)ptr;                              \
-        Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS);   \
+        Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS);   \
         CHECK_LOD_DISTANCE
 
 #define RENDER_MESH_NODE_ITERATE_END \
@@ -488,7 +488,7 @@ _mesh_frame_find(Evas_Canvas3D_Mesh *mesh, int frame,
 {
    Eina_List *left, *right;
    Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1;
-   Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
    left = pdmesh->frames;
    right = eina_list_next(left);
@@ -718,7 +718,7 @@ _material_color_build(E3D_Draw_Data *data, int frame,
 
         if (f0->material)
           {
-             Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+             Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
              if (pdm->attribs[attrib].enable)
                 break;
           }
@@ -733,7 +733,7 @@ _material_color_build(E3D_Draw_Data *data, int frame,
 
         if (f1->material)
           {
-             Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+             Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
              if (pdm->attribs[attrib].enable)
                 break;
           }
@@ -762,7 +762,7 @@ _material_color_build(E3D_Draw_Data *data, int frame,
              f1 = NULL;
           }
      }
-   Evas_Canvas3D_Material_Data *pdmf0 = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+   Evas_Canvas3D_Material_Data *pdmf0 = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
    if (f1 == NULL)
      {
         data->materials[attrib].color = pdmf0->attribs[attrib].color;
@@ -773,7 +773,7 @@ _material_color_build(E3D_Draw_Data *data, int frame,
    else
      {
         Evas_Real weight;
-        Evas_Canvas3D_Material_Data *pdmf1 = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+        Evas_Canvas3D_Material_Data *pdmf1 = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
 
         weight = (f1->frame - frame) / (Evas_Real)(f1->frame - f0->frame);
         evas_color_blend(&data->materials[attrib].color,
@@ -805,7 +805,7 @@ _material_texture_build(E3D_Draw_Data *data, int frame,
 
         if (f0->material)
           {
-             Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+             Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
              if (pdm->attribs[attrib].enable && pdm->attribs[attrib].texture != NULL)
                 break;
           }
@@ -820,7 +820,7 @@ _material_texture_build(E3D_Draw_Data *data, int frame,
 
         if (f1->material)
           {
-             Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+             Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
              if (pdm->attribs[attrib].enable && pdm->attribs[attrib].texture != NULL)
                 break;
           }
@@ -850,18 +850,18 @@ _material_texture_build(E3D_Draw_Data *data, int frame,
           }
      }
 
-   Evas_Canvas3D_Material_Data *pdmf0 = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+   Evas_Canvas3D_Material_Data *pdmf0 = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS);
    data->materials[attrib].sampler0 = data->texture_count++;
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(pdmf0->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(pdmf0->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS);
    data->materials[attrib].tex0 = (E3D_Texture *)pd->engine_data;
 
    if (f1)
      {
-        Evas_Canvas3D_Material_Data *pdmf1 = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+        Evas_Canvas3D_Material_Data *pdmf1 = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS);
         Evas_Real weight = (f1->frame - frame) / (Evas_Real)(f1->frame - f0->frame);
 
         data->materials[attrib].sampler1 = data->texture_count++;
-        pd = eo_data_scope_get(pdmf1->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS);
+        pd = efl_data_scope_get(pdmf1->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS);
         data->materials[attrib].tex1 = (E3D_Texture *)pd->engine_data;
 
         data->materials[attrib].texture_weight = weight;
@@ -890,9 +890,9 @@ _light_build(E3D_Draw_Data *data,
              const Evas_Canvas3D_Node *light,
              const Eina_Matrix4    *matrix_eye)
 {
-   Evas_Canvas3D_Node_Data *pd_light_node = eo_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_light_node = efl_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS);
    Evas_Canvas3D_Light *l = pd_light_node ? pd_light_node->data.light.light : NULL;
-   Evas_Canvas3D_Light_Data *pdl = l ? eo_data_scope_get(l, EVAS_CANVAS3D_LIGHT_CLASS) : NULL;
+   Evas_Canvas3D_Light_Data *pdl = l ? efl_data_scope_get(l, EVAS_CANVAS3D_LIGHT_CLASS) : NULL;
    Eina_Vector3      pos, dir;
 
    if (pdl == NULL)
@@ -963,7 +963,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
                       const Evas_Canvas3D_Node *light)
 {
    Eina_List *l, *r;
-   Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
    if (pdmesh->frames == NULL)
      return EINA_FALSE;
@@ -1169,8 +1169,8 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer,
 
    e3d_renderer_clear(renderer, &c);
 
-   Evas_Canvas3D_Node_Data *pd_light_node = eo_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS);
-   Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(pd_light_node->data.light.light,
+   Evas_Canvas3D_Node_Data *pd_light_node = efl_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(pd_light_node->data.light.light,
                                               EVAS_CANVAS3D_LIGHT_CLASS);
 
    Eina_Quaternion planes[6];
@@ -1179,7 +1179,7 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer,
 
    EINA_LIST_FOREACH(data->mesh_nodes, l, n)
      {
-        Evas_Canvas3D_Node_Data *pd_mesh_node = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+        Evas_Canvas3D_Node_Data *pd_mesh_node = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
 
         if (evas_is_sphere_in_frustum(&pd_mesh_node->bsphere, planes))
           {
@@ -1227,19 +1227,19 @@ _scene_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_Canvas3D_Scen
    Eina_Quaternion planes[6];
 
    /* Get eye matrix. */
-   Evas_Canvas3D_Node_Data *pd_camera_node = eo_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_camera_node = efl_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS);
    matrix_eye = &pd_camera_node->data.camera.matrix_world_to_eye;
 
-   Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
+   Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
 
    light = eina_list_data_get(data->light_nodes);
 
    if (data->shadows_enabled)
      {
-        pd_light_node = eo_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS);
+        pd_light_node = efl_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS);
         evas_mat4_inverse_build(&matrix_light_eye,
            &pd_light_node->position_world, &pd_light_node->orientation_world, &pd_light_node->scale_world);
-        ld = eo_data_scope_get(pd_light_node->data.light.light, EVAS_CANVAS3D_LIGHT_CLASS);
+        ld = efl_data_scope_get(pd_light_node->data.light.light, EVAS_CANVAS3D_LIGHT_CLASS);
          _shadowmap_render(drawable, renderer, data, &matrix_light_eye, light);
      }
 
@@ -1253,7 +1253,7 @@ _scene_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_Canvas3D_Scen
         Eina_Matrix4          matrix_mvp;
         Eina_Iterator     *it;
         void              *ptr;
-        Evas_Canvas3D_Node_Data *pd_mesh_node = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+        Evas_Canvas3D_Node_Data *pd_mesh_node = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
 
         // TODO Add other frustum shapes
         if (evas_is_sphere_in_frustum(&pd_mesh_node->bsphere, planes))
@@ -1275,7 +1275,7 @@ _scene_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_Canvas3D_Scen
              while (eina_iterator_next(it, &ptr))
                {
                   Evas_Canvas3D_Node_Mesh *nm = (Evas_Canvas3D_Node_Mesh *)ptr;
-                  Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS);
+                  Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS);
                   /*In case LOD enable pass in render only LOD meshes in dependences of the
                   distance to the camera node:
                   near_boundary <= distance <= far_boundary*/
@@ -1363,9 +1363,9 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende
 
    if (data->color_pick_enabled) //Use rendering to texture in color pick mechanism
      {
-         Evas_Canvas3D_Node_Data *pd_camera_node = eo_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS);
+         Evas_Canvas3D_Node_Data *pd_camera_node = efl_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS);
          matrix_eye = &pd_camera_node->data.camera.matrix_world_to_eye;
-         Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
+         Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
 
          itmn = eina_hash_iterator_data_new(data->colors_node_mesh);
 
@@ -1386,7 +1386,7 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende
                    else
                      repeat_node = eina_list_append(repeat_node, (void *)n);
                 }
-              Evas_Canvas3D_Node_Data *pd_mesh_node = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+              Evas_Canvas3D_Node_Data *pd_mesh_node = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
               RENDER_MESH_NODE_ITERATE_BEGIN(eye)
                 {
                    if (pdmesh->color_pick_enabled)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index fc7524e0eb..1b424978c3 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -847,7 +847,7 @@ eng_setup(Evas *evas, void *in)
    if (!(info = (Evas_Engine_Info_GL_Drm *)in)) return 0;
 
    /* try to get the evas public data */
-   if (!(epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0;
+   if (!(epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0;
 
    s = getenv("EVAS_GL_SWAP_MODE");
    if (s)
diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c b/src/modules/evas/engines/gl_drm/evas_outbuf.c
index cbeae57797..62c1fa3829 100644
--- a/src/modules/evas/engines/gl_drm/evas_outbuf.c
+++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c
@@ -619,7 +619,7 @@ evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth)
 
    if (depth == OUTBUF_DEPTH_INHERIT) depth = ob->depth;
 
-   epd = eo_data_scope_get(ob->evas, EVAS_CANVAS_CLASS);
+   epd = efl_data_scope_get(ob->evas, EVAS_CANVAS_CLASS);
    EINA_SAFETY_ON_NULL_RETURN(epd);
 
    re = epd->engine.data.output;
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
index 930c236f42..4625071d8c 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
@@ -58,7 +58,7 @@ EOLIAN static void
 _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd,
                                                                Evas *evas, void *image)
 {
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    Evas_GL_Image *im = image;
    int l = 0, r = 0, t = 0, b = 0;
 
@@ -68,7 +68,7 @@ _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
         return;
      }
 
-   pd->evas = eo_xref(evas, obj);
+   pd->evas = efl_xref(evas, obj);
    EINA_SAFETY_ON_NULL_RETURN(im);
 
    if (im->tex && im->tex->pt)
@@ -134,7 +134,7 @@ _evas_ector_gl_image_buffer_ector_buffer_map(Eo *obj EINA_UNUSED, Evas_Ector_GL_
                                                      unsigned int x, unsigned int y, unsigned int w, unsigned int h,
                                                      Efl_Gfx_Colorspace cspace, unsigned int *stride)
 {
-   Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
    Ector_GL_Buffer_Map *map = NULL;
    Eina_Bool tofree = EINA_FALSE;
    Evas_GL_Image *im;
@@ -188,7 +188,7 @@ EOLIAN static void
 _evas_ector_gl_image_buffer_ector_buffer_unmap(Eo *obj EINA_UNUSED, Evas_Ector_GL_Image_Buffer_Data *pd,
                                                        void *data, unsigned int length)
 {
-   Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
    Ector_GL_Buffer_Map *map;
    if (!data) return;
 
@@ -233,9 +233,9 @@ _evas_ector_gl_image_buffer_ector_buffer_span_free(Eo *obj, Evas_Ector_GL_Image_
 EOLIAN static Efl_Object *
 _evas_ector_gl_image_buffer_efl_object_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
-   pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN);
-   pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
+   pd->base = efl_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN);
+   pd->base->generic = efl_data_ref(obj, ECTOR_BUFFER_MIXIN);
    pd->base->generic->eo = obj;
    return obj;
 }
@@ -246,19 +246,19 @@ _evas_ector_gl_image_buffer_efl_object_finalize(Eo *obj, Evas_Ector_GL_Image_Buf
    EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
    pd->base->generic->immutable = EINA_TRUE;
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _evas_ector_gl_image_buffer_efl_object_destructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd)
 {
-   Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
 
-   eo_data_unref(obj, pd->base->generic);
-   eo_data_unref(obj, pd->base);
+   efl_data_unref(obj, pd->base->generic);
+   efl_data_unref(obj, pd->base);
    ENFN->image_free(ENDT, pd->image);
-   eo_xunref(pd->evas, obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_xunref(pd->evas, obj);
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "evas_ector_gl_image_buffer.eo.c"
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
index 90b79939a0..91bb22220d 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
@@ -45,7 +45,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas
         return;
      }
 
-   pd->evas = eo_xref(evas, obj);
+   pd->evas = efl_xref(evas, obj);
    evas_cache_image_ref(&im->cache_entry);
    pd->image = im;
 
@@ -57,7 +57,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_
                                                                    Evas_Ector_GL_RGBAImage_Buffer_Data *pd,
                                                                    Evas **evas, void **image)
 {
-   Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
    Render_Engine_GL_Generic *re = e->engine.data.output;
    int err = EVAS_LOAD_ERROR_NONE;
    Evas_Engine_GL_Context *gc;
@@ -88,8 +88,8 @@ end:
 EOLIAN static Eo *
 _evas_ector_gl_rgbaimage_buffer_efl_object_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
-   pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
+   pd->base = efl_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
    return obj;
 }
 
@@ -99,19 +99,19 @@ _evas_ector_gl_rgbaimage_buffer_efl_object_finalize(Eo *obj, Evas_Ector_GL_RGBAI
    EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
    pd->base->generic->immutable = EINA_TRUE;
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _evas_ector_gl_rgbaimage_buffer_efl_object_destructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd)
 {
-   Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
 
-   eo_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->base, obj);
    ENFN->image_free(ENDT, pd->glim);
    evas_cache_image_drop(&pd->image->cache_entry);
-   eo_xunref(pd->evas, obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_xunref(pd->evas, obj);
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "evas_ector_gl_rgbaimage_buffer.eo.c"
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index a241ea1e5d..6eab3848ff 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2485,16 +2485,16 @@ eng_ector_create(void *data EINA_UNUSED)
    ector_backend = getenv("ECTOR_BACKEND");
    if (ector_backend && !strcasecmp(ector_backend, "default"))
      {
-        ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+        ector = efl_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
      }
    else if (ector_backend && !strcasecmp(ector_backend, "experimental"))
      {
-        ector = eo_add(ECTOR_GL_SURFACE_CLASS, NULL);
+        ector = efl_add(ECTOR_GL_SURFACE_CLASS, NULL);
         use_gl = EINA_TRUE;
      }
    else
      {
-        ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+        ector = efl_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
         use_cairo = EINA_TRUE;
      }
    return ector;
@@ -2515,13 +2515,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei
      {
         RGBA_Image *im = engine_image;
 
-        buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im));
+        buf = efl_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im));
      }
    else
      {
         Evas_GL_Image *im = engine_image;
 
-        buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im));
+        buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im));
      }
    return buf;
 }
@@ -2532,7 +2532,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels,
                      Efl_Gfx_Colorspace cspace, Eina_Bool writeable EINA_UNUSED,
                      int l, int r, int t, int b, Ector_Buffer_Flag flags)
 {
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    Render_Engine_GL_Generic *re = e->engine.data.output;
    Evas_Engine_GL_Context *gc = NULL;
    Ector_Buffer *buf = NULL;
@@ -2582,7 +2582,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels,
 
         gc = re->window_gl_context_get(re->software.ob);
         im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE);
-        buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im));
+        buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im));
         im->references--;
      }
    return buf;
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 99956ad0ce..5bb1acdb2f 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -289,7 +289,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine *re = NULL;
    Outbuf *ob = NULL;
    Evas_Engine_Info_GL_SDL *info;
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index ddf1be64f8..99e867095a 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1583,7 +1583,7 @@ _re_winfree(Render_Engine *re)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine *re;
    Evas_Engine_Info_GL_X11 *info;
    Render_Engine_Swap_Mode swap_mode = MODE_FULL;
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c
index b87cf46d08..1d9ec1e96a 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -155,7 +155,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Engine_Info_PSL1GHT *info;
 
    printf ("eng_setup called\n");
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c
index 91b36d8494..3cf8f76f3e 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -91,7 +91,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine *re;
    Evas_Engine_Info_Software_DDraw *info;
 
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c
index e80a62903a..2135e122d6 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -94,7 +94,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Render_Engine                 *re;
    Evas_Engine_Info_Software_Gdi *info;
 
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
index 1444c86b10..a6dc80e0d4 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
@@ -39,7 +39,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
         return;
      }
 
-   pd->evas = eo_xref(evas, obj);
+   pd->evas = efl_xref(evas, obj);
    evas_cache_image_ref(&im->cache_entry);
    pd->image = im;
 
@@ -51,7 +51,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS
                                                                Evas_Ector_Software_Buffer_Data *pd,
                                                                Evas **evas, void **image)
 {
-   Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
 
    if (evas) *evas = pd->evas;
    if (e->engine.func->gl_surface_read_pixels)
@@ -67,8 +67,8 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS
 EOLIAN static Eo *
 _evas_ector_software_buffer_efl_object_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
-   pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
+   pd->base = efl_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
    return obj;
 }
 
@@ -78,16 +78,16 @@ _evas_ector_software_buffer_efl_object_finalize(Eo *obj, Evas_Ector_Software_Buf
    EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
    pd->base->generic->immutable = EINA_TRUE;
-   return efl_finalize(eo_super(obj, MY_CLASS));
+   return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _evas_ector_software_buffer_efl_object_destructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd)
 {
-   eo_data_xunref(obj, pd->base, obj);
+   efl_data_xunref(obj, pd->base, obj);
    evas_cache_image_drop(&pd->image->cache_entry);
-   eo_xunref(pd->evas, obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_xunref(pd->evas, obj);
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 #include "evas_ector_buffer.eo.c"
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 25f34bf66f..628ae5ef52 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4057,12 +4057,12 @@ eng_ector_create(void *data EINA_UNUSED)
    ector_backend = getenv("ECTOR_BACKEND");
    if (ector_backend && !strcasecmp(ector_backend, "default"))
      {
-        ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+        ector = efl_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
         use_cairo = EINA_FALSE;
      }
    else
      {
-        ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+        ector = efl_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
         use_cairo = EINA_TRUE;
      }
    return ector;
@@ -4082,7 +4082,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_
 
    if (!ie) return NULL;
 
-   buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eo_self, e, ie));
+   buf = efl_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(efl_self, e, ie));
 
    return buf;
 }
@@ -4101,7 +4101,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels,
 
    if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0)
      {
-        buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eo_self, pixels, width, height, stride, cspace, writeable, l, r, t, b));
+        buf = efl_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(efl_self, pixels, width, height, stride, cspace, writeable, l, r, t, b));
      }
    else
      {
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index fcb556bfb4..00691ae7cb 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -471,7 +471,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info)
 static int
 eng_setup(Evas *eo_e, void *in)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Engine_Info_Software_X11 *info;
    Render_Engine *re = NULL;
 
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 9fa52c4b48..c79bcf6e2a 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -535,7 +535,7 @@ eng_setup(Evas *evas, void *info)
    const char *s;
 
    inf = (Evas_Engine_Info_Wayland_Egl *)info;
-   epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if ((s = getenv("EVAS_GL_SWAP_MODE")))
      {
diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index c713b622ed..f0dea421cc 100644
--- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
@@ -382,7 +382,7 @@ _fallback(Dmabuf_Surface *s, int w, int h)
    if (!b->mapping) b->mapping = buffer_manager->map(b);
    if (!b->mapping) goto out;
 
-   epd = eo_data_scope_get(surf->info->evas, EVAS_CANVAS_CLASS);
+   epd = efl_data_scope_get(surf->info->evas, EVAS_CANVAS_CLASS);
    while (epd && epd->rendering) evas_async_events_process_blocking();
 
    old_data = b->mapping;
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 561f9e90fb..4a5849feb8 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -144,7 +144,7 @@ eng_setup(Evas *eo_evas, void *info)
      return 0;
 
    /* try to get evas public data */
-   if (!(epd = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS)))
+   if (!(epd = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS)))
      return 0;
 
    /* test for valid engine output */
diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
index b3ae3ba999..7ff40b9b25 100644
--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
+++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
@@ -63,9 +63,9 @@ static void
 _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
                                     Evas_Canvas3D_Mesh_Eet *eet_mesh)
 {
-   Evas_Canvas3D_Object_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS);
+   Evas_Canvas3D_Object_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS);
    Eo *material = NULL;
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
+   material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
 
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, !!(eet_mesh->materials->colors[0].a > 0));
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, !!(eet_mesh->materials->colors[1].a > 0));
diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
index 02842adf7e..16dd330813 100644
--- a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
+++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
@@ -406,7 +406,7 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
         evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
         evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
 
-        pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+        pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
         if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, f, stride_pos))
           {
diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
index 4f1c8f6e61..3ec4ed5274 100644
--- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
+++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
@@ -444,7 +444,7 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
    if (counts.existence_of_tex_point)
      evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
 
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
    if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, 0, stride_pos))
      {
diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c
index 89c7c89d26..23b396db41 100644
--- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c
+++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c
@@ -71,7 +71,7 @@ _set_material_to_eet_file_from_mesh(Evas_Canvas3D_Mesh_Eet *eet_mesh,
 {
    int i;
    Evas_Canvas3D_Material_Data *material =
-      eo_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+      efl_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS);
    Evas_Canvas3D_Material_Eet *saved_materials =
       malloc(sizeof(Evas_Canvas3D_Material_Eet));
    Evas_Canvas3D_Color_Eet *saved_colors =
@@ -146,7 +146,7 @@ evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh,
                          const char *file,
                          Evas_Canvas3D_Mesh_Frame *f)
 {
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
    Eet_File *ef;
    Evas_Canvas3D_Mesh_Eet* eet_mesh = malloc(sizeof(Evas_Canvas3D_Mesh_Eet));
    Evas_Canvas3D_Header_Eet* eet_header = malloc(sizeof(Evas_Canvas3D_Header_Eet));
diff --git a/src/modules/evas/model_savers/obj/evas_model_save_obj.c b/src/modules/evas/model_savers/obj/evas_model_save_obj.c
index 2b5db86800..7ecc4b7f75 100644
--- a/src/modules/evas/model_savers/obj/evas_model_save_obj.c
+++ b/src/modules/evas/model_savers/obj/evas_model_save_obj.c
@@ -234,8 +234,8 @@ evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh,
    eina_str_join(_mtl_file_name, len + 1, '.', _without_extention, "mtl");
    free(_without_extention);
 
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
-   mat = eo_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   mat = efl_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS);
 
    if (mat != NULL) _save_material(pd, _mtl_file_name, mat);
    _save_mesh(pd, _obj_file_name, _mtl_file_name, f);
diff --git a/src/modules/evas/model_savers/ply/evas_model_save_ply.c b/src/modules/evas/model_savers/ply/evas_model_save_ply.c
index 8da8f741ea..a805baaa05 100644
--- a/src/modules/evas/model_savers/ply/evas_model_save_ply.c
+++ b/src/modules/evas/model_savers/ply/evas_model_save_ply.c
@@ -71,7 +71,7 @@ evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh,
    Evas_Model_Load_Save_Header header;
    Evas_Model_Load_Save_Data data;
 
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
    if (!evas_model_save_header_from_mesh(pd, f, &header)) return;
    evas_model_save_data_from_mesh(pd, f, header, &data);
 
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index ced99d2062..98484e22a4 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -289,9 +289,9 @@ START_TEST(ecore_test_efl_loop_fd)
    ret = pipe(comm);
    fail_if(ret != 0);
 
-   fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
-               efl_loop_fd_set(eo_self, comm[0]),
-               efl_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
+   fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
+               efl_loop_fd_set(efl_self, comm[0]),
+               efl_event_callback_add(efl_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
    fail_if(fd == NULL);
 
    ret = write(comm[1], &did, 1);
@@ -324,7 +324,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
    int comm[2];
    int ret;
 
-   eo_init();
+   efl_object_init();
 
    ret = ecore_init();
    fail_if(ret < 1);
@@ -332,11 +332,11 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
    ret = pipe(comm);
    fail_if(ret != 0);
 
-   fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
-               efl_loop_fd_set(eo_self, comm[0]),
-               efl_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
-               efl_event_callback_add(eo_self, EFL_EVENT_DEL, _efl_del_cb, &dead));
-   eo_ref(fd);
+   fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
+               efl_loop_fd_set(efl_self, comm[0]),
+               efl_event_callback_add(efl_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
+               efl_event_callback_add(efl_self, EFL_EVENT_DEL, _efl_del_cb, &dead));
+   efl_ref(fd);
    fail_if(fd == NULL);
 
    ret = write(comm[1], &did, 1);
@@ -355,7 +355,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
    efl_del(fd);
    fail_if(dead == EINA_FALSE);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -827,16 +827,16 @@ START_TEST(ecore_test_efl_loop_register)
    ecore_init();
 
    t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS);
-   fail_if(!eo_isa(t, EFL_LOOP_CLASS));
+   fail_if(!efl_isa(t, EFL_LOOP_CLASS));
 
    t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
    fail_if(t != NULL);
 
-   n = eo_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get());
+   n = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get());
    efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
 
    t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
-   fail_if(!eo_isa(t, EFL_LOOP_TIMER_CLASS));
+   fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
    fail_if(t != n);
 
    efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
@@ -856,7 +856,7 @@ START_TEST(ecore_test_efl_app_version)
    ecore_init();
 
    loop = efl_loop_main_get(EFL_LOOP_CLASS);
-   fail_if(!eo_isa(loop, EFL_LOOP_CLASS));
+   fail_if(!efl_isa(loop, EFL_LOOP_CLASS));
 
    efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID);
    ver = efl_loop_app_efl_version_get(loop);
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 7b744dd415..254db11b38 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -57,14 +57,14 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
    Eina_Bool ret = EINA_FALSE;
    Eina_Bool pulse_context_failed = EINA_FALSE;
 
-   in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
+   in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
    fail_if(!in);
 
    ecore_audio_obj_name_set(in, "sample.wav");
    ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sample.wav");
    fail_if(!ret);
 
-   out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
    fail_if(!out);
 
    ecore_timer_add(1.8, _seek_vol, in);
@@ -108,12 +108,12 @@ START_TEST(ecore_test_ecore_audio_cleanup)
    int freq = 1000;
    Eina_Bool ret = EINA_FALSE;
 
-   in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+   in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
    fail_if(!in);
    efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
    ecore_audio_obj_in_length_set(in, 2);
 
-   out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
    ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG);
    fail_if(!ret);
@@ -139,7 +139,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
    Eina_Bool ret;
    char *tmp;
 
-   in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+   in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
    fail_if(!in);
 
    ecore_audio_obj_name_set(in, "tone");
@@ -197,7 +197,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
    len = ecore_audio_obj_in_remaining_get(in);
    fail_if(len != 1.0);
 
-   out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
 
    ecore_audio_obj_name_set(out, "tmp.wav");
@@ -231,7 +231,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
    Ecore_Audio_Format fmt;
    const char *src;
 
-   in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
+   in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
    fail_if(!in);
 
    fmt = ecore_audio_obj_format_get(in);
@@ -277,7 +277,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
    len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END);
    fail_if(fabs(rem - 1 - len) > 0.6);
 
-   out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
+   out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
 
    ecore_audio_obj_name_set(out, "tmp.wav");
@@ -318,9 +318,9 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
   Eina_List *in3;
   Eina_Bool attached;
 
-  Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
-  Eo *in2 = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
-  Eo *out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL);
+  Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
+  Eo *in2 = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
+  Eo *out = efl_add(ECORE_AUDIO_OUT_CLASS, NULL);
 
   fail_if(!in);
   fail_if(!in2);
@@ -416,10 +416,10 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
 {
   Eo *in, *out;
 
-  in = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
+  in = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
   fail_if(!in);
 
-  out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL);
+  out = efl_add(ECORE_AUDIO_OUT_CLASS, NULL);
   fail_if(!out);
 
   ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL);
@@ -454,7 +454,7 @@ START_TEST(ecore_test_ecore_audio_obj_in)
   Ecore_Audio_Vio vio;
   Eina_Bool freed = EINA_FALSE;
 
-  Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
+  Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
 
   fail_if(!in);
 
@@ -541,10 +541,10 @@ START_TEST(ecore_test_ecore_audio_obj)
   double volume;
   Eo *objs[2], *obj;
 
-  objs[0] = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
+  objs[0] = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
   fail_if(!objs[0]);
 
-  objs[1] = eo_add(ECORE_AUDIO_OUT_CLASS, NULL);
+  objs[1] = efl_add(ECORE_AUDIO_OUT_CLASS, NULL);
   fail_if(!objs[1]);
 
   for (i=0; i<2; i++) {
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 7da7d5239e..7550bdffd0 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -273,17 +273,17 @@ START_TEST(ecore_test_timer_lifecycle)
    Ecore_Timer *t;
    Eo *et;
 
-   eo_init();
+   efl_object_init();
    ecore_init();
 
    t = ecore_timer_add(1.0, _test_time_cb, &rl);
    efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl);
 
-   et = eo_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
-               efl_event_callback_add(eo_self, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re),
-               efl_event_callback_add(eo_self, EFL_EVENT_DEL, _test_death_cb, &de),
-               efl_loop_timer_interval_set(eo_self, 1.0));
-   eo_ref(et);
+   et = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
+               efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re),
+               efl_event_callback_add(efl_self, EFL_EVENT_DEL, _test_death_cb, &de),
+               efl_loop_timer_interval_set(efl_self, 1.0));
+   efl_ref(et);
 
    ecore_shutdown();
 
@@ -294,7 +294,7 @@ START_TEST(ecore_test_timer_lifecycle)
    efl_del(et);
    fail_if(de == EINA_FALSE);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 00f989b9ea..c681e02b0f 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -252,7 +252,7 @@ START_TEST(edje_test_snapshot)
 
    /* check value of no_render flag as seen from evas land */
    sub = edje_object_part_object_get(obj, "snap");
-   fail_if(!eo_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) &&
+   fail_if(!efl_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) &&
            !evas_object_image_snapshot_get(sub));
 
    // TODO: Verify that evas snapshot actually works (and has a filter)
@@ -355,13 +355,13 @@ START_TEST(edje_test_swallows)
    Evas *evas = EDJE_TEST_INIT_EVAS();
    Evas_Object *ly, *o1, *o2;
 
-   ly = eo_add(EDJE_OBJECT_CLASS, evas);
+   ly = efl_add(EDJE_OBJECT_CLASS, evas);
    fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
 
    fail_unless(edje_object_part_exists(ly, "swallow"));
 
 
-   o1 = eo_add(EDJE_OBJECT_CLASS, ly);
+   o1 = efl_add(EDJE_OBJECT_CLASS, ly);
    fail_if(!edje_object_part_swallow(ly, "swallow", o1));
    ck_assert_ptr_eq(efl_parent_get(o1), ly);
 
@@ -371,7 +371,7 @@ START_TEST(edje_test_swallows)
    fail_if(!edje_object_part_swallow(ly, "swallow", o1));
    ck_assert_ptr_eq(efl_parent_get(o1), ly);
 
-   o2 = eo_add(EDJE_OBJECT_CLASS, ly);
+   o2 = efl_add(EDJE_OBJECT_CLASS, ly);
    fail_if(!edje_object_part_swallow(ly, "swallow", o2));
    ck_assert_ptr_eq(efl_parent_get(o2), ly);
    /* o1 is deleted at this point. */
@@ -386,13 +386,13 @@ START_TEST(edje_test_swallows_eoapi)
    Evas *evas = EDJE_TEST_INIT_EVAS();
    Evas_Object *ly, *o1, *o2;
 
-   ly = eo_add(EDJE_OBJECT_CLASS, evas);
+   ly = efl_add(EDJE_OBJECT_CLASS, evas);
    fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
 
    fail_unless(edje_object_part_exists(ly, "swallow"));
 
 
-   o1 = eo_add(EDJE_OBJECT_CLASS, ly);
+   o1 = efl_add(EDJE_OBJECT_CLASS, ly);
    fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
    ck_assert_ptr_eq(efl_parent_get(o1), ly);
 
@@ -402,7 +402,7 @@ START_TEST(edje_test_swallows_eoapi)
    fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
    ck_assert_ptr_eq(efl_parent_get(o1), ly);
 
-   o2 = eo_add(EDJE_OBJECT_CLASS, ly);
+   o2 = efl_add(EDJE_OBJECT_CLASS, ly);
    fail_if(!efl_content_set(efl_part(ly, "swallow"), o2));
    ck_assert_ptr_eq(efl_parent_get(o2), ly);
    /* o1 is deleted at this point. */
@@ -664,7 +664,7 @@ START_TEST(edje_test_table_eoapi)
      for (k = 0; k < 2; k++)
        {
           i = l*2 + k;
-          sobjs[i] = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+          sobjs[i] = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
           fail_if(!sobjs[i]);
           efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1);
        }
@@ -698,7 +698,7 @@ START_TEST(edje_test_table_eoapi)
    fail_if(rows != 2);
 
    /* test multiple ops on a proxy object */
-   proxy = eo_ref(efl_part(obj, "table"));
+   proxy = efl_ref(efl_part(obj, "table"));
    fail_if(!proxy);
    fail_if(!efl_pack_clear(proxy));
    fail_if(efl_content_count(efl_part(obj, "table")) != 4);
diff --git a/src/tests/eina_cxx/simple.c b/src/tests/eina_cxx/simple.c
index 1eaff9f59e..a44bc8cbc0 100644
--- a/src/tests/eina_cxx/simple.c
+++ b/src/tests/eina_cxx/simple.c
@@ -14,7 +14,7 @@
 
 static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 #include "simple.eo.c"
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 3352e355b4..824ef68649 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -111,10 +111,10 @@ START_TEST(eio_model_test_test_file)
 
    fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
    fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-   fail_if(!eo_init(), "ERROR: Cannot init EO!\n");
+   fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
    fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
 
-   filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, EFL_MODEL_TEST_FILENAME_PATH));
+   filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, EFL_MODEL_TEST_FILENAME_PATH));
    fail_if(!filemodel, "ERROR: Cannot init model!\n");
 
    handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL);
@@ -141,7 +141,7 @@ START_TEST(eio_model_test_test_file)
    eina_promise_then(promise, &promise_then_count, &error_promise_then, NULL);
    ecore_main_loop_begin();
 
-   eo_unref(filemodel);
+   efl_unref(filemodel);
 
    eio_shutdown();
    ecore_shutdown();
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 126b1d7156..d0ff492643 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -89,12 +89,12 @@ START_TEST(eio_model_test_test_monitor_add)
 
    fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
    fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-   fail_if(!eo_init(), "ERROR: Cannot init EO!\n");
+   fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
    fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
 
    tmpdir = eina_environment_tmp_get();
 
-   filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir));
+   filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, tmpdir));
    fail_if(!filemodel, "ERROR: Cannot init model!\n");
 
    efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
@@ -107,7 +107,7 @@ START_TEST(eio_model_test_test_monitor_add)
 
    ecore_main_loop_begin();
 
-   eo_unref(filemodel);
+   efl_unref(filemodel);
 
    eio_shutdown();
    ecore_shutdown();
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 795c0e23fd..c1ac397c8a 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -113,7 +113,7 @@ _do_ls_test(Efl_Io_Manager_Test_Stat_Ls_Func ls_func,
 {
    int main_files = 0;
 
-   Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+   Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
    Eina_Promise *promise = NULL;
 
    efl_event_callback_add(job, event, filter_cb, NULL);
@@ -126,7 +126,7 @@ _do_ls_test(Efl_Io_Manager_Test_Stat_Ls_Func ls_func,
 
    fail_if(main_files != DONE_CALLED);
 
-   eo_unref(job);
+   efl_unref(job);
 }
 
 static void
@@ -160,7 +160,7 @@ START_TEST(efl_io_manager_test_file_direct_stat)
    Eina_Tmpstr *nested_dirname = create_test_dirs(test_dirname);
    Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
 
-   Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+   Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
    Eina_Promise *promise = NULL;
    // Start testing
    is_dir = EINA_TRUE;
@@ -173,7 +173,7 @@ START_TEST(efl_io_manager_test_file_direct_stat)
    promise = efl_io_manager_file_direct_stat(job, nested_filename);
    eina_promise_then(promise, &_stat_done_cb, &_error_cb, &is_dir);
    ecore_main_loop_begin();
-   eo_unref(job);
+   efl_unref(job);
 
    // Cleanup
    fail_if(!ecore_file_recursive_rm(test_dirname));
@@ -254,13 +254,13 @@ START_TEST(efl_io_manager_test_open)
    Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
 
    opened_file = EINA_FALSE;
-   Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+   Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
    Eina_Promise *promise = NULL;
 
    promise = efl_io_manager_file_open(job, nested_filename, EINA_FALSE);
    eina_promise_then(promise, &_open_done_cb, &_error_cb, &opened_file);
    ecore_main_loop_begin();
-   eo_unref(job);
+   efl_unref(job);
    fail_if(!opened_file);
 
    // Cleanup
@@ -289,7 +289,7 @@ START_TEST(efl_io_instantiated)
 
    manager = efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS);
    fail_if(manager == NULL);
-   fail_if(!eo_isa(manager, EFL_IO_MANAGER_CLASS));
+   fail_if(!efl_isa(manager, EFL_IO_MANAGER_CLASS));
 
    eio_shutdown();
 
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 77aa30c232..3733589a3d 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -129,7 +129,7 @@ START_TEST(eio_test_job_xattr_set)
 
    fprintf(stderr, "eio_test_job_xattr_set\n"); fflush(stderr);
 
-   job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
+   job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
 
    test_file_path = get_full_path(XATTR_TEST_DIR, filename);
    fd = open(test_file_path,
@@ -184,7 +184,7 @@ START_TEST(eio_test_job_xattr_set)
 
    free(attrib_promises);
 
-   eo_unref(job);
+   efl_unref(job);
    close(fd);
    unlink(test_file_path);
    eina_tmpstr_del(test_file_path);
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index e00a7d8529..902d6532bb 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -146,14 +146,14 @@ START_TEST(eio_test_sentry_add_and_remove)
    usleep(500000);
 
    //monitor directory
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
    fail_if(!eio_sentry_add(sentry, filename));
 
    usleep(500000);
 
    eio_sentry_del(sentry, filename);
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -172,7 +172,7 @@ START_TEST(eio_test_sentry_add_remove_add)
    usleep(500000);
 
    //monitor directory
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
    fail_if(!eio_sentry_add(sentry, filename));
    eio_sentry_del(sentry, filename);
 
@@ -181,7 +181,7 @@ START_TEST(eio_test_sentry_add_remove_add)
    fail_if(!eio_sentry_add(sentry, filename));
    eio_sentry_del(sentry, filename);
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -202,7 +202,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
 
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //monitor directory
    fail_if(!eio_sentry_add(sentry, filename1));
@@ -211,7 +211,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
    eio_sentry_del(sentry, filename1);
    eio_sentry_del(sentry, filename2);
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -232,7 +232,7 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
    Eo* sentry;
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -245,7 +245,7 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -259,7 +259,7 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -272,7 +272,7 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -286,7 +286,7 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -299,7 +299,7 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    //cleanup
    _common_shutdown(dirname);
@@ -314,7 +314,7 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -326,7 +326,7 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -339,7 +339,7 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
    Eo *sentry;
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -352,7 +352,7 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -366,7 +366,7 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname);
    _create_directory((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -379,7 +379,7 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -393,7 +393,7 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname);
    _create_directory((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -406,7 +406,7 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -415,7 +415,7 @@ END_TEST
 START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
 {
    Eina_Tmpstr *dirname = _common_init();
-   Eo *sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   Eo *sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -428,7 +428,7 @@ START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -444,7 +444,7 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
 
    filename = eina_stringshare_printf("%s/filecreated", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -457,7 +457,7 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    //cleanup
    _common_shutdown(dirname);
@@ -472,7 +472,7 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -485,7 +485,7 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -500,7 +500,7 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -512,7 +512,7 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -526,7 +526,7 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
 
    filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname);
    _create_file((void*)filename);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -539,7 +539,7 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _common_shutdown(dirname);
 }
@@ -555,7 +555,7 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
 
    eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
    filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -569,7 +569,7 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _delete_directory((void*)dirname2);
    _common_shutdown(dirname);
@@ -587,7 +587,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
 
    eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
    filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -602,7 +602,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _delete_directory((void*)dirname2);
    _common_shutdown(dirname);
@@ -624,7 +624,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
 
    eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
    filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -640,7 +640,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    _delete_directory((void*)dirname2);
    _common_shutdown(dirname);
@@ -658,7 +658,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
    filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname);
    _create_file((void*)filename);
    _create_file((void*)filename2);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -672,7 +672,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    //cleanup
    _common_shutdown(dirname);
@@ -691,7 +691,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
    filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname);
    _create_file((void*)filename);
    _create_file((void*)filename2);
-   sentry = eo_add(EIO_SENTRY_CLASS, NULL);
+   sentry = efl_add(EIO_SENTRY_CLASS, NULL);
 
    //sleep to avoid catching event generated by above manipulations
    usleep(500000);
@@ -708,7 +708,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
 
    ecore_main_loop_begin();
 
-   eo_unref(sentry);
+   efl_unref(sentry);
 
    //cleanup
    _common_shutdown(dirname);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index fb311ad0f5..524d53df27 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -168,7 +168,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
 Eo *
 create_connection(void)
 {
-   Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
+   Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
    ck_assert_ptr_ne(NULL, connection);
    return connection;
 }
@@ -176,7 +176,7 @@ create_connection(void)
 Eo *
 create_object(void)
 {
-   Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
+   Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
    ck_assert_ptr_ne(NULL, object);
    return object;
 }
@@ -274,7 +274,7 @@ START_TEST(smoke)
    check_init();
 
    Eo *connection = create_connection();
-   eo_unref(connection);
+   efl_unref(connection);
 
    check_shutdown();
 }
@@ -286,7 +286,7 @@ START_TEST(object)
 
    Eo *root = create_object();
 
-   eo_unref(root);
+   efl_unref(root);
 
    check_shutdown();
 }
@@ -316,7 +316,7 @@ START_TEST(proxy)
      }
    eina_promise_unref(promise);
 
-   eo_unref(root);
+   efl_unref(root);
 
    check_shutdown();
 }
@@ -373,7 +373,7 @@ _eldbus_model_arguments_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *me
    unsigned int i;
    EINA_ACCESSOR_FOREACH(accessor, i, child)
      {
-        if (!eo_isa(child, klass))
+        if (!efl_isa(child, klass))
           continue;
 
         const char *name;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
index 3bb0fffb88..ecd24bcbb9 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
@@ -25,7 +25,7 @@ _setup(void)
 static void
 _teardown(void)
 {
-   eo_unref(connection);
+   efl_unref(connection);
    check_shutdown();
 }
 
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index b1d8800596..a22e0a5fbc 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -29,7 +29,7 @@ _setup(void)
 
    fake_server = fake_server_start(&fake_server_data);
 
-   fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
+   fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
    ck_assert_ptr_ne(NULL, fake_server_object);
 
    fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
@@ -42,7 +42,7 @@ _setup(void)
 static void
 _teardown(void)
 {
-   eo_unref(fake_server_object);
+   efl_unref(fake_server_object);
 
    fake_server_stop(fake_server);
 
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_object.c b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
index 78058ab3ef..06b2e8ad60 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
@@ -25,7 +25,7 @@ _setup(void)
 static void
 _teardown(void)
 {
-   eo_unref(object);
+   efl_unref(object);
    check_shutdown();
 }
 
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
index d1830ccac3..939d60ac3f 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
@@ -27,7 +27,7 @@ _setup(void)
 static void
 _teardown(void)
 {
-   eo_unref(dbus_object1);
+   efl_unref(dbus_object1);
    check_shutdown();
 }
 
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index a3eeac77fc..a1082d0171 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -27,7 +27,7 @@ _setup(void)
 
    fake_server = fake_server_start(&fake_server_data);
 
-   fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
+   fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
    ck_assert_ptr_ne(NULL, fake_server_object);
 
    fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
@@ -40,7 +40,7 @@ _setup(void)
 static void
 _teardown(void)
 {
-   eo_unref(fake_server_object);
+   efl_unref(fake_server_object);
 
    fake_server_stop(fake_server);
 
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index 6936df9f04..7aa8314ab2 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -33,7 +33,7 @@ _setup(void)
    };
    fake_server = fake_server_start(&fake_server_data);
 
-   fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
+   fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
    ck_assert_ptr_ne(NULL, fake_server_object);
 
    fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
@@ -42,7 +42,7 @@ _setup(void)
 static void
 _teardown(void)
 {
-   eo_unref(fake_server_object);
+   efl_unref(fake_server_object);
 
    fake_server_stop(fake_server);
 
diff --git a/src/tests/elementary/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c
index 2896162360..191c2725d3 100644
--- a/src/tests/elementary/elm_code_test_widget.c
+++ b/src/tests/elementary/elm_code_test_widget.c
@@ -96,7 +96,7 @@ START_TEST (elm_code_widget_construct_nocode)
    elm_init(1, NULL);
 
    win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
-   widget = eo_add(ELM_CODE_WIDGET_CLASS, win);
+   widget = efl_add(ELM_CODE_WIDGET_CLASS, win);
    ck_assert(!widget);
 
    elm_shutdown();
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 84c8a83555..630febc9c1 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -29,7 +29,7 @@ START_TEST (elm_atspi_app_obj_name_get)
 {
    elm_init(0, NULL);
 
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    ck_assert(root != NULL);
 
@@ -41,7 +41,7 @@ START_TEST (elm_atspi_app_obj_name_get)
 
    ck_assert_str_eq(ret, "Test name");
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
@@ -108,7 +108,7 @@ START_TEST (elm_atspi_role_get)
 {
    elm_init(0, NULL);
 
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    Elm_Atspi_Role role;
 
@@ -116,7 +116,7 @@ START_TEST (elm_atspi_role_get)
 
    ck_assert(role == ELM_ATSPI_ROLE_APPLICATION);
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
@@ -149,7 +149,7 @@ START_TEST (elm_atspi_role_name_get)
 {
    elm_init(0, NULL);
 
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    const char *ret = NULL;
 
@@ -157,7 +157,7 @@ START_TEST (elm_atspi_role_name_get)
 
    ck_assert(ret != NULL);
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
@@ -166,7 +166,7 @@ START_TEST (elm_atspi_localized_role_name_get)
 {
    elm_init(0, NULL);
 
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    const char *ret = NULL;
 
@@ -174,7 +174,7 @@ START_TEST (elm_atspi_localized_role_name_get)
 
    ck_assert(ret != NULL);
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
@@ -183,7 +183,7 @@ START_TEST (elm_atspi_description_set)
 {
    elm_init(0, NULL);
 
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    const char *ret = NULL;
 
@@ -204,7 +204,7 @@ START_TEST (elm_atspi_description_set)
 
    ck_assert(ret == NULL);
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
@@ -229,7 +229,7 @@ START_TEST (elm_atspi_children_and_parent)
    elm_init(0, NULL);
 
    generate_app();
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    Eina_List *child_list = NULL;
 
@@ -246,7 +246,7 @@ START_TEST (elm_atspi_children_and_parent)
    ck_assert(win != NULL);
    ck_assert(win == g_win);
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
@@ -256,7 +256,7 @@ START_TEST (elm_atspi_children_and_parent2)
    elm_init(0, NULL);
 
    generate_app();
-   Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+   Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
    Eo *win = NULL;
 
@@ -275,7 +275,7 @@ START_TEST (elm_atspi_children_and_parent2)
    ck_assert(btn != NULL);
    ck_assert(btn == g_btn);
 
-   eo_unref(root);
+   efl_unref(root);
    elm_shutdown();
 }
 END_TEST
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index afa1cadd46..73384d692b 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -34,9 +34,9 @@ START_TEST (elm_atspi_interfaces_check)
 
    button = elm_button_add(win);
 
-   ck_assert(eo_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN));
-   ck_assert(eo_isa(button, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN));
-   ck_assert(eo_isa(button, ELM_INTERFACE_ATSPI_ACTION_MIXIN));
+   ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN));
+   ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN));
+   ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACTION_MIXIN));
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index 26f80824fc..f1c6b14baf 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -153,7 +153,7 @@ START_TEST (elm_config_win)
    Eo *cfg = efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE);
    fail_if(!cfg);
 
-   Eo *win = eo_add(EFL_UI_WIN_CLASS, NULL);
+   Eo *win = efl_add(EFL_UI_WIN_CLASS, NULL);
    Eo *cfg2 = efl_provider_find(win, EFL_CONFIG_INTERFACE);
    fail_if(cfg != cfg2);
 
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 405c27b4cf..b89be351c9 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -32,12 +32,12 @@ START_TEST(elm_layout_swallows)
    elm_init(1, NULL);
    win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
 
-   ly = eo_add(ELM_LAYOUT_CLASS, win);
+   ly = efl_add(ELM_LAYOUT_CLASS, win);
    snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
    elm_layout_file_set(ly, buf, "layout");
    evas_object_show(ly);
 
-   bt = eo_add(ELM_BUTTON_CLASS, ly);
+   bt = efl_add(ELM_BUTTON_CLASS, ly);
    fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
    ck_assert_ptr_eq(efl_parent_get(bt), ly);
 
@@ -47,7 +47,7 @@ START_TEST(elm_layout_swallows)
    fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
    ck_assert_ptr_eq(efl_parent_get(bt), ly);
 
-   bt2 = eo_add(ELM_BUTTON_CLASS, ly);
+   bt2 = efl_add(ELM_BUTTON_CLASS, ly);
    fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
    ck_assert_ptr_eq(efl_parent_get(bt2), ly);
    /* bt is deleted at this point. */
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index f3b7fea2d2..09944ee23c 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    elm_init(1, NULL);
    win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
 
-   video = elm_video_add(win);
+   video = elm_videfl_add(win);
    role = elm_interface_atspi_accessible_role_get(video);
 
    ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 4bd7d30003..d861cefb58 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -157,7 +157,7 @@ START_TEST (elm_win_policy_quit_last_window_hidden)
    visible = efl_gfx_visible_get(win);
 
    ck_assert(fail_flag == EINA_FALSE);
-   ck_assert(eo_ref_get(win) >= 1);
+   ck_assert(efl_ref_get(win) >= 1);
    ck_assert(visible == EINA_FALSE);
 
    elm_shutdown();
@@ -184,7 +184,7 @@ START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
    visible = efl_gfx_visible_get(win);
 
    ck_assert(fail_flag == EINA_FALSE);
-   ck_assert(eo_ref_get(win) >= 1);
+   ck_assert(efl_ref_get(win) >= 1);
    ck_assert(visible == EINA_FALSE);
 
    elm_shutdown();
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index aaf9ecfa08..073db0f748 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -111,7 +111,7 @@ main_delete_request(Ecore_Evas *ee EINA_UNUSED)
 static void
 bg_setup(void)
 {
-   o_bg = eo_add(EDJE_OBJECT_CLASS, evas);
+   o_bg = efl_add(EDJE_OBJECT_CLASS, evas);
    efl_file_set(o_bg, theme_file, "background");
    efl_gfx_position_set(o_bg, 0, 0);
    efl_gfx_size_set(o_bg, startw, starth);
@@ -573,7 +573,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
      }
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(emotion_object_test_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_test_callbacks,
        { EMOTION_OBJECT_EVENT_FRAME_DECODE, video_obj_frame_decode_cb },
        { EMOTION_OBJECT_EVENT_FRAME_RESIZE, video_obj_frame_resize_cb },
        { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, video_obj_length_change_cb },
@@ -617,7 +617,7 @@ init_video_object(const char *module_filename, const char *filename)
    fd = calloc(1, sizeof(Frame_Data));
    if (!fd) exit(1);
 
-   oe = eo_add(EDJE_OBJECT_CLASS, evas);
+   oe = efl_add(EDJE_OBJECT_CLASS, evas);
    efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd);
    efl_key_data_set(oe, "frame_data", fd);
    efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 825f1eb12a..0e5685bb8d 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -12,25 +12,25 @@
 static void
 _prot_print(Eo *obj, void *class_data EINA_UNUSED)
 {
-   Simple_Protected_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   Simple_Protected_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
    printf("%s %d\n", __func__, pd->protected_x1);
 }
 
-EAPI EO_VOID_FUNC_BODY(inherit_prot_print);
+EAPI EFL_VOID_FUNC_BODY(inherit_prot_print);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(inherit_prot_print, _prot_print),
+     EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Inherit",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL)
+EFL_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL)
diff --git a/src/tests/eo/access/access_main.c b/src/tests/eo/access/access_main.c
index d8d825bda2..1188a60694 100644
--- a/src/tests/eo/access/access_main.c
+++ b/src/tests/eo/access/access_main.c
@@ -11,18 +11,18 @@ main(int argc, char *argv[])
 {
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(INHERIT_CLASS, NULL);
+   Eo *obj = efl_add(INHERIT_CLASS, NULL);
 
    simple_a_set(obj, 1);
    inherit_prot_print(obj);
 
-   Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   Simple_Public_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
    printf("Pub: %d\n", pd->public_x2);
 
-   eo_unref(obj);
-   eo_shutdown();
+   efl_unref(obj);
+   efl_object_shutdown();
    return 0;
 }
 
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 56cce70cd9..ed0c0195fb 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -30,10 +30,10 @@ _a_set(Eo *obj, void *class_data, int a)
    efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
 }
 
-EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
 };
 
 static const Efl_Event_Description *event_desc[] = {
@@ -44,13 +44,13 @@ static const Efl_Event_Description *event_desc[] = {
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      event_desc,
      sizeof(Private_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
 
diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c
index 0034bd9840..e9292f2c90 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -20,13 +20,13 @@ main(int argc, char *argv[])
    Eina_Iterator *iter = NULL;
    void *chld;
 
-   eo_init();
+   efl_object_init();
 
-   Eo *parent = eo_add(SIMPLE_CLASS, NULL);
+   Eo *parent = efl_add(SIMPLE_CLASS, NULL);
 
-   Eo *child1 = eo_add(SIMPLE_CLASS, parent);
-   Eo *child2 = eo_add(SIMPLE_CLASS, parent);
-   Eo *child3 = eo_add(SIMPLE_CLASS, parent);
+   Eo *child1 = efl_add(SIMPLE_CLASS, parent);
+   Eo *child2 = efl_add(SIMPLE_CLASS, parent);
+   Eo *child3 = efl_add(SIMPLE_CLASS, parent);
 
    iter = efl_children_iterator_new(parent);
    fail_if(!iter);
@@ -67,8 +67,8 @@ main(int argc, char *argv[])
    iter = efl_children_iterator_new(parent);
    fail_if(iter);
 
-   eo_unref(parent);
+   efl_unref(parent);
 
-   eo_shutdown();
+   efl_object_shutdown();
    return 0;
 }
diff --git a/src/tests/eo/children/children_simple.c b/src/tests/eo/children/children_simple.c
index c9f0c24cef..853381ffb7 100644
--- a/src/tests/eo/children/children_simple.c
+++ b/src/tests/eo/children/children_simple.c
@@ -10,13 +10,13 @@
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_NOOPS(),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_NOOPS(),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EFL_OBJECT_CLASS, NULL)
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EFL_OBJECT_CLASS, NULL)
 
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index bb64a12cb0..e51bf5db95 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -14,7 +14,7 @@ static int
 _a_get(Eo *obj, void *class_data EINA_UNUSED)
 {
    int a = 0;
-   a = simple_a_get(eo_super(obj, MY_CLASS));
+   a = simple_a_get(efl_super(obj, MY_CLASS));
 
    return a;
 }
@@ -22,9 +22,9 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   Eo *simple = eo_add(SIMPLE_CLASS, obj);
+   Eo *simple = efl_add(SIMPLE_CLASS, obj);
    efl_composite_attach(obj, simple);
    efl_event_callback_forwarder_add(simple, EV_A_CHANGED, obj);
 
@@ -37,21 +37,21 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Comp",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_CLASS,
+EFL_DEFINE_CLASS(comp_class_get, &class_desc, EO_CLASS,
       SIMPLE_CLASS, NULL);
 
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index fae623855c..c37c851cd2 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -24,13 +24,13 @@ main(int argc, char *argv[])
 {
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(COMP_CLASS, NULL);
+   Eo *obj = efl_add(COMP_CLASS, NULL);
    efl_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL);
 
-   fail_if(!eo_isa(obj, COMP_CLASS));
-   fail_if(!eo_isa(obj, SIMPLE_CLASS));
+   fail_if(!efl_isa(obj, COMP_CLASS));
+   fail_if(!efl_isa(obj, SIMPLE_CLASS));
 
    int a = 0;
    cb_called = EINA_FALSE;
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
    /* disable the callback forwarder, and fail if it's still called. */
    Eo *simple = NULL;
    simple = efl_key_data_get(obj, "simple-obj");
-   eo_ref(simple);
+   efl_ref(simple);
    efl_event_callback_forwarder_del(simple, EV_A_CHANGED, obj);
 
    cb_called = EINA_FALSE;
@@ -69,10 +69,10 @@ main(int argc, char *argv[])
    fail_if(!efl_composite_part_is(simple));
    fail_if(efl_composite_attach(obj, simple));
 
-   eo_unref(simple);
-   eo_unref(obj);
+   efl_unref(simple);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
    return 0;
 }
 
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index 13c8f6702a..520eaee61b 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -14,7 +14,7 @@ static void
 _a_set(Eo *obj, void *class_data, int a)
 {
    Simple_Public_Data *pd = class_data;
-   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
+   printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    pd->a = a;
 
    efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
@@ -27,145 +27,145 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data)
    return pd->a;
 }
 
-EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
-EAPI EO_FUNC_BODY(simple_a_get, int, 0);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
+EAPI EFL_FUNC_BODY(simple_a_get, int, 0);
 
-EAPI EO_VOID_FUNC_BODYV(simple_a_set1, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set2, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set3, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set4, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set5, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set6, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set7, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set8, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set9, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set10, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set11, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set12, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set13, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set14, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set15, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set16, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set17, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set18, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set19, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set20, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set21, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set22, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set23, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set24, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set25, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set26, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set27, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set28, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set29, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set30, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set31, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_set32, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get1, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get2, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get3, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get4, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get5, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get6, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get7, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get8, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get9, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get10, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get11, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get12, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get13, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get14, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get15, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get16, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get17, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get18, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get19, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get20, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get21, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get22, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get23, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get24, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get25, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get26, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get27, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get28, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get29, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get30, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get31, EO_FUNC_CALL(a), int a);
-EAPI EO_VOID_FUNC_BODYV(simple_a_get32, EO_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set1, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set2, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set3, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set4, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set5, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set6, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set7, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set8, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set9, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set10, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set11, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set12, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set13, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set14, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set15, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set16, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set17, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set18, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set19, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set20, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set21, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set22, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set23, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set24, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set25, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set26, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set27, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set28, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set29, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set30, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set31, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set32, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get1, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get2, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get3, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get4, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get5, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get6, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get7, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get8, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get9, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get10, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get11, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get12, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get13, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get14, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get15, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get16, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get17, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get18, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get19, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get20, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get21, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get22, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get23, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get24, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get25, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get26, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get27, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get28, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get29, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get30, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get31, EFL_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_get32, EFL_FUNC_CALL(a), int a);
 
 /* XXX: This is fragile, and emulates many IDs in order to go to the next
  * op id chain (assuming chain size is as it is at the moment, 32).
  * This is needed in order to properly test some edge cases (see commit message
  * for more info). */
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(simple_a_set1, _a_set),
-     EO_OP_FUNC(simple_a_set2, _a_set),
-     EO_OP_FUNC(simple_a_set3, _a_set),
-     EO_OP_FUNC(simple_a_set4, _a_set),
-     EO_OP_FUNC(simple_a_set5, _a_set),
-     EO_OP_FUNC(simple_a_set6, _a_set),
-     EO_OP_FUNC(simple_a_set7, _a_set),
-     EO_OP_FUNC(simple_a_set8, _a_set),
-     EO_OP_FUNC(simple_a_set9, _a_set),
-     EO_OP_FUNC(simple_a_set10, _a_set),
-     EO_OP_FUNC(simple_a_set11, _a_set),
-     EO_OP_FUNC(simple_a_set12, _a_set),
-     EO_OP_FUNC(simple_a_set13, _a_set),
-     EO_OP_FUNC(simple_a_set14, _a_set),
-     EO_OP_FUNC(simple_a_set15, _a_set),
-     EO_OP_FUNC(simple_a_set16, _a_set),
-     EO_OP_FUNC(simple_a_set17, _a_set),
-     EO_OP_FUNC(simple_a_set18, _a_set),
-     EO_OP_FUNC(simple_a_set19, _a_set),
-     EO_OP_FUNC(simple_a_set20, _a_set),
-     EO_OP_FUNC(simple_a_set21, _a_set),
-     EO_OP_FUNC(simple_a_set22, _a_set),
-     EO_OP_FUNC(simple_a_set23, _a_set),
-     EO_OP_FUNC(simple_a_set24, _a_set),
-     EO_OP_FUNC(simple_a_set25, _a_set),
-     EO_OP_FUNC(simple_a_set26, _a_set),
-     EO_OP_FUNC(simple_a_set27, _a_set),
-     EO_OP_FUNC(simple_a_set28, _a_set),
-     EO_OP_FUNC(simple_a_set29, _a_set),
-     EO_OP_FUNC(simple_a_set30, _a_set),
-     EO_OP_FUNC(simple_a_set31, _a_set),
-     EO_OP_FUNC(simple_a_set32, _a_set),
-     EO_OP_FUNC(simple_a_get1, _a_get),
-     EO_OP_FUNC(simple_a_get2, _a_get),
-     EO_OP_FUNC(simple_a_get3, _a_get),
-     EO_OP_FUNC(simple_a_get4, _a_get),
-     EO_OP_FUNC(simple_a_get5, _a_get),
-     EO_OP_FUNC(simple_a_get6, _a_get),
-     EO_OP_FUNC(simple_a_get7, _a_get),
-     EO_OP_FUNC(simple_a_get8, _a_get),
-     EO_OP_FUNC(simple_a_get9, _a_get),
-     EO_OP_FUNC(simple_a_get10, _a_get),
-     EO_OP_FUNC(simple_a_get11, _a_get),
-     EO_OP_FUNC(simple_a_get12, _a_get),
-     EO_OP_FUNC(simple_a_get13, _a_get),
-     EO_OP_FUNC(simple_a_get14, _a_get),
-     EO_OP_FUNC(simple_a_get15, _a_get),
-     EO_OP_FUNC(simple_a_get16, _a_get),
-     EO_OP_FUNC(simple_a_get17, _a_get),
-     EO_OP_FUNC(simple_a_get18, _a_get),
-     EO_OP_FUNC(simple_a_get19, _a_get),
-     EO_OP_FUNC(simple_a_get20, _a_get),
-     EO_OP_FUNC(simple_a_get21, _a_get),
-     EO_OP_FUNC(simple_a_get22, _a_get),
-     EO_OP_FUNC(simple_a_get23, _a_get),
-     EO_OP_FUNC(simple_a_get24, _a_get),
-     EO_OP_FUNC(simple_a_get25, _a_get),
-     EO_OP_FUNC(simple_a_get26, _a_get),
-     EO_OP_FUNC(simple_a_get27, _a_get),
-     EO_OP_FUNC(simple_a_get28, _a_get),
-     EO_OP_FUNC(simple_a_get29, _a_get),
-     EO_OP_FUNC(simple_a_get30, _a_get),
-     EO_OP_FUNC(simple_a_get31, _a_get),
-     EO_OP_FUNC(simple_a_get32, _a_get),
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_set1, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set2, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set3, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set4, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set5, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set6, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set7, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set8, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set9, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set10, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set11, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set12, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set13, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set14, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set15, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set16, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set17, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set18, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set19, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set20, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set21, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set22, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set23, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set24, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set25, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set26, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set27, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set28, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set29, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set30, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set31, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_set32, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_get1, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get2, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get3, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get4, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get5, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get6, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get7, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get8, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get9, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get10, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get11, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get12, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get13, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get14, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get15, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get16, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get17, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get18, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get19, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get20, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get21, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get22, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get23, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get24, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get25, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get26, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get27, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get28, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get29, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get30, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get31, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_get32, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
 };
 
 static const Efl_Event_Description *event_desc[] = {
@@ -176,13 +176,13 @@ static const Efl_Event_Description *event_desc[] = {
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      event_desc,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index 45cd50dfb9..ffda7793db 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -22,9 +22,9 @@ main(int argc, char *argv[])
    int ret = 0;
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
 
    fail_if(my_init_count != 2);
 
@@ -38,59 +38,59 @@ main(int argc, char *argv[])
    fail_if(a != 1);
    fail_if(b != 2);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
    fail_if(my_init_count != 0);
 
-   obj = eo_add(SIMPLE2_CLASS, NULL);
+   obj = efl_add(SIMPLE2_CLASS, NULL);
    fail_if(obj);
 
-   obj = eo_add(SIMPLE3_CLASS, NULL);
+   obj = efl_add(SIMPLE3_CLASS, NULL);
    fail_if(obj);
 
    my_init_count = 0;
-   obj = eo_add(SIMPLE4_CLASS, NULL);
+   obj = efl_add(SIMPLE4_CLASS, NULL);
 
    fail_if(my_init_count != 2);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
    fail_if(my_init_count != 0);
 
-   obj = eo_add(SIMPLE5_CLASS, NULL);
+   obj = efl_add(SIMPLE5_CLASS, NULL);
    fail_if(!obj);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(SIMPLE6_CLASS, NULL);
+   obj = efl_add(SIMPLE6_CLASS, NULL);
    fail_if(!obj);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(SIMPLE7_CLASS, NULL);
+   obj = efl_add(SIMPLE7_CLASS, NULL);
    fail_if(obj);
 
    my_init_count = 0;
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
    fail_if(my_init_count != 2);
    a = simple_a_get(obj);
    fail_if(a != 0);
 
    my_init_count = 0;
-   obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7));
+   obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_self, 7));
    fail_if(!obj);
    fail_if(my_init_count != 2);
    a = simple_a_get(obj);
    fail_if(a != 7);
 
    my_init_count = 0;
-   obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eo_self, 6), simple_a_set(eo_self, -1), b = simple_b_get(eo_self));
+   obj = efl_add(SIMPLE_CLASS, NULL, simple_b_set(efl_self, 6), simple_a_set(efl_self, -1), b = simple_b_get(efl_self));
    fail_if(obj);
    fail_if(b != 6);
    fail_if(my_init_count != 0);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
    return ret;
 }
 
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 1ce5a1c263..417958941e 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -24,35 +24,35 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
    my_init_count++;
 
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 
    my_init_count--;
 }
 
-EAPI EO_VOID_FUNC_BODYV(mixin_add_and_print, EO_FUNC_CALL(x), int x);
+EAPI EFL_VOID_FUNC_BODYV(mixin_add_and_print, EFL_FUNC_CALL(x), int x);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(mixin_add_and_print, _add_and_print_set),
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC(mixin_add_and_print, _add_and_print_set),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Mixin",
-     EO_CLASS_TYPE_MIXIN,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_MIXIN,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index a5a0732eae..6d12ef9fb8 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -31,8 +31,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
    pd->name = name; \
    printf("%s %d\n", __func__, pd->name); \
 } \
-EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
-EO_FUNC_BODY(simple_##name##_get, int, 0);
+EFL_VOID_FUNC_BODYV(simple_##name##_set, EFL_FUNC_CALL(name), int name); \
+EFL_FUNC_BODY(simple_##name##_get, int, 0);
 
 _GET_SET_FUNC(a)
 _GET_SET_FUNC(b)
@@ -44,7 +44,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
    my_init_count++;
 
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static Eo*
@@ -53,7 +53,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED)
    Eo *ret;
    Private_Data *pd = class_data;
 
-   ret = efl_finalize(eo_super(obj, MY_CLASS));
+   ret = efl_finalize(efl_super(obj, MY_CLASS));
 
    if (pd->a < 0)
      {
@@ -66,7 +66,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED)
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 
    my_init_count--;
 }
@@ -83,29 +83,29 @@ _class_destructor(Efl_Class *klass EINA_UNUSED)
    free(class_var);
 }
 
-EO_VOID_FUNC_BODYV(simple_constructor, EO_FUNC_CALL(a), int a);
+EFL_VOID_FUNC_BODYV(simple_constructor, EFL_FUNC_CALL(a), int a);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
-     EO_OP_FUNC_OVERRIDE(efl_finalize, _finalize),
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_a_get, _a_get),
-     EO_OP_FUNC(simple_b_set, _b_set),
-     EO_OP_FUNC(simple_b_get, _b_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_finalize, _finalize),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
+     EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Private_Data),
      _class_constructor,
      _class_destructor
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
       MIXIN_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 4e2c02cbc4..a7b7eb986d 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -11,25 +11,25 @@
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    return NULL;
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple2",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple2_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index bfde816a7d..a6e09606d1 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -15,19 +15,19 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple3",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple3_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple4.c b/src/tests/eo/constructors/constructors_simple4.c
index ca1389404a..e71cc9b5e5 100644
--- a/src/tests/eo/constructors/constructors_simple4.c
+++ b/src/tests/eo/constructors/constructors_simple4.c
@@ -12,13 +12,13 @@
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple4",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_NOOPS(),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_NOOPS(),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple4_class_get, &class_desc, SIMPLE_CLASS, MIXIN_CLASS, NULL);
+EFL_DEFINE_CLASS(simple4_class_get, &class_desc, SIMPLE_CLASS, MIXIN_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index 2881f782f4..b47f05b588 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -15,19 +15,19 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple5",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple5_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index ff1dcf47ed..7b41275938 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -11,23 +11,23 @@
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Efl_Op_Description op_descs [] = {
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple6",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple6_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 5f3f0af074..b01987fd86 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -15,23 +15,23 @@ static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
    /* FIXME: Actually test it. */
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static Efl_Op_Description op_descs [] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple7",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple7_class_get, &class_desc, SIMPLE2_CLASS, NULL);
+EFL_DEFINE_CLASS(simple7_class_get, &class_desc, SIMPLE2_CLASS, NULL);
 
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c
index 845515128c..a473a89f3e 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.c
@@ -11,12 +11,12 @@
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Inherit",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_NOOPS(),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_NOOPS(),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL);
+EFL_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL);
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 26e92e5212..7bae304b4c 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -14,12 +14,12 @@
 static void
 _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
 {
-   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
+   printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    simple_a_print(obj);
-   simple_a_set(eo_super(obj, MY_CLASS), a + 1);
+   simple_a_set(efl_super(obj, MY_CLASS), a + 1);
 
    Eina_Bool called = EINA_FALSE;
-   called = simple_a_print(eo_super(obj, MY_CLASS));
+   called = simple_a_print(efl_super(obj, MY_CLASS));
    fail_if(!called);
 }
 
@@ -28,7 +28,7 @@ _print(Eo *obj, void *class_data EINA_UNUSED)
 {
    Eina_Bool called = EINA_FALSE;
    printf("Hey\n");
-   called = inherit2_print(eo_super(obj, MY_CLASS));
+   called = inherit2_print(efl_super(obj, MY_CLASS));
    fail_if(called);
 
    return EINA_TRUE;
@@ -46,36 +46,36 @@ static Eina_Bool
 _class_print(Efl_Class *klass, void *data EINA_UNUSED)
 {
    Eina_Bool called = EINA_FALSE;
-   printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
-   called = simple_class_print(eo_super(klass, MY_CLASS));
+   printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
+   called = simple_class_print(efl_super(klass, MY_CLASS));
    fail_if(!called);
 
-   called = simple_class_print2(eo_super(klass, MY_CLASS));
+   called = simple_class_print2(efl_super(klass, MY_CLASS));
    fail_if(!called);
 
    return EINA_TRUE;
 }
 
-EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
-EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
+EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
+EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(inherit2_print, _print),
-     EO_OP_FUNC(inherit2_print2, _print2),
-     EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
-     EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(inherit2_print, _print),
+     EFL_OBJECT_OP_FUNC(inherit2_print2, _print2),
+     EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Inherit2",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(inherit2_class_get, &class_desc, INHERIT_CLASS, NULL);
+EFL_DEFINE_CLASS(inherit2_class_get, &class_desc, INHERIT_CLASS, NULL);
 
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 3f09b19e78..2a66926f2d 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -12,24 +12,24 @@
 static void
 _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
 {
-   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
-   simple_a_set(eo_super(obj, MY_CLASS), a + 1);
+   printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
+   simple_a_set(efl_super(obj, MY_CLASS), a + 1);
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Inherit3",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(inherit3_class_get, &class_desc, INHERIT2_CLASS, NULL);
+EFL_DEFINE_CLASS(inherit3_class_get, &class_desc, INHERIT2_CLASS, NULL);
 
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index d5fc195d23..091af5ebe1 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -15,34 +15,34 @@ main(int argc, char *argv[])
 {
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
    Eina_Bool called = EINA_FALSE;
-   Eo *obj = eo_add(INHERIT2_CLASS, NULL);
+   Eo *obj = efl_add(INHERIT2_CLASS, NULL);
 
    simple_a_set(obj, 1);
-   Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   Simple_Public_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 2);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(INHERIT3_CLASS, NULL);
+   obj = efl_add(INHERIT3_CLASS, NULL);
 
    simple_a_set(obj, 1);
-   pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   pd = efl_data_scope_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 3);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(INHERIT2_CLASS, NULL);
+   obj = efl_add(INHERIT2_CLASS, NULL);
    called = inherit2_print(obj);
    fail_if(!called);
    called = inherit2_print(obj);
    called = inherit2_print(obj);
    fail_if(!called);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
    called = inherit2_print(obj);
    fail_if(called);
 
@@ -68,12 +68,12 @@ main(int argc, char *argv[])
    fail_if(called);
 #endif
 
-   efl_constructor(eo_super(obj, SIMPLE_CLASS));
-   efl_destructor(eo_super(obj, SIMPLE_CLASS));
+   efl_constructor(efl_super(obj, SIMPLE_CLASS));
+   efl_destructor(efl_super(obj, SIMPLE_CLASS));
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
    return 0;
 }
 
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index dbdd935a10..45d19d2838 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -16,7 +16,7 @@ static void
 _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
 {
    Simple_Public_Data *pd = class_data;
-   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
+   printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    pd->a = a;
 }
 
@@ -24,7 +24,7 @@ static Eina_Bool
 _a_print(Eo *obj EINA_UNUSED, void *class_data)
 {
    Simple_Public_Data *pd = class_data;
-   printf("Print %s %d\n", eo_class_name_get(MY_CLASS), pd->a);
+   printf("Print %s %d\n", efl_class_name_get(MY_CLASS), pd->a);
 
    return EINA_TRUE;
 }
@@ -32,12 +32,12 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data)
 static Eina_Bool
 _class_print(Efl_Class *klass, void *class_data EINA_UNUSED)
 {
-   printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
+   printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
    Eina_Bool called = EINA_FALSE;
-   called = simple_class_print(eo_super(klass, MY_CLASS));
+   called = simple_class_print(efl_super(klass, MY_CLASS));
    fail_if(called);
 
-   called = simple_class_print2(eo_super(klass, MY_CLASS));
+   called = simple_class_print2(efl_super(klass, MY_CLASS));
    fail_if(called);
 
    return EINA_TRUE;
@@ -46,33 +46,33 @@ _class_print(Efl_Class *klass, void *class_data EINA_UNUSED)
 static Eina_Bool
 _class_print2(Efl_Class *klass, void *class_data EINA_UNUSED)
 {
-   printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
+   printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
 
    return EINA_TRUE;
 }
 
-EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
-EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
-EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
-EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
+EAPI EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
+EAPI EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
+EAPI EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_a_print, _a_print),
-     EO_OP_FUNC(simple_class_print, _class_print),
-     EO_OP_FUNC(simple_class_print2, _class_print2),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
+     EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
+     EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index b730e749c6..9c699ecad0 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -8,22 +8,22 @@
 
 #define MY_CLASS INTERFACE_CLASS
 
-EO_FUNC_BODY(interface_ab_sum_get, int, 0);
+EFL_FUNC_BODY(interface_ab_sum_get, int, 0);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(interface_ab_sum_get, NULL),
+     EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Interface",
-     EO_CLASS_TYPE_INTERFACE,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_INTERFACE,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL)
+EFL_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL)
 
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index 78dbd644f4..ed0f6c219c 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -9,22 +9,22 @@
 
 #define MY_CLASS INTERFACE2_CLASS
 
-EO_FUNC_BODY(interface2_ab_sum_get2, int, 0);
+EFL_FUNC_BODY(interface2_ab_sum_get2, int, 0);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(interface2_ab_sum_get2, NULL),
+     EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Interface2",
-     EO_CLASS_TYPE_INTERFACE,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_INTERFACE,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(interface2_class_get, &class_desc, INTERFACE_CLASS, NULL)
+EFL_DEFINE_CLASS(interface2_class_get, &class_desc, INTERFACE_CLASS, NULL)
 
diff --git a/src/tests/eo/interface/interface_main.c b/src/tests/eo/interface/interface_main.c
index a85f030963..e9e145bd75 100644
--- a/src/tests/eo/interface/interface_main.c
+++ b/src/tests/eo/interface/interface_main.c
@@ -14,9 +14,9 @@ main(int argc, char *argv[])
 {
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
 
    simple_a_set(obj, 1);
    simple_b_set(obj, 2);
@@ -35,8 +35,8 @@ main(int argc, char *argv[])
    sum = interface2_ab_sum_get2(obj);
    fail_if(sum != a + b + 1);
 
-   eo_unref(obj);
-   eo_shutdown();
+   efl_unref(obj);
+   efl_object_shutdown();
    return 0;
 }
 
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 902c094754..f13f1b7a23 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -30,8 +30,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
    pd->name = name; \
    printf("%s %d\n", __func__, pd->name); \
 } \
-EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
-EO_FUNC_BODY(simple_##name##_get, int, 0);
+EFL_VOID_FUNC_BODYV(simple_##name##_set, EFL_FUNC_CALL(name), int name); \
+EFL_FUNC_BODY(simple_##name##_get, int, 0);
 
 _GET_SET_FUNC(a)
 _GET_SET_FUNC(b)
@@ -42,7 +42,7 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
    int a = 0, b = 0;
    a = simple_a_get(obj);
    b = simple_b_get(obj);
-   printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
+   printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
    return a + b;
 }
 
@@ -52,28 +52,28 @@ _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED)
    int a = 0, b = 0;
    a = simple_a_get(obj);
    b = simple_b_get(obj);
-   printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
+   printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
    return a + b + 1;
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_a_get, _a_get),
-     EO_OP_FUNC(simple_b_set, _b_set),
-     EO_OP_FUNC(simple_b_get, _b_get),
-     EO_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
-     EO_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
+     EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Private_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE2_CLASS, NULL);
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE2_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index e3936653ea..f363bf7774 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -13,25 +13,25 @@ static int
 _a_get(Eo *obj, void *class_data EINA_UNUSED)
 {
    int ret = 0;
-   ret = simple_a_get(eo_super(obj, MY_CLASS));
+   ret = simple_a_get(efl_super(obj, MY_CLASS));
    printf("%s %d\n", __func__, ret);
 
    return ret;
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Inherit",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, MIXIN4_CLASS, NULL);
+EFL_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, MIXIN4_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_main.c b/src/tests/eo/mixin/mixin_main.c
index d3c1dbf2ac..f3534cc7ed 100644
--- a/src/tests/eo/mixin/mixin_main.c
+++ b/src/tests/eo/mixin/mixin_main.c
@@ -16,9 +16,9 @@ main(int argc, char *argv[])
 {
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
 
    simple_a_set(obj, 1);
    simple_b_set(obj, 2);
@@ -32,22 +32,22 @@ main(int argc, char *argv[])
    sum = mixin_ab_sum_get(obj);
    sum = mixin_ab_sum_get(obj);
 
-   Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS);
+   Mixin2_Public_Data *pd2 = efl_data_scope_get(obj, MIXIN2_CLASS);
    fail_if(pd2->count != 6);
 
-   Mixin3_Public_Data *pd3 = eo_data_scope_get(obj, MIXIN3_CLASS);
+   Mixin3_Public_Data *pd3 = efl_data_scope_get(obj, MIXIN3_CLASS);
    fail_if(pd3->count != 9);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(INHERIT_CLASS, NULL);
+   obj = efl_add(INHERIT_CLASS, NULL);
    simple_a_set(obj, 5);
    a = simple_a_get(obj);
    printf("%d\n", a);
    fail_if(a != 5);
 
-   eo_unref(obj);
-   eo_shutdown();
+   efl_unref(obj);
+   efl_object_shutdown();
    return 0;
 }
 
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 191b5ec0e2..a79c5e5910 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -14,40 +14,40 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
    int a = 0, b = 0;
    a = simple_a_get(obj);
    b = simple_b_get(obj);
-   printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
+   printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
    return a + b;
 }
 
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
-EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0);
+EAPI EFL_FUNC_BODY(mixin_ab_sum_get, int, 0);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
-     EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Mixin",
-     EO_CLASS_TYPE_MIXIN,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_MIXIN,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL)
 
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index f4f49f6d7a..8c1c60404c 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -17,8 +17,8 @@ _ab_sum_get(Eo *obj, void *class_data)
    /* This cast is a hack just for the tests... */
    Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data;
    int sum = 0;
-   printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
-   sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS));
+   printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
+   sum = mixin_ab_sum_get(efl_super(obj, MY_CLASS));
 
    ++sum;
    pd->count += 2;
@@ -36,32 +36,32 @@ _ab_sum_get(Eo *obj, void *class_data)
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    return obj;
 }
 
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
-     EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Mixin2",
-     EO_CLASS_TYPE_MIXIN,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_MIXIN,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Mixin2_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(mixin2_class_get, &class_desc, MIXIN_CLASS, NULL);
+EFL_DEFINE_CLASS(mixin2_class_get, &class_desc, MIXIN_CLASS, NULL);
 
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index d98b8c87f6..5a29e9d3ae 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -17,8 +17,8 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
    /* This cast is just a hack for the test. */
    Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data;
    int sum = 0;
-   printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
-   sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS));
+   printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
+   sum = mixin_ab_sum_get(efl_super(obj, MY_CLASS));
 
    ++sum;
    pd->count += 3;
@@ -36,31 +36,31 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
-     EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Mixin3",
-     EO_CLASS_TYPE_MIXIN,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_MIXIN,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Mixin3_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(mixin3_class_get, &class_desc, MIXIN_CLASS, NULL);
+EFL_DEFINE_CLASS(mixin3_class_get, &class_desc, MIXIN_CLASS, NULL);
 
diff --git a/src/tests/eo/mixin/mixin_mixin4.c b/src/tests/eo/mixin/mixin_mixin4.c
index 7a2eaea77d..cfe41c0e20 100644
--- a/src/tests/eo/mixin/mixin_mixin4.c
+++ b/src/tests/eo/mixin/mixin_mixin4.c
@@ -14,13 +14,13 @@
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Mixin4",
-     EO_CLASS_TYPE_MIXIN,
-     EO_CLASS_DESCRIPTION_NOOPS(),
+     EFL_CLASS_TYPE_MIXIN,
+     EFL_CLASS_DESCRIPTION_NOOPS(),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(mixin4_class_get, &class_desc, NULL, NULL);
+EFL_DEFINE_CLASS(mixin4_class_get, &class_desc, NULL, NULL);
 
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index a55ff9ba0b..8aef3dc4f5 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -31,30 +31,30 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
    pd->name = name; \
    printf("%s %d\n", __func__, pd->name); \
 } \
-EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
-EO_FUNC_BODY(simple_##name##_get, int, 0);
+EFL_VOID_FUNC_BODYV(simple_##name##_set, EFL_FUNC_CALL(name), int name); \
+EFL_FUNC_BODY(simple_##name##_get, int, 0);
 
 _GET_SET_FUNC(a)
 _GET_SET_FUNC(b)
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_a_get, _a_get),
-     EO_OP_FUNC(simple_b_set, _b_set),
-     EO_OP_FUNC(simple_b_get, _b_get),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
+     EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Private_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
       MIXIN3_CLASS, MIXIN2_CLASS, NULL);
 
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 9013e2c3a5..84de464742 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -22,7 +22,7 @@ _a_changed_cb(void *data, const Eo_Event *event)
 
    cb_count++;
 
-   efl_event_callback_priority_add(event->object, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
+   efl_event_callback_priority_add(event->object, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
    efl_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423);
 
    /* Stop as we reached the 3rd one. */
@@ -63,18 +63,18 @@ main(int argc, char *argv[])
 {
    (void) argc;
    (void) argv;
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Simple_Public_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
 
    /* The order of these two is undetermined. */
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
    /* This will be called afterwards. */
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
    /* This will never be called because the previous callback returns NULL. */
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
 
    simple_a_set(obj, 1);
 
@@ -98,7 +98,7 @@ main(int argc, char *argv[])
    /* Freeze/thaw. */
    int fcount = 0;
    cb_count = 0;
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
    fail_if(pd->cb_count != 1);
 
    fcount = efl_event_freeze_count_get(obj);
@@ -112,7 +112,7 @@ main(int argc, char *argv[])
    fcount = efl_event_freeze_count_get(obj);
    fail_if(fcount != 2);
 
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
    fail_if(pd->cb_count != 2);
 
    simple_a_set(obj, 2);
@@ -152,7 +152,7 @@ main(int argc, char *argv[])
    fcount = 0;
    cb_count = 0;
    pd->cb_count = 0;
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
    fail_if(pd->cb_count != 1);
 
    fcount = efl_event_global_freeze_count_get(EO_CLASS);
@@ -166,7 +166,7 @@ main(int argc, char *argv[])
    fcount = efl_event_global_freeze_count_get(EO_CLASS);
    fail_if(fcount != 2);
 
-   efl_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
+   efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
    fail_if(pd->cb_count != 2);
 
    simple_a_set(obj, 2);
@@ -197,13 +197,13 @@ main(int argc, char *argv[])
    fcount = efl_event_global_freeze_count_get(EO_CLASS);
    fail_if(fcount != 0);
 
-   efl_event_callback_priority_add(obj, EV_RESTART, EO_CALLBACK_PRIORITY_DEFAULT, _restart_1_cb, NULL);
-   efl_event_callback_priority_add(obj, EV_RESTART, EO_CALLBACK_PRIORITY_BEFORE, _restart_2_cb, NULL);
+   efl_event_callback_priority_add(obj, EV_RESTART, EFL_CALLBACK_PRIORITY_DEFAULT, _restart_1_cb, NULL);
+   efl_event_callback_priority_add(obj, EV_RESTART, EFL_CALLBACK_PRIORITY_BEFORE, _restart_2_cb, NULL);
    efl_event_callback_call(obj, EV_RESTART, NULL);
    fail_if(inside);
    fail_if(called != 2);
 
-   eo_unref(obj);
-   eo_shutdown();
+   efl_unref(obj);
+   efl_object_shutdown();
    return 0;
 }
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 35ccc78a6a..8e07408a23 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -31,7 +31,7 @@ _a_set(Eo *obj, void *class_data, int a)
 void
 _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
+   Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS);
    const Efl_Callback_Array_Item *callback_array = event->info;
 
    if (callback_array->desc != EV_A_CHANGED)
@@ -45,7 +45,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
 void
 _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
+   Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS);
    const Efl_Callback_Array_Item *callback_array = event->info;
 
    if (callback_array->desc != EV_A_CHANGED)
@@ -59,7 +59,7 @@ _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
 static Eo *
 _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
 
    efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
    efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deled, NULL);
@@ -69,11 +69,11 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
    return obj;
 }
 
-EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
+EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
-     EO_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
 };
 
 
@@ -86,12 +86,12 @@ static const Efl_Event_Description *event_desc[] = {
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      event_desc,
      sizeof(Private_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 551c58deae..3b23216711 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -14,55 +14,55 @@ static struct log_ctx ctx;
 
 START_TEST(eo_pure_virtual_fct_call)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
 
-   TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d) of class '%s'.");
+   TEST_EO_ERROR("_efl_object_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d) of class '%s'.");
    simple_pure_virtual(obj);
    fail_unless(ctx.did);
 
-   eo_unref(obj);
+   efl_unref(obj);
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_api_not_implemented_call)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
 
-   TEST_EO_ERROR("_eo_api_op_id_get", "Unable to resolve op for api func %p");
+   TEST_EO_ERROR("_efl_object_api_op_id_get", "Unable to resolve op for api func %p");
    simple_no_implementation(obj);
    fail_unless(ctx.did);
 
-   eo_unref(obj);
+   efl_unref(obj);
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_op_not_found_in_super)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
 
-   TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'.");
-   simple_a_set(eo_super(obj, SIMPLE_CLASS), 10);
+   TEST_EO_ERROR("_efl_object_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'.");
+   simple_a_set(efl_super(obj, SIMPLE_CLASS), 10);
    fail_unless(ctx.did);
 
-   eo_unref(obj);
+   efl_unref(obj);
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 5689f91a65..043a0a23ea 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -16,77 +16,77 @@ const Efl_Class *klass;
 
 static void _destructor_unref(Eo *obj, void *class_data EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, klass));
+   efl_destructor(efl_super(obj, klass));
 
    /* this triggers an eo stack overflow if not correctly protected */
-   eo_unref(obj);
+   efl_unref(obj);
 }
 
 START_TEST(efl_destructor_unref)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    static Efl_Op_Description op_descs [] = {
-        EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor_unref),
+        EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor_unref),
    };
 
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_descs),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
+   klass = efl_class_new(&class_desc, SIMPLE_CLASS, NULL);
    fail_if(!klass);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
 
-   TEST_EO_ERROR("eo_unref", "Obj:%p. User refcount (%d) < 0. Too many unrefs.");
-   eo_unref(obj);
+   TEST_EO_ERROR("efl_unref", "Obj:%p. User refcount (%d) < 0. Too many unrefs.");
+   efl_unref(obj);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(efl_destructor_double_del)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
+   klass = efl_class_new(&class_desc, SIMPLE_CLASS, NULL);
    fail_if(!klass);
 
-   Eo *obj = eo_add(klass, NULL);
-   eo_manual_free_set(obj, EINA_TRUE);
+   Eo *obj = efl_add(klass, NULL);
+   efl_manual_free_set(obj, EINA_TRUE);
    fail_if(!obj);
 
-   TEST_EO_ERROR("eo_unref", "Obj:%p. User refcount (%d) < 0. Too many unrefs.");
+   TEST_EO_ERROR("efl_unref", "Obj:%p. User refcount (%d) < 0. Too many unrefs.");
    efl_del(obj);
    efl_del(obj);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index d2bac92adf..400ea544ef 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -14,7 +14,7 @@ static struct log_ctx ctx;
 
 START_TEST(eo_inherit_errors)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    const Efl_Class *klass;
@@ -24,8 +24,8 @@ START_TEST(eo_inherit_errors)
    static const Efl_Class_Description class_desc_simple = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
@@ -35,8 +35,8 @@ START_TEST(eo_inherit_errors)
    static const Efl_Class_Description class_desc_mixin = {
         EO_VERSION,
         "Mixin",
-        EO_CLASS_TYPE_MIXIN,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_MIXIN,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
@@ -46,42 +46,42 @@ START_TEST(eo_inherit_errors)
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "General",
-        EO_CLASS_TYPE_MIXIN,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_MIXIN,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL);
+   klass_mixin = efl_class_new(&class_desc_mixin, NULL, NULL);
    fail_if(!klass_mixin);
 
-   klass_simple = eo_class_new(&class_desc_simple, EO_CLASS, NULL);
+   klass_simple = efl_class_new(&class_desc_simple, EO_CLASS, NULL);
    fail_if(!klass_simple);
 
-   TEST_EO_ERROR("eo_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').");
-   klass = eo_class_new(&class_desc, klass_simple, NULL);
+   TEST_EO_ERROR("efl_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').");
+   klass = efl_class_new(&class_desc, klass_simple, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
-   class_desc.type = EO_CLASS_TYPE_REGULAR;
+   class_desc.type = EFL_CLASS_TYPE_REGULAR;
 
-   TEST_EO_ERROR("eo_class_new", "Regular classes ('%s') aren't allowed to inherit from non-regular classes ('%s').");
-   klass = eo_class_new(&class_desc, klass_mixin, NULL);
+   TEST_EO_ERROR("efl_class_new", "Regular classes ('%s') aren't allowed to inherit from non-regular classes ('%s').");
+   klass = efl_class_new(&class_desc, klass_mixin, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
    (void) klass;
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_inconsistent_mro)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    const Efl_Class *klass;
@@ -92,8 +92,8 @@ START_TEST(eo_inconsistent_mro)
    static const Efl_Class_Description class_desc_simple = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
@@ -103,8 +103,8 @@ START_TEST(eo_inconsistent_mro)
    static const Efl_Class_Description class_desc_mixin = {
         EO_VERSION,
         "Mixin",
-        EO_CLASS_TYPE_MIXIN,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_MIXIN,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
@@ -114,8 +114,8 @@ START_TEST(eo_inconsistent_mro)
    static const Efl_Class_Description class_desc_mixin2 = {
         EO_VERSION,
         "Mixin2",
-        EO_CLASS_TYPE_MIXIN,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_MIXIN,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
@@ -125,37 +125,37 @@ START_TEST(eo_inconsistent_mro)
    static const Efl_Class_Description class_desc_mixin3 = {
         EO_VERSION,
         "Mixin3",
-        EO_CLASS_TYPE_MIXIN,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_MIXIN,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL);
+   klass_mixin = efl_class_new(&class_desc_mixin, NULL, NULL);
    fail_if(!klass_mixin);
 
-   klass_mixin2 = eo_class_new(&class_desc_mixin2, klass_mixin, NULL);
+   klass_mixin2 = efl_class_new(&class_desc_mixin2, klass_mixin, NULL);
    fail_if(!klass_mixin2);
 
-   klass_mixin3 = eo_class_new(&class_desc_mixin3, klass_mixin, NULL);
+   klass_mixin3 = efl_class_new(&class_desc_mixin3, klass_mixin, NULL);
    fail_if(!klass_mixin3);
 
    TEST_EO_ERROR("_eo_class_mro_init", "Cannot create a consistent method resolution order for class '%s' because of '%s'.");
-   klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin, klass_mixin2, NULL);
+   klass = efl_class_new(&class_desc_simple, EO_CLASS, klass_mixin, klass_mixin2, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
-   klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin, NULL);
+   klass = efl_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin, NULL);
    fail_if(!klass);
 
-   klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin3, NULL);
+   klass = efl_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin3, NULL);
    fail_if(!klass);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -163,7 +163,7 @@ static void _stub_class_constructor(Efl_Class *klass EINA_UNUSED) {}
 
 START_TEST(eo_bad_interface)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_safety_print_cb, &ctx);
 
    const Efl_Class *klass;
@@ -171,39 +171,39 @@ START_TEST(eo_bad_interface)
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Interface",
-        EO_CLASS_TYPE_INTERFACE,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_INTERFACE,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         10,
         NULL,
         NULL
    };
 
-   TEST_EO_ERROR("eo_class_new", "safety check failed: !desc->data_size is false");
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   TEST_EO_ERROR("efl_class_new", "safety check failed: !desc->data_size is false");
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
    class_desc.data_size = 0;
    class_desc.class_constructor = _stub_class_constructor;
 
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(!klass);
 
    class_desc.class_constructor = NULL;
    class_desc.class_destructor = _stub_class_constructor;
 
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(!klass);
 
    class_desc.class_destructor = NULL;
 
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(!klass);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -212,19 +212,19 @@ void null_fct (void) {}
 
 START_TEST(eo_null_api)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    const Efl_Class *klass;
 
    static Efl_Op_Description op_descs[] = {
-        EO_OP_FUNC(NULL, _null_fct),
+        EFL_OBJECT_OP_FUNC(NULL, _null_fct),
    };
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_descs),
         NULL,
         0,
         NULL,
@@ -232,31 +232,31 @@ START_TEST(eo_null_api)
    };
 
    TEST_EO_ERROR("_eo_class_funcs_set", "Class '%s': NULL API not allowed (NULL->%p '%s').");
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_wrong_override)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    const Efl_Class *klass;
 
    static Efl_Op_Description op_descs[] = {
-        EO_OP_FUNC_OVERRIDE(null_fct, _null_fct),
+        EFL_OBJECT_OP_FUNC_OVERRIDE(null_fct, _null_fct),
    };
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_descs),
         NULL,
         0,
         NULL,
@@ -264,32 +264,32 @@ START_TEST(eo_wrong_override)
    };
 
    TEST_EO_ERROR("_eo_class_funcs_set", "Class '%s': Can't find api func description in class hierarchy (%p->%p) (%s).");
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_api_redefined)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    const Efl_Class *klass;
 
    static Efl_Op_Description op_descs[] = {
-        EO_OP_FUNC(null_fct, _null_fct),
-        EO_OP_FUNC(null_fct, NULL),
+        EFL_OBJECT_OP_FUNC(null_fct, _null_fct),
+        EFL_OBJECT_OP_FUNC(null_fct, NULL),
    };
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_descs),
         NULL,
         0,
         NULL,
@@ -297,32 +297,32 @@ START_TEST(eo_api_redefined)
    };
 
    TEST_EO_ERROR("_eo_class_funcs_set", "Class '%s': API previously defined (%p->%p '%s').");
-   klass = eo_class_new(&class_desc, NULL, NULL);
+   klass = efl_class_new(&class_desc, NULL, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_dich_func_override)
 {
-   eo_init();
+   efl_object_init();
    eina_log_print_cb_set(eo_test_print_cb, &ctx);
 
    const Efl_Class *klass;
 
    static Efl_Op_Description op_descs[] = {
-        EO_OP_FUNC_OVERRIDE(simple_a_set, _null_fct),
-        EO_OP_FUNC_OVERRIDE(simple_a_set, NULL),
+        EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _null_fct),
+        EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, NULL),
    };
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_descs),
         NULL,
         0,
         NULL,
@@ -330,13 +330,13 @@ START_TEST(eo_dich_func_override)
    };
 
    TEST_EO_ERROR("_vtable_func_set", "Class '%s': Overriding already set func %p for op %d (%s) with %p.");
-   klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
+   klass = efl_class_new(&class_desc, SIMPLE_CLASS, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index b4f715d752..0971f88966 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -17,7 +17,7 @@ static void
 _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
 {
    Simple_Public_Data *pd = class_data;
-   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
+   printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    pd->a = a;
 
    efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
@@ -35,7 +35,7 @@ static Eina_Bool
 _a_print(Eo *obj EINA_UNUSED, void *class_data)
 {
    const Simple_Public_Data *pd = class_data;
-   printf("Print %s %d\n", eo_class_name_get(MY_CLASS), pd->a);
+   printf("Print %s %d\n", efl_class_name_get(MY_CLASS), pd->a);
 
    return EINA_TRUE;
 }
@@ -43,21 +43,21 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data)
 static Eina_Bool
 _class_hi_print(Efl_Class *klass, void *data EINA_UNUSED)
 {
-   printf("Hi Print %s\n", eo_class_name_get(klass));
+   printf("Hi Print %s\n", efl_class_name_get(klass));
 
    return EINA_TRUE;
 }
 
-EO_FUNC_BODYV(simple_part_get, Eo *, NULL, EO_FUNC_CALL(name), const char *name);
+EFL_FUNC_BODYV(simple_part_get, Eo *, NULL, EFL_FUNC_CALL(name), const char *name);
 
 static Eo *
 _part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED)
 {
    /* A normal part get will do something saner, we just create objects. */
-   return eo_add(SIMPLE_CLASS, obj);
+   return efl_add(SIMPLE_CLASS, obj);
 }
 
-EO_VOID_FUNC_BODYV(simple_recursive, EO_FUNC_CALL(n), int n);
+EFL_VOID_FUNC_BODYV(simple_recursive, EFL_FUNC_CALL(n), int n);
 
 static void
 _recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
@@ -76,41 +76,41 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
 static void
 _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Efl_Dbg_Info *root)
 {
-   efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
-   Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Test list");
-   EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8);
+   efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
+   Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, "Test list");
+   EFL_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8);
 }
 
-EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
-EO_FUNC_BODY(simple_a_get, int, 0);
-EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
-EO_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
-EO_VOID_FUNC_BODY(simple_pure_virtual);
-EO_VOID_FUNC_BODY(simple_no_implementation);
+EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
+EFL_FUNC_BODY(simple_a_get, int, 0);
+EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
+EFL_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
+EFL_VOID_FUNC_BODY(simple_pure_virtual);
+EFL_VOID_FUNC_BODY(simple_no_implementation);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_a_get, _a_get),
-     EO_OP_FUNC(simple_a_print, _a_print),
-     EO_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print),
-     EO_OP_FUNC(simple_recursive, _recursive),
-     EO_OP_FUNC(simple_part_get, _part_get),
-     EO_OP_FUNC(simple_pure_virtual, NULL),
-     EO_OP_FUNC_OVERRIDE(efl_dbg_info_get, _dbg_info_get),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
+     EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
+     EFL_OBJECT_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print),
+     EFL_OBJECT_OP_FUNC(simple_recursive, _recursive),
+     EFL_OBJECT_OP_FUNC(simple_part_get, _part_get),
+     EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_dbg_info_get, _dbg_info_get),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
 
 
 static int
@@ -119,46 +119,46 @@ _beef_get(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
    return 0xBEEF;
 }
 
-EO_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
+EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
 
 static Efl_Op_Description op_descs2[] = {
-     EO_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get),
+     EFL_OBJECT_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get),
 };
 
 static const Efl_Class_Description class_desc2 = {
      EO_VERSION,
      "Simple2",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs2),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs2),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(simple2_class_get, &class_desc2, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(simple2_class_get, &class_desc2, EO_CLASS, NULL)
 
 static Efl_Object*
 _interface_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const Efl_Object *klass)
 {
    if (klass == SEARCHABLE_CLASS) return obj;
 
-   return efl_provider_find(eo_super(obj, SEARCHABLE_CLASS), klass);
+   return efl_provider_find(efl_super(obj, SEARCHABLE_CLASS), klass);
 }
 
 static Efl_Op_Description op_descs_searchable[] = {
-     EO_OP_FUNC_OVERRIDE(efl_provider_find, _interface_get)
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_provider_find, _interface_get)
 };
 
 static const Efl_Class_Description class_desc_searchable = {
      EO_VERSION,
      "Searchable",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs_searchable),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs_searchable),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(searchable_class_get, &class_desc_searchable, EO_CLASS, NULL)
-\ No newline at end of file
+EFL_DEFINE_CLASS(searchable_class_get, &class_desc_searchable, EO_CLASS, NULL)
+\ No newline at end of file
diff --git a/src/tests/eo/suite/eo_test_class_singleton.c b/src/tests/eo/suite/eo_test_class_singleton.c
index 692e382075..b6ed50dca0 100644
--- a/src/tests/eo/suite/eo_test_class_singleton.c
+++ b/src/tests/eo/suite/eo_test_class_singleton.c
@@ -15,29 +15,29 @@ _singleton_efl_constructor(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED)
 {
    if (!singleton_obj)
      {
-        singleton_obj = eo_add(SIMPLE_CLASS, NULL);
+        singleton_obj = efl_add(SIMPLE_CLASS, NULL);
      }
    else
      {
-        eo_ref(singleton_obj);
+        efl_ref(singleton_obj);
      }
 
    return singleton_obj;
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _singleton_efl_constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _singleton_efl_constructor),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Singleton",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(singleton_class_get, &class_desc, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(singleton_class_get, &class_desc, EO_CLASS, NULL)
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 24705019fc..a8f4fd6702 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -15,36 +15,36 @@
 
 START_TEST(eo_simple)
 {
-   eo_init();
-   Eo *obj = eo_add(EO_CLASS, NULL);
+   efl_object_init();
+   Eo *obj = efl_add(EO_CLASS, NULL);
    fail_if(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
    efl_constructor(obj);
    efl_destructor(obj);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_singleton)
 {
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SINGLETON_CLASS, NULL);
+   Eo *obj = efl_add(SINGLETON_CLASS, NULL);
    fail_if(!obj);
 
-   Eo *obj2 = eo_add(SINGLETON_CLASS, NULL);
+   Eo *obj2 = efl_add(SINGLETON_CLASS, NULL);
    fail_if(!obj2);
 
    ck_assert_ptr_eq(obj, obj2);
 
-   eo_unref(obj);
-   eo_unref(obj2);
+   efl_unref(obj);
+   efl_unref(obj2);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -53,30 +53,30 @@ END_TEST
 static int
 _simple_obj_override_a_get(Eo *obj, void *class_data EINA_UNUSED)
 {
-   return OVERRIDE_A + simple_a_get(eo_super(obj, EFL_OBJECT_OVERRIDE_CLASS));
+   return OVERRIDE_A + simple_a_get(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS));
 }
 
 static void
 _simple_obj_override_a_double_set(Eo *obj, void *class_data EINA_UNUSED, int a)
 {
-   simple_a_set(eo_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a);
+   simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a);
 }
 
-START_TEST(eo_override_tests)
+START_TEST(efl_object_override_tests)
 {
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
 
    /* First get the value before the override to make sure it works and to
     * make sure we don't cache. */
    ck_assert_int_eq(simple_a_get(obj), 0);
 
-   EO_OVERRIDE_OPS_DEFINE(
+   EFL_OBJECT_OVERRIDE_OPS_DEFINE(
             overrides,
-            EO_OP_FUNC_OVERRIDE(simple_a_get, _simple_obj_override_a_get));
-   fail_if(!eo_override(obj, &overrides));
+            EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_get, _simple_obj_override_a_get));
+   fail_if(!efl_object_override(obj, &overrides));
 
    ck_assert_int_eq(simple_a_get(obj), OVERRIDE_A);
 
@@ -85,34 +85,34 @@ START_TEST(eo_override_tests)
    ck_assert_int_eq(simple_a_get(obj), OVERRIDE_A + OVERRIDE_A_SIMPLE);
 
    /* Override again. */
-   EO_OVERRIDE_OPS_DEFINE(
+   EFL_OBJECT_OVERRIDE_OPS_DEFINE(
             overrides2,
-            EO_OP_FUNC_OVERRIDE(simple_a_set, _simple_obj_override_a_double_set));
-   fail_if(!eo_override(obj, NULL));
-   fail_if(!eo_override(obj, &overrides2));
+            EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _simple_obj_override_a_double_set));
+   fail_if(!efl_object_override(obj, NULL));
+   fail_if(!efl_object_override(obj, &overrides2));
 
    simple_a_set(obj, OVERRIDE_A_SIMPLE);
    ck_assert_int_eq(simple_a_get(obj), OVERRIDE_A_SIMPLE * 2);
 
    /* Try overriding again - not allowed by policy */
-   fail_if(eo_override(obj, &overrides));
+   fail_if(efl_object_override(obj, &overrides));
    ck_assert_int_eq(simple_a_get(obj), OVERRIDE_A_SIMPLE * 2);
 
    /* Try introducing a new function */
-   EO_OVERRIDE_OPS_DEFINE(
+   EFL_OBJECT_OVERRIDE_OPS_DEFINE(
             overrides3,
-            EO_OP_FUNC(simple2_class_beef_get, _simple_obj_override_a_double_set));
-   fail_if(!eo_override(obj, NULL));
-   fail_if(eo_override(obj, &overrides3));
+            EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _simple_obj_override_a_double_set));
+   fail_if(!efl_object_override(obj, NULL));
+   fail_if(efl_object_override(obj, &overrides3));
 
    /* Test override reset */
-   fail_if(!eo_override(obj, NULL));
+   fail_if(!efl_object_override(obj, NULL));
    simple_a_set(obj, 42 * OVERRIDE_A_SIMPLE);
    ck_assert_int_eq(simple_a_get(obj), 42 * OVERRIDE_A_SIMPLE);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -166,7 +166,7 @@ _eo_signals_cb_added_deled(void *data, const Eo_Event *event)
            (callback_array->func != _eo_signals_cb_added_deled));
 }
 
-EO_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
 { EV_A_CHANGED, _eo_signals_a_changed_cb },
 { EV_A_CHANGED, _eo_signals_a_changed_cb2 },
 { EV_A_CHANGED, _eo_signals_a_changed_never },
@@ -174,9 +174,9 @@ EO_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
 
 START_TEST(eo_signals)
 {
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    Eina_Bool r;
 
    efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, &_eo_signals_callbacks);
@@ -203,9 +203,9 @@ START_TEST(eo_signals)
    r = efl_event_callback_array_add(obj, NULL, NULL);
    fail_if(r);
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
    /* Legacy support signals. */
      {
         const Efl_Event_Description *a_desc = efl_object_legacy_only_event_description_get("a,changed");
@@ -252,55 +252,55 @@ START_TEST(eo_signals)
         ck_assert_int_eq(_eo_signals_cb_flag, 0x8);
         fail_if(!r);
      }
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
-START_TEST(eo_data_fetch)
+START_TEST(efl_data_fetch)
 {
-   eo_init();
+   efl_object_init();
 
    /* Usually should be const, not const only for the test... */
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple2",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         10,
         NULL,
         NULL
    };
 
-   const Efl_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   const Efl_Class *klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
 #ifdef EO_DEBUG
-   fail_if(eo_data_scope_get(obj, SIMPLE_CLASS));
+   fail_if(efl_data_scope_get(obj, SIMPLE_CLASS));
 #endif
-   eo_unref(obj);
+   efl_unref(obj);
 
    class_desc.data_size = 0;
-   klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(eo_data_scope_get(obj, klass));
-   fail_if(!eo_data_scope_get(obj, EFL_OBJECT_CLASS));
-   eo_unref(obj);
+   fail_if(efl_data_scope_get(obj, klass));
+   fail_if(!efl_data_scope_get(obj, EFL_OBJECT_CLASS));
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
-START_TEST(eo_isa_tests)
+START_TEST(efl_isa_tests)
 {
-   eo_init();
+   efl_object_init();
 
    const Efl_Class *klass, *iface, *mixin;
 
@@ -309,15 +309,15 @@ START_TEST(eo_isa_tests)
         static Efl_Class_Description class_desc = {
              EO_VERSION,
              "Iface",
-             EO_CLASS_TYPE_INTERFACE,
-             EO_CLASS_DESCRIPTION_NOOPS(),
+             EFL_CLASS_TYPE_INTERFACE,
+             EFL_CLASS_DESCRIPTION_NOOPS(),
              NULL,
              0,
              NULL,
              NULL
         };
 
-        iface = eo_class_new(&class_desc, NULL, NULL);
+        iface = efl_class_new(&class_desc, NULL, NULL);
         fail_if(!iface);
      }
 
@@ -326,15 +326,15 @@ START_TEST(eo_isa_tests)
         static Efl_Class_Description class_desc = {
              EO_VERSION,
              "Mixin",
-             EO_CLASS_TYPE_MIXIN,
-             EO_CLASS_DESCRIPTION_NOOPS(),
+             EFL_CLASS_TYPE_MIXIN,
+             EFL_CLASS_DESCRIPTION_NOOPS(),
              NULL,
              0,
              NULL,
              NULL
         };
 
-        mixin = eo_class_new(&class_desc, NULL, NULL);
+        mixin = efl_class_new(&class_desc, NULL, NULL);
         fail_if(!mixin);
      }
 
@@ -343,50 +343,50 @@ START_TEST(eo_isa_tests)
         static Efl_Class_Description class_desc = {
              EO_VERSION,
              "Simple2",
-             EO_CLASS_TYPE_REGULAR,
-             EO_CLASS_DESCRIPTION_NOOPS(),
+             EFL_CLASS_TYPE_REGULAR,
+             EFL_CLASS_DESCRIPTION_NOOPS(),
              NULL,
              10,
              NULL,
              NULL
         };
 
-        klass = eo_class_new(&class_desc, EO_CLASS, iface, mixin, NULL);
+        klass = efl_class_new(&class_desc, EO_CLASS, iface, mixin, NULL);
         fail_if(!klass);
      }
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(eo_isa(obj, SIMPLE_CLASS));
-   fail_if(!eo_isa(obj, iface));
-   fail_if(!eo_isa(obj, mixin));
-   fail_if(!eo_isa(obj, klass));
-   fail_if(!eo_isa(obj, EO_CLASS));
-   eo_unref(obj);
-
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   fail_if(efl_isa(obj, SIMPLE_CLASS));
+   fail_if(!efl_isa(obj, iface));
+   fail_if(!efl_isa(obj, mixin));
+   fail_if(!efl_isa(obj, klass));
+   fail_if(!efl_isa(obj, EO_CLASS));
+   efl_unref(obj);
+
+   obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
-   fail_if(eo_isa(obj, klass));
-   fail_if(eo_isa(obj, iface));
-   fail_if(eo_isa(obj, mixin));
-   fail_if(!eo_isa(obj, SIMPLE_CLASS));
-   fail_if(!eo_isa(obj, EO_CLASS));
-   eo_unref(obj);
-
-   eo_shutdown();
+   fail_if(efl_isa(obj, klass));
+   fail_if(efl_isa(obj, iface));
+   fail_if(efl_isa(obj, mixin));
+   fail_if(!efl_isa(obj, SIMPLE_CLASS));
+   fail_if(!efl_isa(obj, EO_CLASS));
+   efl_unref(obj);
+
+   efl_object_shutdown();
 }
 END_TEST
 
 
 START_TEST(efl_composite_tests)
 {
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj2);
-   Eo *obj3 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj3 = efl_add(SIMPLE_CLASS, NULL);
    fail_if(!obj3);
 
    efl_composite_attach(obj, obj2);
@@ -404,9 +404,9 @@ START_TEST(efl_composite_tests)
    efl_del(obj3);
    fail_if(efl_composite_part_is(obj));
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -418,236 +418,236 @@ static Eo *
 _man_con(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
    if (_man_should_con)
-      eo_manual_free_set(obj, EINA_TRUE);
-   return efl_constructor(eo_super(obj, cur_klass));
+      efl_manual_free_set(obj, EINA_TRUE);
+   return efl_constructor(efl_super(obj, cur_klass));
 }
 
 static void
 _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, cur_klass));
+   efl_destructor(efl_super(obj, cur_klass));
    if (_man_should_des)
-      eo_manual_free_set(obj, EINA_FALSE);
+      efl_manual_free_set(obj, EINA_FALSE);
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_constructor, _man_con),
-     EO_OP_FUNC_OVERRIDE(efl_destructor, _man_des),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _man_con),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _man_des),
 };
 
 START_TEST(eo_man_free)
 {
-   eo_init();
+   efl_object_init();
 
    /* Usually should be const, not const only for the test... */
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple2",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(op_descs),
         NULL,
         10,
         NULL,
         NULL
    };
 
-   const Efl_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   const Efl_Class *klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
    cur_klass = klass;
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(eo_manual_free(obj));
-   eo_unref(obj);
+   fail_if(efl_manual_free(obj));
+   efl_unref(obj);
 
    _man_should_des = EINA_FALSE;
-   klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    cur_klass = klass;
    fail_if(!klass);
 
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(eo_manual_free(obj));
-   fail_if(eo_destructed_is(obj));
-   eo_unref(obj);
-   fail_if(!eo_destructed_is(obj));
-   fail_if(!eo_manual_free(obj));
+   fail_if(efl_manual_free(obj));
+   fail_if(efl_destructed_is(obj));
+   efl_unref(obj);
+   fail_if(!efl_destructed_is(obj));
+   fail_if(!efl_manual_free(obj));
 
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   eo_unref(obj);
-   fail_if(!eo_destructed_is(obj));
-   fail_if(!eo_manual_free(obj));
+   efl_unref(obj);
+   fail_if(!efl_destructed_is(obj));
+   fail_if(!efl_manual_free(obj));
 
    _man_should_con = EINA_FALSE;
-   klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    cur_klass = klass;
    fail_if(!klass);
 
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(eo_manual_free(obj));
-   eo_unref(obj);
+   fail_if(efl_manual_free(obj));
+   efl_unref(obj);
 
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   eo_manual_free_set(obj, EINA_TRUE);
-   eo_unref(obj);
-   eo_ref(obj);
-   eo_unref(obj);
-   eo_unref(obj);
-   fail_if(!eo_manual_free(obj));
-
-   obj = eo_add(klass, NULL);
+   efl_manual_free_set(obj, EINA_TRUE);
+   efl_unref(obj);
+   efl_ref(obj);
+   efl_unref(obj);
+   efl_unref(obj);
+   fail_if(!efl_manual_free(obj));
+
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   eo_manual_free_set(obj, EINA_TRUE);
-   eo_unref(obj);
-   eo_ref(obj);
-   eo_unref(obj);
-   eo_unref(obj);
-   eo_unref(obj);
-   eo_unref(obj);
-   fail_if(!eo_manual_free(obj));
-
-   eo_shutdown();
+   efl_manual_free_set(obj, EINA_TRUE);
+   efl_unref(obj);
+   efl_ref(obj);
+   efl_unref(obj);
+   efl_unref(obj);
+   efl_unref(obj);
+   efl_unref(obj);
+   fail_if(!efl_manual_free(obj));
+
+   efl_object_shutdown();
 }
 END_TEST
 
-START_TEST(eo_refs)
+START_TEST(efl_refs)
 {
-   eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj3 = eo_add(SIMPLE_CLASS, NULL);
+   efl_object_init();
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj3 = efl_add(SIMPLE_CLASS, NULL);
 
-   eo_xref(obj, obj2);
-   fail_if(eo_ref_get(obj) != 2);
-   eo_xref(obj, obj3);
-   fail_if(eo_ref_get(obj) != 3);
+   efl_xref(obj, obj2);
+   fail_if(efl_ref_get(obj) != 2);
+   efl_xref(obj, obj3);
+   fail_if(efl_ref_get(obj) != 3);
 
-   eo_xunref(obj, obj2);
-   fail_if(eo_ref_get(obj) != 2);
-   eo_xunref(obj, obj3);
-   fail_if(eo_ref_get(obj) != 1);
+   efl_xunref(obj, obj2);
+   fail_if(efl_ref_get(obj) != 2);
+   efl_xunref(obj, obj3);
+   fail_if(efl_ref_get(obj) != 1);
 
 #ifdef EO_DEBUG
-   eo_xunref(obj, obj3);
-   fail_if(eo_ref_get(obj) != 1);
+   efl_xunref(obj, obj3);
+   fail_if(efl_ref_get(obj) != 1);
 
-   eo_xref(obj, obj2);
-   fail_if(eo_ref_get(obj) != 2);
+   efl_xref(obj, obj2);
+   fail_if(efl_ref_get(obj) != 2);
 
-   eo_xunref(obj, obj3);
-   fail_if(eo_ref_get(obj) != 2);
+   efl_xunref(obj, obj3);
+   fail_if(efl_ref_get(obj) != 2);
 
-   eo_xunref(obj, obj2);
-   fail_if(eo_ref_get(obj) != 1);
+   efl_xunref(obj, obj2);
+   fail_if(efl_ref_get(obj) != 1);
 #endif
 
    /* Check we don't seg if there's an extra xref. */
-   eo_xref(obj, obj2);
-   eo_unref(obj);
+   efl_xref(obj, obj2);
+   efl_unref(obj);
 
-   eo_unref(obj);
-   eo_unref(obj2);
-   eo_unref(obj3);
+   efl_unref(obj);
+   efl_unref(obj2);
+   efl_unref(obj3);
 
    /* Check hierarchy */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj));
+   obj = efl_add(SIMPLE_CLASS, NULL);
+   obj2 = efl_ref(efl_add(SIMPLE_CLASS, obj));
 
    Eo *wref = NULL;
    efl_wref_add(obj2, &wref);
    fail_if(!wref);
 
-   eo_unref(obj2);
+   efl_unref(obj2);
 
    fail_if(!wref); /* Parent is still holding a reference. */
 
-   eo_unref(obj);
+   efl_unref(obj);
 
    fail_if(wref);
 
-   /* eo_add_ref and normal eo_add */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_add(SIMPLE_CLASS, obj);
-   obj3 = eo_add_ref(SIMPLE_CLASS, obj);
+   /* efl_add_ref and normal efl_add */
+   obj = efl_add(SIMPLE_CLASS, NULL);
+   obj2 = efl_add(SIMPLE_CLASS, obj);
+   obj3 = efl_add_ref(SIMPLE_CLASS, obj);
 
-   ck_assert_int_eq(eo_ref_get(obj), 1);
-   ck_assert_int_eq(eo_ref_get(obj2), 1);
-   ck_assert_int_eq(eo_ref_get(obj3), 2);
+   ck_assert_int_eq(efl_ref_get(obj), 1);
+   ck_assert_int_eq(efl_ref_get(obj2), 1);
+   ck_assert_int_eq(efl_ref_get(obj3), 2);
 
    /* Setting and removing parents. */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj));
-   obj3 = eo_ref(eo_add(SIMPLE_CLASS, NULL));
+   obj = efl_add(SIMPLE_CLASS, NULL);
+   obj2 = efl_ref(efl_add(SIMPLE_CLASS, obj));
+   obj3 = efl_ref(efl_add(SIMPLE_CLASS, NULL));
 
    efl_parent_set(obj2, obj3);
    efl_parent_set(obj3, obj);
-   ck_assert_int_eq(eo_ref_get(obj2), 2);
-   ck_assert_int_eq(eo_ref_get(obj3), 2);
+   ck_assert_int_eq(efl_ref_get(obj2), 2);
+   ck_assert_int_eq(efl_ref_get(obj3), 2);
 
    efl_parent_set(obj2, NULL);
    efl_parent_set(obj3, NULL);
-   ck_assert_int_eq(eo_ref_get(obj2), 1);
-   ck_assert_int_eq(eo_ref_get(obj3), 1);
+   ck_assert_int_eq(efl_ref_get(obj2), 1);
+   ck_assert_int_eq(efl_ref_get(obj3), 1);
 
    efl_parent_set(obj2, obj);
    efl_parent_set(obj3, obj);
-   ck_assert_int_eq(eo_ref_get(obj2), 1);
-   ck_assert_int_eq(eo_ref_get(obj3), 1);
+   ck_assert_int_eq(efl_ref_get(obj2), 1);
+   ck_assert_int_eq(efl_ref_get(obj3), 1);
 
    efl_del(obj);
    efl_del(obj2);
    efl_del(obj3);
 
    /* Just check it doesn't seg atm. */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   eo_ref(obj);
-   eo_unref(obj);
-   eo_unref(obj);
-
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_add(SIMPLE_CLASS, obj);
-   eo_unref(obj2);
-   eo_ref(obj2);
+   obj = efl_add(SIMPLE_CLASS, NULL);
+   efl_ref(obj);
+   efl_unref(obj);
+   efl_unref(obj);
+
+   obj = efl_add(SIMPLE_CLASS, NULL);
+   obj2 = efl_add(SIMPLE_CLASS, obj);
+   efl_unref(obj2);
+   efl_ref(obj2);
    efl_del(obj2);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
-START_TEST(eo_weak_reference)
+START_TEST(efl_weak_reference)
 {
-   eo_init();
+   efl_object_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
    Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL;
    efl_wref_add(obj, &wref);
    fail_if(!wref);
 
-   eo_unref(obj);
+   efl_unref(obj);
    fail_if(wref);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
    efl_wref_add(obj, &wref);
 
-   eo_ref(obj);
+   efl_ref(obj);
    fail_if(!wref);
 
-   eo_unref(obj);
+   efl_unref(obj);
    fail_if(!wref);
 
-   eo_unref(obj);
+   efl_unref(obj);
    fail_if(wref);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
 
    efl_wref_add(obj, &wref);
    efl_wref_del(obj, &wref);
@@ -685,20 +685,20 @@ START_TEST(eo_weak_reference)
    efl_wref_del(obj, &wref2);
    efl_wref_del(obj, &wref3);
 
-   eo_unref(obj);
-   eo_unref(obj2);
+   efl_unref(obj);
+   efl_unref(obj2);
 
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_generic_data)
 {
-   eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj3 = eo_add(SIMPLE_CLASS, NULL);
+   efl_object_init();
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj3 = efl_add(SIMPLE_CLASS, NULL);
    Eo *objtmp;
    void *data = NULL;
    Eina_Value *value;
@@ -747,10 +747,10 @@ START_TEST(eo_generic_data)
    fail_if(objtmp);
 
    efl_key_ref_set(obj, "test1", obj2);
-   fail_if(eo_ref_get(obj2) != 2);
+   fail_if(efl_ref_get(obj2) != 2);
 
    efl_key_ref_set(obj, "test2", obj3);
-   fail_if(eo_ref_get(obj3) != 2);
+   fail_if(efl_ref_get(obj3) != 2);
 
    objtmp = efl_key_ref_get(obj, "test1");
    fail_if(obj2 != objtmp);
@@ -762,7 +762,7 @@ START_TEST(eo_generic_data)
    fail_if(obj3 != objtmp);
 
    efl_key_ref_set(obj, "test2", NULL);
-   fail_if(eo_ref_get(obj3) != 1);
+   fail_if(efl_ref_get(obj3) != 1);
 
    objtmp = efl_key_ref_get(obj, "test2");
    fail_if(objtmp);
@@ -771,7 +771,7 @@ START_TEST(eo_generic_data)
    fail_if(obj2 != objtmp);
 
    efl_key_ref_set(obj, "test1", NULL);
-   fail_if(eo_ref_get(obj2) != 1);
+   fail_if(efl_ref_get(obj2) != 1);
 
    objtmp = efl_key_ref_get(obj, "test1");
    fail_if(objtmp);
@@ -790,8 +790,8 @@ START_TEST(eo_generic_data)
 
 
 
-   obj2 = eo_add(SIMPLE_CLASS, NULL);
-   obj3 = eo_add(SIMPLE_CLASS, NULL);
+   obj2 = efl_add(SIMPLE_CLASS, NULL);
+   obj3 = efl_add(SIMPLE_CLASS, NULL);
 
    efl_key_wref_set(obj, "test1", obj2);
    objtmp = efl_key_wref_get(obj, "test1");
@@ -802,10 +802,10 @@ START_TEST(eo_generic_data)
    fail_if(objtmp);
 
    efl_key_wref_set(obj, "test1", obj2);
-   fail_if(eo_ref_get(obj2) != 1);
+   fail_if(efl_ref_get(obj2) != 1);
 
    efl_key_wref_set(obj, "test2", obj3);
-   fail_if(eo_ref_get(obj3) != 1);
+   fail_if(efl_ref_get(obj3) != 1);
 
    objtmp = efl_key_wref_get(obj, "test1");
    fail_if(obj2 != objtmp);
@@ -817,7 +817,7 @@ START_TEST(eo_generic_data)
    fail_if(obj3 != objtmp);
 
    efl_key_wref_set(obj, "test2", NULL);
-   fail_if(eo_ref_get(obj3) != 1);
+   fail_if(efl_ref_get(obj3) != 1);
 
    objtmp = efl_key_wref_get(obj, "test2");
    fail_if(objtmp);
@@ -826,7 +826,7 @@ START_TEST(eo_generic_data)
    fail_if(obj2 != objtmp);
 
    efl_key_wref_set(obj, "test1", NULL);
-   fail_if(eo_ref_get(obj2) != 1);
+   fail_if(efl_ref_get(obj2) != 1);
 
    objtmp = efl_key_wref_get(obj, "test1");
    fail_if(objtmp);
@@ -858,11 +858,11 @@ START_TEST(eo_generic_data)
 
    efl_key_value_set(obj, "value1", NULL);
 
-   eo_unref(obj);
-   eo_unref(obj2);
-   eo_unref(obj3);
+   efl_unref(obj);
+   efl_unref(obj2);
+   efl_unref(obj3);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -871,11 +871,11 @@ START_TEST(eo_magic_checks)
 {
    char _buf[sizeof(long)]; /* Just enough to hold eina magic + a bit more. */
    char *buf = _buf;
-   eo_init();
+   efl_object_init();
 
    memset(_buf, 1, sizeof(_buf));
 
-   Eo *obj = eo_add(SIMPLE_CLASS, (Eo *) buf);
+   Eo *obj = efl_add(SIMPLE_CLASS, (Eo *) buf);
    fail_if(obj);
 
    while (1)
@@ -885,50 +885,50 @@ START_TEST(eo_magic_checks)
         Eo *wref = NULL;
         Eo *obj2 = NULL;
 
-        obj = eo_add((Efl_Class *) buf, NULL);
+        obj = efl_add((Efl_Class *) buf, NULL);
         fail_if(obj);
 
-        obj = eo_add(SIMPLE_CLASS, NULL);
+        obj = efl_add(SIMPLE_CLASS, NULL);
         fail_if(!obj);
 
         simple_a_set((Eo *) buf, ++i);
         a = simple_a_get((Eo *) buf);
         ck_assert_int_ne(i, a);
-        simple_a_set(eo_super((Eo *) buf, SIMPLE_CLASS), ++i);
-        a = simple_a_get(eo_super((Eo *) buf, SIMPLE_CLASS));
+        simple_a_set(efl_super((Eo *) buf, SIMPLE_CLASS), ++i);
+        a = simple_a_get(efl_super((Eo *) buf, SIMPLE_CLASS));
         ck_assert_int_ne(i, a);
-        simple_a_set(eo_super(obj, (const Efl_Class *) buf), ++i);
-        a = simple_a_get(eo_super(obj, (const Efl_Class *) buf));
+        simple_a_set(efl_super(obj, (const Efl_Class *) buf), ++i);
+        a = simple_a_get(efl_super(obj, (const Efl_Class *) buf));
         ck_assert_int_ne(i, a);
-        fail_if(eo_class_get((Eo *) buf));
-        fail_if(eo_class_name_get((Efl_Class*) buf));
-        fail_if(eo_class_get(obj) != SIMPLE_CLASS);
-        fail_if(eo_class_get(SIMPLE_CLASS) != EFL_CLASS_CLASS);
+        fail_if(efl_class_get((Eo *) buf));
+        fail_if(efl_class_name_get((Efl_Class*) buf));
+        fail_if(efl_class_get(obj) != SIMPLE_CLASS);
+        fail_if(efl_class_get(SIMPLE_CLASS) != EFL_CLASS_CLASS);
         simple_a_set((Efl_Class *) buf, 1);
-        simple_a_set(eo_super((Efl_Class *) buf, SIMPLE_CLASS), ++i);
-        simple_a_set(eo_super(SIMPLE_CLASS, (Efl_Class *) buf), ++i);
-        fail_if(eo_class_new(NULL, (Efl_Class *) buf), NULL);
+        simple_a_set(efl_super((Efl_Class *) buf, SIMPLE_CLASS), ++i);
+        simple_a_set(efl_super(SIMPLE_CLASS, (Efl_Class *) buf), ++i);
+        fail_if(efl_class_new(NULL, (Efl_Class *) buf), NULL);
 
-        eo_xref(obj, (Eo *) buf);
-        eo_xunref(obj, (Eo *) buf);
-        eo_xref((Eo *) buf, obj);
-        eo_xunref((Eo *) buf, obj);
+        efl_xref(obj, (Eo *) buf);
+        efl_xunref(obj, (Eo *) buf);
+        efl_xref((Eo *) buf, obj);
+        efl_xunref((Eo *) buf, obj);
 
-        eo_ref((Eo *) buf);
-        eo_unref((Eo *) buf);
+        efl_ref((Eo *) buf);
+        efl_unref((Eo *) buf);
         efl_del((Eo *) buf);
 
-        eo_isa((Eo *) buf, SIMPLE_CLASS);
-        eo_isa(obj, (Efl_Class *) buf);
+        efl_isa((Eo *) buf, SIMPLE_CLASS);
+        efl_isa(obj, (Efl_Class *) buf);
 
-        fail_if(0 != eo_ref_get((Eo *) buf));
+        fail_if(0 != efl_ref_get((Eo *) buf));
 
         efl_wref_add((Eo *) buf, &wref);
         parent = efl_parent_get((Eo *) buf);
         fail_if(wref);
         fail_if(parent);
 
-        fail_if(eo_data_scope_get((Eo *) buf, SIMPLE_CLASS));
+        fail_if(efl_data_scope_get((Eo *) buf, SIMPLE_CLASS));
 
         efl_composite_attach(obj, (Eo *) buf);
         efl_composite_detach(obj, (Eo *) buf);
@@ -937,16 +937,16 @@ START_TEST(eo_magic_checks)
         efl_event_callback_forwarder_add(obj, NULL, (Eo *) buf);
         efl_event_callback_forwarder_del(obj, NULL, (Eo *) buf);
 
-        eo_manual_free_set((Eo *) buf, EINA_TRUE);
-        eo_manual_free((Eo *) buf);
-        eo_destructed_is((Eo *) buf);
+        efl_manual_free_set((Eo *) buf, EINA_TRUE);
+        efl_manual_free((Eo *) buf);
+        efl_destructed_is((Eo *) buf);
 
         obj2 = NULL;
         efl_parent_set(obj, (Eo *) buf);
         obj2 = efl_parent_get(obj);
         fail_if(obj2 && (obj2 == (Eo *) buf));
 
-        eo_unref(obj);
+        efl_unref(obj);
 
         if (!buf)
            break;
@@ -954,7 +954,7 @@ START_TEST(eo_magic_checks)
            buf = NULL;
      }
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -976,34 +976,34 @@ _class_hi_print(Efl_Class *klass EINA_UNUSED, void *class_data EINA_UNUSED)
    return EINA_TRUE;
 }
 
-EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
-EO_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE);
+EFL_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
+EFL_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE);
 
 static Efl_Op_Description _multi_do_op_descs[] = {
-     EO_OP_FUNC(multi_a_print, _a_print),
-     EO_OP_FUNC(multi_class_hi_print, _class_hi_print),
+     EFL_OBJECT_OP_FUNC(multi_a_print, _a_print),
+     EFL_OBJECT_OP_FUNC(multi_class_hi_print, _class_hi_print),
 };
 
 START_TEST(eo_multiple_do)
 {
-   eo_init();
+   efl_object_init();
 
    /* Usually should be const, not const only for the test... */
    static Efl_Class_Description class_desc = {
         EO_VERSION,
         "Inherit",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(_multi_do_op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(_multi_do_op_descs),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   const Efl_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
+   const Efl_Class *klass = efl_class_new(&class_desc, SIMPLE_CLASS, NULL);
    fail_if(!klass);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
 
    Eina_Bool ca, cb, cc;
@@ -1020,92 +1020,92 @@ START_TEST(eo_multiple_do)
    cc = multi_class_hi_print(klass);
    fail_if(!(ca && cb && cc));
 
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
-START_TEST(eo_add_do_and_custom)
+START_TEST(efl_add_do_and_custom)
 {
    Simple_Public_Data *pd = NULL;
    Eo *obj = NULL;
-   eo_init();
+   efl_object_init();
 
-   obj = eo_add(SIMPLE_CLASS, NULL, efl_constructor(eo_self));
+   obj = efl_add(SIMPLE_CLASS, NULL, efl_constructor(efl_self));
    fail_if(!obj);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7));
+   obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_self, 7));
    fail_if(!obj);
-   pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   pd = efl_data_scope_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 7);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL, efl_constructor(eo_self), simple_a_set(eo_self, 7));
+   obj = efl_add(SIMPLE_CLASS, NULL, efl_constructor(efl_self), simple_a_set(efl_self, 7));
    fail_if(!obj);
-   pd = eo_data_scope_get(obj, SIMPLE_CLASS);
+   pd = efl_data_scope_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 7);
-   eo_unref(obj);
+   efl_unref(obj);
 
    Eina_Bool finalized;
-   obj = eo_add(SIMPLE_CLASS, NULL, finalized = efl_finalized_get(eo_self));
+   obj = efl_add(SIMPLE_CLASS, NULL, finalized = efl_finalized_get(efl_self));
    fail_if(finalized);
 
    finalized = efl_finalized_get(obj);
    fail_if(!finalized);
-   eo_unref(obj);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_pointers_indirection)
 {
 #ifdef HAVE_EO_ID
-   eo_init();
+   efl_object_init();
 
    static const Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   const Efl_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   const Efl_Class *klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
    /* Check simple id validity */
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(!eo_isa(obj, klass));
+   fail_if(!efl_isa(obj, klass));
    obj = (Eo *)((char *)(obj) + 1);
-   fail_if(eo_isa(obj, klass));
+   fail_if(efl_isa(obj, klass));
    obj = (Eo *)((char *)(obj) - 1);
-   fail_if(!eo_isa(obj, klass));
-   eo_unref(obj);
-   fail_if(eo_isa(obj, klass));
+   fail_if(!efl_isa(obj, klass));
+   efl_unref(obj);
+   fail_if(efl_isa(obj, klass));
 
    /* Check id invalidity after deletion */
-   Eo *obj1 = eo_add(klass, NULL);
+   Eo *obj1 = efl_add(klass, NULL);
    fail_if(!obj1);
-   eo_unref(obj1);
-   Eo *obj2 = eo_add(klass, NULL);
+   efl_unref(obj1);
+   Eo *obj2 = efl_add(klass, NULL);
    fail_if(!obj2);
-   fail_if(!eo_isa(obj2, klass));
-   fail_if(eo_isa(obj1, klass));
-   eo_unref(obj2);
+   fail_if(!efl_isa(obj2, klass));
+   fail_if(efl_isa(obj1, klass));
+   efl_unref(obj2);
 
    /* Check id sanity checks for "close enough" ids. */
-   obj1 = eo_add(klass, NULL);
+   obj1 = efl_add(klass, NULL);
    fail_if(!obj1);
    obj2 = (Eo *) (((Eo_Id) obj1) & ~MASK_OBJ_TAG);
-   fail_if(eo_class_get(obj2));
-   eo_unref(obj1);
+   fail_if(efl_class_get(obj2));
+   efl_unref(obj1);
 
 #define NB_OBJS 10000
    unsigned int obj_id;
@@ -1114,73 +1114,73 @@ START_TEST(eo_pointers_indirection)
    /* Creation of the objects */
    for ( obj_id = 0; obj_id < NB_OBJS; obj_id++)
      {
-        objs[obj_id] = eo_add(klass, NULL);
+        objs[obj_id] = efl_add(klass, NULL);
         if(!objs[obj_id])
           fail_if(!objs[obj_id]);
-        if(!eo_isa(objs[obj_id], klass))
-          fail_if(!eo_isa(objs[obj_id], klass));
+        if(!efl_isa(objs[obj_id], klass))
+          fail_if(!efl_isa(objs[obj_id], klass));
      }
    /* Deletion of a few objects */
    for ( obj_id = 0; obj_id < NB_OBJS; obj_id+=2000)
      {
-        eo_unref(objs[obj_id]);
-        if(eo_isa(objs[obj_id], klass))
-          fail_if(eo_isa(objs[obj_id], klass));
+        efl_unref(objs[obj_id]);
+        if(efl_isa(objs[obj_id], klass))
+          fail_if(efl_isa(objs[obj_id], klass));
      }
    /* Creation of the deleted objects */
    for ( obj_id = 0; obj_id < NB_OBJS; obj_id+=2000)
      {
-        objs[obj_id] = eo_add(klass, NULL);
+        objs[obj_id] = efl_add(klass, NULL);
         if(!objs[obj_id])
           fail_if(!objs[obj_id]);
-        if(!eo_isa(objs[obj_id], klass))
-          fail_if(!eo_isa(objs[obj_id], klass));
+        if(!efl_isa(objs[obj_id], klass))
+          fail_if(!efl_isa(objs[obj_id], klass));
      }
    /* Deletion of all the objects */
    for ( obj_id = 0; obj_id < NB_OBJS; obj_id++)
-      eo_unref(objs[obj_id]);
+      efl_unref(objs[obj_id]);
    /* Just be sure that we trigger an already freed error */
-   eo_unref(objs[0]);
+   efl_unref(objs[0]);
    free(objs);
 
-   eo_shutdown();
+   efl_object_shutdown();
 #endif
 }
 END_TEST
 
 
 static Eo *
-_eo_add_failures_finalize(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
+_efl_add_failures_finalize(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
 {
    return NULL;
 }
 
-static Efl_Op_Description _eo_add_failures_op_descs[] = {
-     EO_OP_FUNC_OVERRIDE(efl_finalize, _eo_add_failures_finalize),
+static Efl_Op_Description _efl_add_failures_op_descs[] = {
+     EFL_OBJECT_OP_FUNC_OVERRIDE(efl_finalize, _efl_add_failures_finalize),
 };
 
-START_TEST(eo_add_failures)
+START_TEST(efl_add_failures)
 {
-   eo_init();
+   efl_object_init();
 
    static const Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple2",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(_eo_add_failures_op_descs),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_OPS(_efl_add_failures_op_descs),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   const Efl_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   const Efl_Class *klass = efl_class_new(&class_desc, EO_CLASS, NULL);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
 
    fail_if(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -1192,60 +1192,60 @@ _del_intercept(Eo *obj)
 {
    intercepted = EINA_TRUE;
    efl_del_intercept_set(obj, NULL);
-   eo_unref(obj);
+   efl_unref(obj);
 }
 #endif
 
 START_TEST(efl_del_intercept)
 {
 #ifdef HAVE_EO_ID
-   eo_init();
+   efl_object_init();
 
    static const Efl_Class_Description class_desc = {
         EO_VERSION,
         "Simple",
-        EO_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_NOOPS(),
+        EFL_CLASS_TYPE_REGULAR,
+        EFL_CLASS_DESCRIPTION_NOOPS(),
         NULL,
         0,
         NULL,
         NULL
    };
 
-   const Efl_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
+   const Efl_Class *klass = efl_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
    /* Check unref interception */
    intercepted = EINA_FALSE;
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(!eo_isa(obj, klass));
+   fail_if(!efl_isa(obj, klass));
    efl_del_intercept_set(obj, _del_intercept);
-   eo_unref(obj);
+   efl_unref(obj);
    fail_if(!intercepted);
-   fail_if(eo_isa(obj, klass));
+   fail_if(efl_isa(obj, klass));
 
    /* Check del interception */
    intercepted = EINA_FALSE;
-   obj = eo_add(klass, NULL);
+   obj = efl_add(klass, NULL);
    fail_if(!obj);
-   fail_if(!eo_isa(obj, klass));
+   fail_if(!efl_isa(obj, klass));
    efl_del_intercept_set(obj, _del_intercept);
    efl_del(obj);
    fail_if(!intercepted);
-   fail_if(eo_isa(obj, klass));
+   fail_if(efl_isa(obj, klass));
 
-   eo_shutdown();
+   efl_object_shutdown();
 #endif
 }
 END_TEST
 
 START_TEST(efl_name)
 {
-   eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj3 = eo_add(SIMPLE_CLASS, NULL);
+   efl_object_init();
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
+   Eo *obj3 = efl_add(SIMPLE_CLASS, NULL);
    Eo *objtmp;
    const char *id;
 
@@ -1293,14 +1293,14 @@ START_TEST(efl_name)
 
    efl_del(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_comment)
 {
-   eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   efl_object_init();
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
    const char *comment;
 
    comment = efl_comment_get(obj);
@@ -1323,16 +1323,16 @@ START_TEST(eo_comment)
 
    efl_del(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
 START_TEST(eo_rec_interface)
 {
-   eo_init();
-   Eo *s = eo_add(SEARCHABLE_CLASS, NULL);
-   Eo *obj = eo_add(SIMPLE_CLASS, s);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, obj);
+   efl_object_init();
+   Eo *s = efl_add(SEARCHABLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, s);
+   Eo *obj2 = efl_add(SIMPLE_CLASS, obj);
    Eo *objtmp;
 
    objtmp = efl_provider_find(obj2, SEARCHABLE_CLASS);
@@ -1340,7 +1340,7 @@ START_TEST(eo_rec_interface)
 
    efl_del(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
@@ -1348,20 +1348,20 @@ void eo_test_general(TCase *tc)
 {
    tcase_add_test(tc, eo_simple);
    tcase_add_test(tc, eo_singleton);
-   tcase_add_test(tc, eo_override_tests);
+   tcase_add_test(tc, efl_object_override_tests);
    tcase_add_test(tc, eo_signals);
-   tcase_add_test(tc, eo_data_fetch);
-   tcase_add_test(tc, eo_isa_tests);
+   tcase_add_test(tc, efl_data_fetch);
+   tcase_add_test(tc, efl_isa_tests);
    tcase_add_test(tc, efl_composite_tests);
    tcase_add_test(tc, eo_man_free);
-   tcase_add_test(tc, eo_refs);
-   tcase_add_test(tc, eo_weak_reference);
+   tcase_add_test(tc, efl_refs);
+   tcase_add_test(tc, efl_weak_reference);
    tcase_add_test(tc, eo_generic_data);
    tcase_add_test(tc, eo_magic_checks);
    tcase_add_test(tc, eo_multiple_do);
-   tcase_add_test(tc, eo_add_do_and_custom);
+   tcase_add_test(tc, efl_add_do_and_custom);
    tcase_add_test(tc, eo_pointers_indirection);
-   tcase_add_test(tc, eo_add_failures);
+   tcase_add_test(tc, efl_add_failures);
    tcase_add_test(tc, efl_del_intercept);
    tcase_add_test(tc, efl_name);
    tcase_add_test(tc, eo_comment);
diff --git a/src/tests/eo/suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c
index ec123bf635..9bf0d9bada 100644
--- a/src/tests/eo/suite/eo_test_init.c
+++ b/src/tests/eo/suite/eo_test_init.c
@@ -9,10 +9,10 @@
 
 START_TEST(eo_test_simple)
 {
-   fail_if(!eo_init()); /* one init by test suite */
-   fail_if(!eo_init());
-   fail_if(!eo_shutdown());
-   fail_if(eo_shutdown());
+   fail_if(!efl_object_init()); /* one init by test suite */
+   fail_if(!efl_object_init());
+   fail_if(!efl_object_shutdown());
+   fail_if(efl_object_shutdown());
 }
 END_TEST
 
@@ -20,25 +20,25 @@ START_TEST(eo_test_init_shutdown)
 {
    Eo *obj;
 
-   fail_if(!eo_init());
-   ck_assert_str_eq("Efl_Object", eo_class_name_get(EFL_OBJECT_CLASS));
+   fail_if(!efl_object_init());
+   ck_assert_str_eq("Efl_Object", efl_class_name_get(EFL_OBJECT_CLASS));
 
    /* XXX-1: Essential for the next test to assign the wrong op. */
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   obj = efl_add(SIMPLE_CLASS, NULL);
    simple_a_set(obj, 1);
    ck_assert_int_eq(1, simple_a_get(obj));
 
    /* XXX-1: Essential for the next test to cache the op. */
    ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS));
-   eo_unref(obj);
-   fail_if(eo_shutdown());
+   efl_unref(obj);
+   fail_if(efl_object_shutdown());
 
-   fail_if(!eo_init());
-   ck_assert_str_eq("Efl_Object", eo_class_name_get(EFL_OBJECT_CLASS));
+   fail_if(!efl_object_init());
+   ck_assert_str_eq("Efl_Object", efl_class_name_get(EFL_OBJECT_CLASS));
 
    /* XXX-1: Verify that the op was not cached. */
    ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS));
-   fail_if(eo_shutdown());
+   fail_if(efl_object_shutdown());
 }
 END_TEST
 
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index ae83b0cad0..df840974cf 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -20,9 +20,9 @@ typedef struct
 #define THREAD_TEST_CLASS thread_test_class_get()
 const Efl_Class *thread_test_class_get(void);
 
-EO_FUNC_BODY(thread_test_v_get, int, 0);
-EO_VOID_FUNC_BODY(thread_test_try_swap_stack);
-EO_VOID_FUNC_BODYV(thread_test_constructor, EO_FUNC_CALL(v), int v);
+EFL_FUNC_BODY(thread_test_v_get, int, 0);
+EFL_VOID_FUNC_BODY(thread_test_try_swap_stack);
+EFL_VOID_FUNC_BODYV(thread_test_constructor, EFL_FUNC_CALL(v), int v);
 
 static int
 _v_get(Eo *obj EINA_UNUSED, void *class_data)
@@ -61,23 +61,23 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, int v)
 }
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(thread_test_constructor, _constructor),
-     EO_OP_FUNC(thread_test_v_get, _v_get),
-     EO_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
+     EFL_OBJECT_OP_FUNC(thread_test_constructor, _constructor),
+     EFL_OBJECT_OP_FUNC(thread_test_v_get, _v_get),
+     EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Thread Test",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      sizeof(Thread_Test_Public_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_CLASS, NULL)
+EFL_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_CLASS, NULL)
 
 static void *
 _thread_job(void *data, Eina_Thread t EINA_UNUSED)
@@ -94,14 +94,14 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED)
      fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0]));
    }
 
-   obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eo_self, v));
+   obj = efl_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(efl_self, v));
 
    thread_test_try_swap_stack(obj);
    v = thread_test_v_get(obj);
 
    fail_if(EINA_LOCK_SUCCEED != eina_spinlock_release(&locks[1]));
 
-   eo_unref(obj);
+   efl_unref(obj);
 
    return (void *) (uintptr_t) v;
 }
@@ -110,7 +110,7 @@ START_TEST(eo_threaded_calls_test)
 {
    Eina_Thread threads[2];
 
-   eo_init();
+   efl_object_init();
 
    fail_if(!eina_spinlock_new(&locks[0]));
    fail_if(!eina_spinlock_new(&locks[1]));
@@ -128,7 +128,7 @@ START_TEST(eo_threaded_calls_test)
    eina_barrier_free(&barrier);
    eina_barrier_free(&barrier0);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c
index 2649000610..7daaf60c47 100644
--- a/src/tests/eo/suite/eo_test_value.c
+++ b/src/tests/eo/suite/eo_test_value.c
@@ -11,22 +11,22 @@
 
 START_TEST(eo_value)
 {
-   eo_init();
+   efl_object_init();
    char *str, *str2;
 
    Eina_Value val2, eo_val;
    void *tmpp = NULL;
    Efl_Dbg_Info *eo_dbg_info;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
 
-   eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root");
+   eo_dbg_info = EFL_DBG_INFO_LIST_APPEND(NULL, "Root");
    efl_dbg_info_get(obj, eo_dbg_info);
    fail_if(!eo_dbg_info);
    ck_assert_str_eq(eo_dbg_info->name, "Root");
    str = eina_value_to_string(&eo_dbg_info->value);
    ck_assert_str_eq(str, "[[8]]");
 
-   eina_value_setup(&val2, EO_DBG_INFO_TYPE);
+   eina_value_setup(&val2, EFL_DBG_INFO_TYPE);
    eina_value_copy(&eo_dbg_info->value, &val2);
    str2 = eina_value_to_string(&val2);
    ck_assert_str_eq(str, str2);
@@ -42,10 +42,10 @@ START_TEST(eo_value)
 
    free(str);
    free(str2);
-   eo_dbg_info_free(eo_dbg_info);
-   eo_unref(obj);
+   efl_dbg_info_free(eo_dbg_info);
+   efl_unref(obj);
 
-   eo_shutdown();
+   efl_object_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index 4e8da95dec..9abcee92a8 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -1,15 +1,15 @@
 
 Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value);
 
-EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value);
+EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_a_set, Eina_Bool, EINA_TRUE, EFL_FUNC_CALL(value), int value);
 
 int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd);
 
-EOAPI EO_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100);
+EOAPI EFL_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100);
 
 void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd);
 
-EOAPI EO_VOID_FUNC_BODY(efl_canvas_object_simple_b_set);
+EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_simple_b_set);
 
 char * _class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d);
 
@@ -19,27 +19,27 @@ static char * __eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, ch
    return _class_simple_foo(obj, pd, a, b, c, d);
 }
 
-EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_foo, char *, NULL, EO_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d);
+EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_foo, char *, NULL, EFL_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d);
 
 int * _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x);
 
-EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_bar, int *, 0, EO_FUNC_CALL(x), int x);
+EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_bar, int *, 0, EFL_FUNC_CALL(x), int x);
 
 static const Efl_Op_Description _class_simple_op_desc[] = {
-     EO_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set),
-     EO_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get),
-     EO_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo),
+     EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set),
+     EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get),
+     EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo),
 };
 
 static const Efl_Class_Description _class_simple_class_desc = {
      EO_VERSION,
      "Class_Simple",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(_class_simple_op_desc),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(_class_simple_op_desc),
      NULL,
      sizeof(Evas_Simple_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL, NULL);
+EFL_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL, NULL);
diff --git a/src/tests/eolian/data/object_impl_add_ref.c b/src/tests/eolian/data/object_impl_add_ref.c
index 19d6e7f240..1e2aa21431 100644
--- a/src/tests/eolian/data/object_impl_add_ref.c
+++ b/src/tests/eolian/data/object_impl_add_ref.c
@@ -16,7 +16,7 @@ _object_impl_base_constructor(Eo *obj, Object_Impl_Data *pd)
 EOLIAN static void
 _object_impl_base_destructor(Eo *obj, Object_Impl_Data *pd)
 {
-   base_destructor(eo_super(obj, OBJECT_IMPL_CLASS));
+   base_destructor(efl_super(obj, OBJECT_IMPL_CLASS));
 
 }
 
diff --git a/src/tests/eolian/data/object_impl_ref.c b/src/tests/eolian/data/object_impl_ref.c
index acc5013bc1..454903c6ab 100644
--- a/src/tests/eolian/data/object_impl_ref.c
+++ b/src/tests/eolian/data/object_impl_ref.c
@@ -16,7 +16,7 @@ _object_impl_base_constructor(Eo *obj, Object_Impl_Data *pd)
 EOLIAN static void
 _object_impl_base_destructor(Eo *obj, Object_Impl_Data *pd)
 {
-   base_destructor(eo_super(obj, OBJECT_IMPL_CLASS));
+   base_destructor(efl_super(obj, OBJECT_IMPL_CLASS));
 
 }
 
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index 76098b3688..a26beea9d1 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -6,7 +6,7 @@ static void __eolian_override_b_set(Eo *obj EINA_UNUSED, Override_Data *pd, int
    c = pd->c;
 }
 
-EOAPI EO_VOID_FUNC_BODYV(override_b_set, EO_FUNC_CALL(idx, a, b, c), int idx, float a, char b, int c);
+EOAPI EFL_VOID_FUNC_BODYV(override_b_set, EFL_FUNC_CALL(idx, a, b, c), int idx, float a, char b, int c);
 
 static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED, int *a, char **str)
 {
@@ -14,28 +14,28 @@ static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UN
    if (str) *str = NULL;
 }
 
-EOAPI EO_VOID_FUNC_BODYV(override_bar, EO_FUNC_CALL(idx, a, str), int idx, int *a, char **str);
+EOAPI EFL_VOID_FUNC_BODYV(override_bar, EFL_FUNC_CALL(idx, a, str), int idx, int *a, char **str);
 
 static int __eolian_override_c_get(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED)
 {
    return 50;
 }
 
-EOAPI EO_FUNC_BODYV_CONST(override_c_get, int, 50, EO_FUNC_CALL(idx), int idx);
-EOAPI EO_VOID_FUNC_BODY(override_a_set);
+EOAPI EFL_FUNC_BODYV_CONST(override_c_get, int, 50, EFL_FUNC_CALL(idx), int idx);
+EOAPI EFL_VOID_FUNC_BODY(override_a_set);
 
 void _override_a_get(Eo *obj, Override_Data *pd);
 
-EOAPI EO_VOID_FUNC_BODY_CONST(override_a_get);
+EOAPI EFL_VOID_FUNC_BODY_CONST(override_a_get);
 
 void _override_b_get(Eo *obj, Override_Data *pd, int idx, float *a, char *b, int *c);
 
-EOAPI EO_VOID_FUNC_BODYV_CONST(override_b_get, EO_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c);
+EOAPI EFL_VOID_FUNC_BODYV_CONST(override_b_get, EFL_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c);
 
 void _override_c_set(Eo *obj, Override_Data *pd, int idx, int c);
 
-EOAPI EO_VOID_FUNC_BODYV(override_c_set, EO_FUNC_CALL(idx, c), int idx, int c);
-EOAPI EO_VOID_FUNC_BODY(override_foo);
+EOAPI EFL_VOID_FUNC_BODYV(override_c_set, EFL_FUNC_CALL(idx, c), int idx, int c);
+EOAPI EFL_VOID_FUNC_BODY(override_foo);
 
 void _override_base_constructor(Eo *obj, Override_Data *pd);
 
@@ -54,28 +54,28 @@ static void __eolian_override_base_z_set(Eo *obj EINA_UNUSED, Override_Data *pd
 
 
 static const Efl_Op_Description _override_op_desc[] = {
-     EO_OP_FUNC_OVERRIDE(base_constructor, _override_base_constructor),
-     EO_OP_FUNC_OVERRIDE(base_z_get, __eolian_override_base_z_get),
-     EO_OP_FUNC_OVERRIDE(base_z_set, __eolian_override_base_z_set),
-     EO_OP_FUNC(override_b_set, __eolian_override_b_set),
-     EO_OP_FUNC(override_bar, __eolian_override_bar),
-     EO_OP_FUNC(override_c_get, __eolian_override_c_get),
-     EO_OP_FUNC(override_a_set, NULL),
-     EO_OP_FUNC(override_a_get, _override_a_get),
-     EO_OP_FUNC(override_b_get, _override_b_get),
-     EO_OP_FUNC(override_c_set, _override_c_set),
-     EO_OP_FUNC(override_foo, NULL),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(base_constructor, _override_base_constructor),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(base_z_get, __eolian_override_base_z_get),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(base_z_set, __eolian_override_base_z_set),
+     EFL_OBJECT_OP_FUNC(override_b_set, __eolian_override_b_set),
+     EFL_OBJECT_OP_FUNC(override_bar, __eolian_override_bar),
+     EFL_OBJECT_OP_FUNC(override_c_get, __eolian_override_c_get),
+     EFL_OBJECT_OP_FUNC(override_a_set, NULL),
+     EFL_OBJECT_OP_FUNC(override_a_get, _override_a_get),
+     EFL_OBJECT_OP_FUNC(override_b_get, _override_b_get),
+     EFL_OBJECT_OP_FUNC(override_c_set, _override_c_set),
+     EFL_OBJECT_OP_FUNC(override_foo, NULL),
 };
 
 static const Efl_Class_Description _override_class_desc = {
      EO_VERSION,
      "Override",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(_override_op_desc),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(_override_op_desc),
      NULL,
      sizeof(Override_Data),
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);
-\ No newline at end of file
+EFL_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);
+\ No newline at end of file
diff --git a/src/tests/eolian_cxx/a.c b/src/tests/eolian_cxx/a.c
index 27552a7f30..4fa7af7849 100644
--- a/src/tests/eolian_cxx/a.c
+++ b/src/tests/eolian_cxx/a.c
@@ -16,7 +16,7 @@ typedef struct _A_Data A_Data;
 
 static Eo *_a_efl_object_constructor(Eo *obj EINA_UNUSED, A_Data *pd EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 #include "a.eo.c"
diff --git a/src/tests/eolian_cxx/b.c b/src/tests/eolian_cxx/b.c
index ca02340351..2ff548f70d 100644
--- a/src/tests/eolian_cxx/b.c
+++ b/src/tests/eolian_cxx/b.c
@@ -17,7 +17,7 @@ typedef struct _B_Data B_Data;
 
 static Eo *_b_efl_object_constructor(Eo *obj EINA_UNUSED, B_Data *pd EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 #include "b.eo.c"
diff --git a/src/tests/eolian_cxx/c.c b/src/tests/eolian_cxx/c.c
index b35a5a81e9..ccd7ceb713 100644
--- a/src/tests/eolian_cxx/c.c
+++ b/src/tests/eolian_cxx/c.c
@@ -17,7 +17,7 @@ typedef struct _C_Data C_Data;
 
 static Eo *_c_efl_object_constructor(Eo *obj EINA_UNUSED, C_Data *pd EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 #include "c.eo.c"
diff --git a/src/tests/eolian_cxx/d.c b/src/tests/eolian_cxx/d.c
index 89d1b7d6ee..bd1372b828 100644
--- a/src/tests/eolian_cxx/d.c
+++ b/src/tests/eolian_cxx/d.c
@@ -19,7 +19,7 @@ typedef struct _D_Data D_Data;
 
 static Eo *_d_efl_object_constructor(Eo *obj EINA_UNUSED, D_Data *pd EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 #include "d.eo.c"
diff --git a/src/tests/eolian_cxx/generic.c b/src/tests/eolian_cxx/generic.c
index d8806c4745..d7483b33bd 100644
--- a/src/tests/eolian_cxx/generic.c
+++ b/src/tests/eolian_cxx/generic.c
@@ -27,7 +27,7 @@ static Eo *_generic_efl_object_constructor(Eo *obj, Generic_Data *pd)
 {
    pd->req_ctor_a_val = 0;
    pd->opt_ctor_a_val = 0;
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static void _generic_required_ctor_a(Eo *obj EINA_UNUSED, Generic_Data *pd, int value)
diff --git a/src/tests/eolian_cxx/simple.c b/src/tests/eolian_cxx/simple.c
index 6db029864d..718e5c3549 100644
--- a/src/tests/eolian_cxx/simple.c
+++ b/src/tests/eolian_cxx/simple.c
@@ -13,7 +13,7 @@
 
 static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
 {
-   return efl_constructor(eo_super(obj, MY_CLASS));
+   return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _simple_simple_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
diff --git a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
index 78b2852b33..62cac07ec7 100644
--- a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
@@ -23,7 +23,7 @@ EOLIAN static Efl_Object *
 _constructor_method_class_efl_object_constructor(Eo* obj EINA_UNUSED, Constructor_Method_Class_Data *pd)
 {
   pd->fail = EINA_FALSE;
-  return efl_constructor(eo_super(obj, MY_CLASS));
+  return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -50,7 +50,7 @@ _constructor_method_class_efl_object_finalize(Eo *obj, Constructor_Method_Class_
   if (pd->fail)
     return NULL;
 
-  return efl_finalize(eo_super(obj, MY_CLASS));
+  return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -132,7 +132,7 @@ _constructor_method_class_classoutmethod1(Eo* obj EINA_UNUSED, Constructor_Metho
 {
   fprintf(stderr, "classoutmethod1\n");
   fflush(stderr);
-  return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eo_self, one), constructor_method_class_constructor2(eo_self, two));
+  return efl_add(MY_CLASS, NULL, constructor_method_class_constructor1(efl_self, one), constructor_method_class_constructor2(efl_self, two));
 }
 
 EOLIAN static void
@@ -140,7 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho
 {
   fprintf(stderr, "classoutmethod2\n");
   fflush(stderr);
-  *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eo_self, one), constructor_method_class_constructor2(eo_self, two));
+  *out_class = efl_add(MY_CLASS, NULL, constructor_method_class_constructor1(efl_self, one), constructor_method_class_constructor2(efl_self, two));
 }
 
 
diff --git a/src/tests/eolian_js/eolian_js_test_test_object_impl.c b/src/tests/eolian_js/eolian_js_test_test_object_impl.c
index 189442974d..af4acbfee4 100644
--- a/src/tests/eolian_js/eolian_js_test_test_object_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_test_object_impl.c
@@ -30,7 +30,7 @@ _test_object_efl_object_constructor(Eo* obj, Test_Object_Data *pd)
   fflush(stdout);
 
   pd->a = 0;
-  return efl_constructor(eo_super(obj, MY_CLASS));
+  return efl_constructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eo *
@@ -39,7 +39,7 @@ _test_object_efl_object_finalize(Eo *obj, Test_Object_Data *pd EINA_UNUSED)
   fprintf(stdout, "_test_object_efl_object_finalize\n");
   fflush(stdout);
 
-  return efl_finalize(eo_super(obj, MY_CLASS));
+  return efl_finalize(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -47,7 +47,7 @@ _test_object_efl_object_destructor(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
 {
   fprintf(stdout, "_test_object_efl_object_destructor\n");
   fflush(stdout);
-  efl_destructor(eo_super(obj, MY_CLASS));
+  efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 970511095a..3d2f240680 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -645,7 +645,7 @@ START_TEST(evas_object_image_defaults)
    efl_del(o);
 
    /* test eo defaults */
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, e);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, e);
    fail_if(!efl_gfx_fill_auto_get(o));
    efl_del(o);
 
@@ -671,7 +671,7 @@ START_TEST(evas_object_image_map_unmap)
 
    const char *imgpath = TESTS_IMG_DIR "/Pic4.png";
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, e);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, e);
    efl_file_set(o, imgpath, NULL);
    efl_gfx_view_size_get(o, &w, &h);
    cs = efl_gfx_buffer_colorspace_get(o);
@@ -753,7 +753,7 @@ START_TEST(evas_object_image_map_unmap)
         uint32_t *data2, *orig;
         int x, y;
 
-        o2 = eo_add(EFL_CANVAS_IMAGE_CLASS, e);
+        o2 = efl_add(EFL_CANVAS_IMAGE_CLASS, e);
         efl_file_set(o2, tmp, NULL);
         efl_gfx_view_size_get(o, &w2, &h2);
 
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index 8715495ede..c19b697cd6 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -44,8 +44,8 @@
   EINA_ITERATOR_FOREACH(it, file)                                       \
     {                                                                   \
        int set_ok, save_ok;                                             \
-       mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, e);                      \
-       mesh2 = eo_add(EVAS_CANVAS3D_MESH_CLASS, e);                     \
+       mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, e);                      \
+       mesh2 = efl_add(EVAS_CANVAS3D_MESH_CLASS, e);                     \
        fail_if(mesh == NULL);                                           \
        fail_if(mesh2 == NULL);                                          \
        snprintf(buffer, PATH_MAX, "%s%s", tmp, ext);                    \
@@ -93,12 +93,12 @@ static int _compare_meshes(Evas_Canvas3D_Mesh *mesh1, Evas_Canvas3D_Mesh *mesh2)
    float *src1, *src2;
    Evas_Canvas3D_Vertex_Buffer *vb1, *vb2;
 
-   pd1 = eo_data_scope_get(mesh1, EVAS_CANVAS3D_MESH_CLASS);
+   pd1 = efl_data_scope_get(mesh1, EVAS_CANVAS3D_MESH_CLASS);
    f1 = return_zero_frame(pd1);
    if ((pd1 == NULL) || (f1 == NULL))
       return 1;
 
-   pd2 = eo_data_scope_get(mesh2, EVAS_CANVAS3D_MESH_CLASS);
+   pd2 = efl_data_scope_get(mesh2, EVAS_CANVAS3D_MESH_CLASS);
    f2 = return_zero_frame(pd2);
    if ((pd2 == NULL) || (f2 == NULL))
       return 1;
diff --git a/src/tests/evas/evas_test_object.c b/src/tests/evas/evas_test_object.c
index 6b722a5d88..9718c8dd64 100644
--- a/src/tests/evas/evas_test_object.c
+++ b/src/tests/evas/evas_test_object.c
@@ -20,9 +20,9 @@ START_TEST(evas_object_various)
    evas_object_unref(obj);
 
    evas = EVAS_TEST_INIT_EVAS();
-   eo_ref(obj);
+   efl_ref(obj);
    evas_free(evas);
-   eo_unref(obj);
+   efl_unref(obj);
 
 
    /* Twice because EVAS_TEST_INIT_EVAS inits it twice. */
author	Tom Hacohen <tom@stosb.com>	2016-08-15 14:44:41 +0100
committer	Tom Hacohen <tom@stosb.com>	2016-08-15 15:07:42 +0100
commit	e65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree	7ecaf136e45470635889191aded2b47057720a98
parent	35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
download	efl-e65aae994e72c1d3f8ac6b5360d3772f177b77ef.tar.gz