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),
+     EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
-     EO_OP_FUNC(simple_other_call, _other_call),
+     EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
 };
 static const Efl_Class_Description class_desc = {
     EO_VERSION,
     "Simple",
-     EO_CLASS_TYPE_REGULAR,
+     EFL_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_desc),
+     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_register(bench, "efl_add_linear",
-         EINA_BENCHMARK(bench_eo_add_linear), _EO_BENCH_TIMES(1000, 10, 50000));
+         EINA_BENCHMARK(bench_efl_add_linear), _EO_BENCH_TIMES(1000, 10, 50000));
-   eina_benchmark_register(bench, "eo_add_jump_by_2",
+   eina_benchmark_register(bench, "efl_add_jump_by_2",
-         EINA_BENCHMARK(bench_eo_add_jump_by_2), _EO_BENCH_TIMES(1000, 10, 50000));
+         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 *obj = efl_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_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);
+   efl_unref(obj);
-   eo_unref(obj2);
+   efl_unref(obj2);
 }
 static void
 bench_eo_do_two_objs_growing_stack(int request)
 {
   int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = efl_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_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);
+   efl_unref(obj);
-   eo_unref(obj2);
+   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,
+        EFL_CLASS_TYPE_REGULAR,
-        EO_CLASS_DESCRIPTION_OPS(op_desc),
+        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,
+   win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
-                efl_ui_win_name_set(eo_self, "glview"),
+                efl_ui_win_name_set(efl_self, "glview"),
-                efl_text_set(eo_self, "GLView"),
+                efl_text_set(efl_self, "GLView"),
-                efl_ui_win_accel_preference_set(eo_self, "gl:depth"));
+                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,
+   win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
-                efl_ui_win_name_set(eo_self, "grid"),
+                efl_ui_win_name_set(efl_self, "grid"),
-                efl_text_set(eo_self, "Grid"),
+                efl_text_set(efl_self, "Grid"),
-                efl_ui_win_autodel_set(eo_self, EINA_TRUE),
+                efl_ui_win_autodel_set(efl_self, EINA_TRUE),
-                efl_event_callback_add(eo_self, EFL_EVENT_DEL, _win_del, api));
+                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,
+        gd = efl_add(EFL_UI_GRID_STATIC_CLASS, win,
-                    efl_gfx_size_hint_weight_set(eo_self, 1, 1));
+                    efl_gfx_size_hint_weight_set(efl_self, 1, 1));
     }
   else
     {
-        gd = eo_add(EFL_UI_GRID_CLASS, win,
+        gd = efl_add(EFL_UI_GRID_CLASS, win,
-                    efl_gfx_size_hint_weight_set(eo_self, 1, 1),
+                    efl_gfx_size_hint_weight_set(efl_self, 1, 1),
-                    efl_pack_layout_engine_set(eo_self, EFL_UI_GRID_STATIC_CLASS, NULL));
+                    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,
+   EFL_OBJECT_OVERRIDE_OPS_DEFINE(custom_layout_ops,
-                          EO_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update));
+                          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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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_VERSION, "Custom Layout Engine", EFL_CLASS_TYPE_INTERFACE,
-   EO_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
+   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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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,
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
-               efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
+               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"
+                                       "#undef _EFL_OBJECT_API_BEFORE_HOOK\n#undef _EFL_OBJECT_API_AFTER_HOOK\n#undef _EFL_OBJECT_API_CALL_HOOK\n"
-                                       "#define _EO_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n"
+                                       "#define _EFL_OBJECT_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n"
-                                       "#define _EO_API_AFTER_HOOK _EINA_PROMISE_AFTER_HOOK(%s)\n"
+                                       "#define _EFL_OBJECT_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",
+                                       "#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"
+             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 _EO_API_BEFORE_HOOK\n#define _EO_API_AFTER_HOOK\n"
+                                       "#define _EFL_OBJECT_API_BEFORE_HOOK\n#define _EFL_OBJECT_API_AFTER_HOOK\n"
-                                       "#define _EO_API_CALL_HOOK(x) x\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));
+//   poller1 = efl_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(efl_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));
+//   poller2 = efl_add(ECORE_POLLER_CLASS, NULL, //         ecore_poller_constructor(efl_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));
+//   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);
+//   efl_unref(poller1);
-//   eo_unref(poller2);
+//   efl_unref(poller2);
-//   eo_unref(poller3);
+//   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->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_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);
+   efl_unref(priv->fileview);
-   eo_unref(priv->treeview);
+   efl_unref(priv->treeview);
-   eo_unref(priv->formview);
+   efl_unref(priv->formview);
-   eo_unref(priv->treemodel);
+   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);
+   efl_unref(priv->fileview);
-   eo_unref(priv->filemodel);
+   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.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_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.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.material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
-   globalGraphical.texture = eo_add(EVAS_CANVAS3D_TEXTURE_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->mesh_cube = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_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);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   material = efl_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));
+   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->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   data->material_ball = efl_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_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);
+   mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_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_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_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_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->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->mesh1 = eo_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->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
-   sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_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);