evas: Rename Evas.Object to Efl.Canvas.Object

One step closer to make the EO inheritance tree look like it's all Efl.
author: Jean-Philippe Andre <jp.andre@samsung.com> 2016-06-21 13:26:15 +0900
committer: Jean-Philippe Andre <jp.andre@samsung.com> 2016-06-21 14:35:19 +0900
commit: 7bf8da2baa243b972dd33d11ba873f6165e18fbf (patch)
tree: 91e8d9be8b6d16cd684178afbe081266fa1921fb /src
parent: 2f0b9edbb4b5e47d2d4a1380edc6ad1828134c41 (diff)
198 files changed, 1004 insertions, 1002 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3630e4eaec..b740914c4a 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2,7 +2,7 @@
 ### Library
 evas_eolian_pub_files = \
-        lib/evas/canvas/evas_object.eo \
+        lib/evas/canvas/efl_canvas_object.eo \
        lib/evas/canvas/efl_canvas_polygon.eo \
        lib/evas/canvas/efl_canvas_rectangle.eo \
        lib/evas/canvas/efl_canvas_text.eo \
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 6c9e6f69fe..a1ba77e9ac 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -126,15 +126,15 @@ _on_keydown(void        *data EINA_UNUSED,
        fprintf(stdout, "Toggling clipping ");
        Evas_Object *clip = NULL;
-        clip = evas_obj_clip_get(d.img);
+        clip = efl_canvas_object_clip_get(d.img);
        if (clip == d.clipper)
          {
-             evas_obj_clip_unset(d.img);
+             efl_canvas_object_clip_unset(d.img);
             fprintf(stdout, "off\n");
          }
        else
          {
-             evas_obj_clip_set(d.img, d.clipper);
+             efl_canvas_object_clip_set(d.img, d.clipper);
             fprintf(stdout, "on\n");
          }
        return;
@@ -239,7 +239,7 @@ main(void)
   efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2);
   efl_gfx_visible_set(d.clipper, EINA_TRUE);
-   evas_obj_clip_set(d.img, d.clipper);
+   efl_canvas_object_clip_set(d.img, d.clipper);
   fprintf(stdout, "%s", commands);
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 1657c3043f..018abdcb3c 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -59,7 +59,7 @@ _evas_object_associate_del(Evas_Object *obj)
 /* Interceptors Callbacks */
 static void
-_ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+_ecore_evas_object_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
   Ecore_Evas *ee = data;
   // FIXME: account for frame
@@ -68,33 +68,33 @@ _ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_
 }
 static void
-_ecore_evas_obj_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED)
+_ecore_evas_object_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   ecore_evas_raise(ee);
 }
 static void
-_ecore_evas_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
+_ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   ecore_evas_lower(ee);
 }
 static void
-_ecore_evas_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
+_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
 {
   INF("TODO: %s", __FUNCTION__);
 }
 static void
-_ecore_evas_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
+_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
 {
   INF("TODO: %s", __FUNCTION__);
 }
 static void
-_ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l)
+_ecore_evas_object_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l)
 {
   Ecore_Evas *ee = data;
   ecore_evas_layer_set(ee, l);
@@ -103,21 +103,21 @@ _ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, in
 /* Event Callbacks */
 static void
-_ecore_evas_obj_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_ecore_evas_object_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   ecore_evas_show(ee);
 }
 static void
-_ecore_evas_obj_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_ecore_evas_object_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   ecore_evas_hide(ee);
 }
 static void
-_ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+_ecore_evas_object_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   Evas_Coord ow, oh;
@@ -127,7 +127,7 @@ _ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *ob
 }
 static void
-_ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+_ecore_evas_object_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   Evas_Coord w, h;
@@ -142,7 +142,7 @@ _ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Eva
 }
 static void
-_ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+_ecore_evas_object_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   _ecore_evas_object_dissociate(ee, obj);
@@ -150,7 +150,7 @@ _ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
 }
 static void
-_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+_ecore_evas_object_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
   Ecore_Evas *ee = data;
   _ecore_evas_object_dissociate(ee, obj);
@@ -293,41 +293,41 @@ _ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object
 {
   evas_object_event_callback_add
     (obj, EVAS_CALLBACK_SHOW,
-      _ecore_evas_obj_callback_show, ee);
+      _ecore_evas_object_callback_show, ee);
   evas_object_event_callback_add
     (obj, EVAS_CALLBACK_HIDE,
-      _ecore_evas_obj_callback_hide, ee);
+      _ecore_evas_object_callback_hide, ee);
   evas_object_event_callback_add
     (obj, EVAS_CALLBACK_RESIZE,
-      _ecore_evas_obj_callback_resize, ee);
+      _ecore_evas_object_callback_resize, ee);
   evas_object_event_callback_add
     (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-      _ecore_evas_obj_callback_changed_size_hints, ee);
+      _ecore_evas_object_callback_changed_size_hints, ee);
   if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
     evas_object_event_callback_add
-       (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
+       (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee);
   else
     evas_object_event_callback_add
-       (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee);
+       (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee);
   evas_object_intercept_move_callback_add
-     (obj, _ecore_evas_obj_intercept_move, ee);
+     (obj, _ecore_evas_object_intercept_move, ee);
   if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_STACK)
     {
        evas_object_intercept_raise_callback_add
-          (obj, _ecore_evas_obj_intercept_raise, ee);
+          (obj, _ecore_evas_object_intercept_raise, ee);
        evas_object_intercept_lower_callback_add
-          (obj, _ecore_evas_obj_intercept_lower, ee);
+          (obj, _ecore_evas_object_intercept_lower, ee);
        evas_object_intercept_stack_above_callback_add
-          (obj, _ecore_evas_obj_intercept_stack_above, ee);
+          (obj, _ecore_evas_object_intercept_stack_above, ee);
        evas_object_intercept_stack_below_callback_add
-          (obj, _ecore_evas_obj_intercept_stack_below, ee);
+          (obj, _ecore_evas_object_intercept_stack_below, ee);
     }
   if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_LAYER)
     evas_object_intercept_layer_set_callback_add
-       (obj, _ecore_evas_obj_intercept_layer_set, ee);
+       (obj, _ecore_evas_object_intercept_layer_set, ee);
   if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
     {
@@ -346,35 +346,35 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
 {
   evas_object_event_callback_del_full
     (obj, EVAS_CALLBACK_SHOW,
-      _ecore_evas_obj_callback_show, ee);
+      _ecore_evas_object_callback_show, ee);
   evas_object_event_callback_del_full
     (obj, EVAS_CALLBACK_HIDE,
-      _ecore_evas_obj_callback_hide, ee);
+      _ecore_evas_object_callback_hide, ee);
   evas_object_event_callback_del_full
     (obj, EVAS_CALLBACK_RESIZE,
-      _ecore_evas_obj_callback_resize, ee);
+      _ecore_evas_object_callback_resize, ee);
   evas_object_event_callback_del_full
     (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-      _ecore_evas_obj_callback_changed_size_hints, ee);
+      _ecore_evas_object_callback_changed_size_hints, ee);
   evas_object_event_callback_del_full
-     (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee);
+     (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee);
   evas_object_event_callback_del_full
-     (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee);
+     (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee);
   evas_object_intercept_move_callback_del
-     (obj, _ecore_evas_obj_intercept_move);
+     (obj, _ecore_evas_object_intercept_move);
   evas_object_intercept_raise_callback_del
-     (obj, _ecore_evas_obj_intercept_raise);
+     (obj, _ecore_evas_object_intercept_raise);
   evas_object_intercept_lower_callback_del
-     (obj, _ecore_evas_obj_intercept_lower);
+     (obj, _ecore_evas_object_intercept_lower);
   evas_object_intercept_stack_above_callback_del
-     (obj, _ecore_evas_obj_intercept_stack_above);
+     (obj, _ecore_evas_object_intercept_stack_above);
   evas_object_intercept_stack_below_callback_del
-     (obj, _ecore_evas_obj_intercept_stack_below);
+     (obj, _ecore_evas_object_intercept_stack_below);
   evas_object_intercept_layer_set_callback_del
-     (obj, _ecore_evas_obj_intercept_layer_set);
+     (obj, _ecore_evas_object_intercept_layer_set);
   if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
   {
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 89393b3ab0..64ed2d6164 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -492,7 +492,7 @@ EAPI Eina_Bool edje_object_part_table_col_row_size_get(const Edje_Object *obj, c
 * @param[in] col The column of the child to get
 * @param[in] row The row of the child to get
 *
- * @return The child Evas.Object
+ * @return The child Efl.Canvas.Object
 *
 * @ingroup Edje_Object
 */
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 436825512e..7c0e98a479 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1494,7 +1494,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
             double s = base_s;
             if (ep->part->scale) base_s = TO_DOUBLE(sc);
-             evas_obj_scale_set(ep->object, base_s);
+             efl_canvas_object_scale_set(ep->object, base_s);
             efl_canvas_text_size_native_get(ep->object, &tw, &th);
             orig_s = base_s;
@@ -1503,7 +1503,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
             {
                orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
                                                                               orig_s * TO_INT(params->eval.w) / tw);
-                evas_obj_scale_set(ep->object, orig_s);
+                efl_canvas_object_scale_set(ep->object, orig_s);
                efl_canvas_text_size_native_get(ep->object, &tw, &th);
             }
             if (chosen_desc->text.fit_x)
@@ -1512,7 +1512,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                    {
                       s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
                                                                                 orig_s * TO_INT(params->eval.w) / tw);
-                       evas_obj_scale_set(ep->object, s);
+                       efl_canvas_object_scale_set(ep->object, s);
                       efl_canvas_text_size_native_get(ep->object, NULL, NULL);
                    }
               }
@@ -1529,7 +1529,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                            s = tmp_s;
                         }
-                       evas_obj_scale_set(ep->object, s);
+                       efl_canvas_object_scale_set(ep->object, s);
                       efl_canvas_text_size_native_get(ep->object, NULL, NULL);
                    }
               }
@@ -1554,7 +1554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                       break;
                     s = tmp_s;
-                     evas_obj_scale_set(ep->object, s);
+                     efl_canvas_object_scale_set(ep->object, s);
                     efl_canvas_text_size_native_get(ep->object, &fw, &fh);
                     i--;
                  }
@@ -5015,8 +5015,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
             else map_obj = mo;
             if (map_obj)
               {
-                  evas_obj_map_set(map_obj, map);
+                  efl_canvas_object_map_set(map_obj, map);
-                  evas_obj_map_enable_set(map_obj, EINA_TRUE);
+                  efl_canvas_object_map_enable_set(map_obj, EINA_TRUE);
               }
          }
        else
@@ -5027,8 +5027,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
               {
                  if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */
                    {
-                       evas_obj_map_enable_set(ep->nested_smart, EINA_FALSE);
+                       efl_canvas_object_map_enable_set(ep->nested_smart, EINA_FALSE);
-                       evas_obj_map_set(ep->nested_smart, NULL);
+                       efl_canvas_object_map_set(ep->nested_smart, NULL);
                    }
                  else
                    {
@@ -5038,8 +5038,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
 #endif
                            if (mo)
                              {
-                                 evas_obj_map_enable_set(mo, 0);
+                                 efl_canvas_object_map_enable_set(mo, 0);
-                                 evas_obj_map_set(mo, NULL);
+                                 efl_canvas_object_map_set(mo, NULL);
                              }
 #ifdef HAVE_EPHYSICS
                         }
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 7afd37dc88..9d7515cbbf 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -430,7 +430,7 @@ _edje_pending_timer_cb(void *data)
 }
 EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
-                          { EVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
+                          { EFL_CANVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
                          { EFL_EVENT_POINTER_IN, _edje_mouse_in_signal_cb },
                          { EFL_EVENT_POINTER_OUT, _edje_mouse_out_signal_cb },
                          { EFL_EVENT_POINTER_DOWN, _edje_mouse_down_signal_cb },
@@ -439,8 +439,8 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
                          { EFL_EVENT_POINTER_WHEEL, _edje_mouse_wheel_signal_cb });
 EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
-                          { EVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
+                          { EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
-                          { EVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb });
+                          { EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb });
 void
 _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 0c1605e226..95c507f7d4 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -892,7 +892,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                         }
                       if (ep->no_render)
-                         evas_obj_no_render_set(rp->object, 1);
+                         efl_canvas_object_no_render_set(rp->object, 1);
                       if (st_nested && st_nested->nested_children_count) /* Add this to list of children */
                         {
@@ -945,8 +945,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                                 evas_object_pass_events_set(rp->object, 1);
                                 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
                              }
-                            evas_obj_anti_alias_set(rp->object, ep->anti_alias);
+                            efl_canvas_object_anti_alias_set(rp->object, ep->anti_alias);
-                            evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside);
+                            efl_canvas_object_precise_is_inside_set(rp->object, ep->precise_is_inside);
                         }
                       if (rp->part->clip_to_id < 0)
                         evas_object_clip_set(rp->object, ed->base->clipper);
diff --git a/src/lib/edje/edje_lua2.c b/src/lib/edje/edje_lua2.c
index e64b989b56..1e824ecfd5 100644
--- a/src/lib/edje/edje_lua2.c
+++ b/src/lib/edje/edje_lua2.c
@@ -1516,7 +1516,7 @@ _elua_text_class(lua_State *L) // Stack usage [-(6|8), +(7|9), emv]
 //-------------
 static void
-_elua_evas_obj_free(void *obj)
+_elua_efl_canvas_object_free(void *obj)
 {
   Edje_Lua_Evas_Object *elo = obj;
@@ -1559,7 +1559,7 @@ _elua_polish_evas_object(Edje *ed, Edje_Lua_Evas_Object *elo)
 static int
 _elua_edje(lua_State *L) // Stack usage [-7, +8, em]
 {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_efl_canvas_object_free)
   // Stack usage [-7, +8, em]
   elo->evas_obj = edje_object_add(evas_object_evas_get(ed->obj));
   _edje_subobj_register(ed, elo->evas_obj);
@@ -1582,7 +1582,7 @@ _elua_edje(lua_State *L) // Stack usage [-7, +8, em]
 static int
 _elua_image(lua_State *L) // Stack usage [-7, +8, em]
 {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_efl_canvas_object_free)
   // Stack usage [-7, +8, em]
   elo->evas_obj = evas_object_image_filled_add(evas_object_evas_get(ed->obj));
   _elua_polish_evas_object(ed, elo);
@@ -1604,7 +1604,7 @@ _elua_image(lua_State *L) // Stack usage [-7, +8, em]
 static int
 _elua_line(lua_State *L) // Stack usage [-7, +8, em]
 {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_efl_canvas_object_free)
   // Stack usage [-7, +8, em]
   elo->evas_obj = evas_object_line_add(evas_object_evas_get(ed->obj));
   _elua_polish_evas_object(ed, elo);
@@ -1656,7 +1656,7 @@ _elua_map(lua_State *L) // Stack usage [-7, +8, emv]
 static int
 _elua_polygon(lua_State *L) // Stack usage [-7, +8, em]
 {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_efl_canvas_object_free)
   // Stack usage [-7, +8, em]
   elo->evas_obj = evas_object_polygon_add(evas_object_evas_get(ed->obj));
   _elua_polish_evas_object(ed, elo);
@@ -1676,7 +1676,7 @@ _elua_polygon(lua_State *L) // Stack usage [-7, +8, em]
 static int
 _elua_rect(lua_State *L) // Stack usage [-7, +8, em]
 {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_efl_canvas_object_free)
   // Stack usage [-7, +8, em]
   elo->evas_obj = evas_object_rectangle_add(evas_object_evas_get(ed->obj));
   _elua_polish_evas_object(ed, elo);
@@ -1698,7 +1698,7 @@ _elua_rect(lua_State *L) // Stack usage [-7, +8, em]
 static int
 _elua_text(lua_State *L) // Stack usage [-7, +8, em]
 {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_efl_canvas_object_free)
   // Stack usage [-7, +8, em]
   elo->evas_obj = evas_object_text_add(evas_object_evas_get(ed->obj));
   _elua_polish_evas_object(ed, elo);
@@ -1708,7 +1708,7 @@ _elua_text(lua_State *L) // Stack usage [-7, +8, em]
 /* XXX: disabled until there are enough textblock functions implemented to make it actually useful
   _elua_textblock(lua_State *L)                               // Stack usage [-7, +8, em]
   {
-   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_evas_obj_free)
+   _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_efl_canvas_object_free)
                                                            // Stack usage [-7, +8, em]
   elo->evas_obj = evas_object_textblock_add(evas_object_evas_get(ed->obj));
   _elua_polish_evas_object(ed, elo);
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index fb2c1f4b70..8da6cb2c3d 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -898,7 +898,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
           Note: Almost all swallow rules apply: you should not move, resize,
           hide, show, set the color or clipper of such part. It's a bit
           more restrictive as one must  never delete this object!]]
-         return: Evas.Object; [[The externally created object, or $null if there is none or
+         return: Efl.Canvas.Object; [[The externally created object, or $null if there is none or
                                  part is not an external.]]
         params {
            @in part: string; [[The part name]]
@@ -915,7 +915,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
            content: string; [[A string identifying which content from the EXTERNAL to get]]
         }
         values {
-            v: Evas.Object;
+            v: Efl.Canvas.Object;
         }
      }
      preload {
@@ -1113,7 +1113,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
           Note: If the type of Edje part is GROUP, SWALLOW or EXTERNAL,
           returned handle by this function will indicate nothing or transparent
           rectangle for events. Use $.part_swallow_get() in that case.]]
-         return: const(Evas.Object); [[A pointer to the Evas object implementing the given part,
+         return: const(Efl.Canvas.Object); [[A pointer to the Evas object implementing the given part,
                                        or $null on failure (e.g. the given part doesn't exist)]]
         params {
            @in part: string; [[The Edje part's name]]
@@ -1999,7 +1999,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
      Eo.Base.constructor;
      Eo.Base.destructor;
      Eo.Base.dbg_info_get;
-      Evas.Object.paragraph_direction.set;
+      Efl.Canvas.Object.paragraph_direction.set;
      Efl.Canvas.Group.group_hide;
      Efl.Canvas.Group.group_show;
      Efl.Canvas.Group.group_move;
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 5b6898a9ff..e8e17e5fd0 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -39,7 +39,7 @@
 # include <Evil.h>
 #endif
-#define EVAS_OBJECT_PROTECTED
+#define EFL_CANVAS_OBJECT_PROTECTED
 #include <Eina.h>
 #include <Eet.h>
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 72b9dd078e..8e6c02da95 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -35,7 +35,7 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
   ed->duration_scale = 1.0;
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   _edje_lib_ref();
   parent = eo_parent_get(obj);
@@ -343,7 +343,7 @@ _edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool h
   Edje *edg;
   efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide);
-   if (evas_obj_no_render_get(obj) == hide) return;
+   if (efl_canvas_object_no_render_get(obj) == hide) return;
   EINA_LIST_FOREACH(ed->groups, l, edg)
     if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide);
@@ -467,9 +467,9 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro
 }
 EOLIAN static void
-_edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
+_edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
 {
-   evas_obj_paragraph_direction_set(eo_super(obj, MY_CLASS), dir);
+   efl_canvas_object_paragraph_direction_set(eo_super(obj, MY_CLASS), dir);
   /* Make it dirty to recalculate edje.
      It needs to move text objects according to new paragraph direction */
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index a27842d0ef..46ebbde93e 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -331,7 +331,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
        if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
        else efl_text_properties_font_source_set(ep->object, NULL);
-        if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+        if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
        efl_text_properties_font_set(ep->object, font, size);
        efl_text_set(ep->object, text);
@@ -345,7 +345,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
             if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
             else efl_text_properties_font_source_set(ep->object, NULL);
-             if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+             if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
             efl_text_properties_font_set(ep->object, font, size);
@@ -367,7 +367,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
           if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
           else efl_text_properties_font_source_set(ep->object, NULL);
-           if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+           if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
           efl_text_properties_font_set(ep->object, font, size);
           efl_text_set(ep->object, text);
@@ -390,7 +390,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
                  if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
                  else efl_text_properties_font_source_set(ep->object, NULL);
-                  if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+                  if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
                  efl_text_properties_font_set(ep->object, font, size);
                  part_get_geometry(ep, &tw, &th);
@@ -402,7 +402,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
          {
             int current;
-             if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+             if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
             efl_text_properties_font_set(ep->object, font, 10);
             part_get_geometry(ep, &tw, &th);
@@ -424,7 +424,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
                    {
                       current = (top + bottom) / 2;
-                       if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+                       if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
                       efl_text_properties_font_set(ep->object, font, current);
                       part_get_geometry(ep, &tw, &th);
@@ -440,7 +440,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
               {
                  current++;
-                  if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+                  if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
                  efl_text_properties_font_set(ep->object, font, current);
                  part_get_geometry(ep, &tw, &th);
@@ -506,7 +506,7 @@ arrange_text:
   if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
   else efl_text_properties_font_source_set(ep->object, NULL);
-   if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+   if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
   efl_text_properties_font_set(ep->object, font, size);
   efl_text_set(ep->object, text);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 07ec9dc432..caae67b060 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -6532,8 +6532,8 @@ _edje_real_part_swallow(Edje *ed,
   else
     evas_object_pass_events_set(obj_swallow, 1);
   _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp);
-   evas_obj_anti_alias_set(obj_swallow, rp->part->anti_alias);
+   efl_canvas_object_anti_alias_set(obj_swallow, rp->part->anti_alias);
-   evas_obj_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside);
+   efl_canvas_object_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside);
   ed->dirty = EINA_TRUE;
   ed->recalc_call = EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 6efefa294c..98b4daa6c3 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -254,7 +254,7 @@ _efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
 {
   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index b5cc123e5c..1c11d3d9e0 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1874,7 +1874,7 @@ _efl_ui_flip_eo_base_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 8f544c48a3..538c7fe4a9 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -292,7 +292,7 @@ EOLIAN static Eo *
 _efl_ui_grid_eo_base_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
   pd->dir1 = EFL_ORIENT_RIGHT;
diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c
index 08d29fc4fb..8069f01be3 100644
--- a/src/lib/elementary/efl_ui_grid_static.c
+++ b/src/lib/elementary/efl_ui_grid_static.c
@@ -9,7 +9,7 @@ _efl_ui_grid_static_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED)
   Efl_Ui_Grid_Data *gd;
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
   gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index bfb39495ca..6578c20c7f 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -877,7 +877,7 @@ EOLIAN static Eo *
 _efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index ccdcc226a3..ccd60c6769 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -35,7 +35,7 @@ EOLIAN static Eo_Base *
 _efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   //TODO: Add ATSPI call here
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 7473281a5c..617458a5b3 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4081,7 +4081,7 @@ EOLIAN static Eo *
 _efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index f5a0280d95..1a694bd836 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4279,7 +4279,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
   eo_parent_set(obj, ecore_evas_get(tmp_sd.ee));
   eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   if (getenv("ELM_FIRST_FRAME"))
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 946f7975cb..a2140edf7a 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -47,7 +47,7 @@ enum Efl.Ui.Win.Type
                    just like any other object would be, and do other things
                    like applying \@ref Evas_Map effects to it. This is the only
                    type of window that requires the parent parameter of
-                    \@ref elm_win_add to be a valid @Evas.Object.]]
+                    \@ref elm_win_add to be a valid @Efl.Canvas.Object.]]
   socket_image, [[The window is rendered onto an image buffer and can be shown
                   other process's plug image object. No actual window is
                   created for this type, instead the window and all of its
@@ -401,7 +401,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
            @endcode
            */
            values {
-               icon: Evas.Object @nullable; [[The Evas image object to use for an icon.]]
+               icon: Efl.Canvas.Object @nullable; [[The Evas image object to use for an icon.]]
            }
         }
         get {
@@ -411,7 +411,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
              the object to use for the window icon.
            ]]
            values {
-               icon: const(Evas.Object) @nullable; [[The Evas image object to use for an icon.]]
+               icon: const(Efl.Canvas.Object) @nullable; [[The Evas image object to use for an icon.]]
            }
         }
      }
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index f9e3d76d7c..fb26c19dec 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -415,7 +415,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
   sd->first_filter = EINA_TRUE;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index b7f2c6c18e..7d3a8b9f86 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1177,7 +1177,7 @@ EOLIAN static Eo *
 _elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 1944e9ac8a..68f5535713 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -2017,7 +2017,7 @@ _elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER);
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index ff18f2d15b..abf4cb3d91 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -275,7 +275,7 @@ _elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Da
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 970c5bcbe1..3d36e5ea20 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -389,7 +389,7 @@ EOLIAN static Eo *
 _elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index fc3b4ba249..4b6df50265 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -615,7 +615,7 @@ EOLIAN static Eo *
 _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 5932ca2824..9fed32ab87 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1702,7 +1702,7 @@ EOLIAN static Eo *
 _elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 7f53e7dbb4..dc867a7767 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1593,7 +1593,7 @@ _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index a4e9551ee2..e901acafc7 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -680,7 +680,7 @@ EOLIAN static Eo *
 _elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 7e2861f777..f5dfb03f1c 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1614,7 +1614,7 @@ EOLIAN static Eo *
 _elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index 0e84d6ecda..b9d17497cf 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -8,4 +8,4 @@
 */
 #define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
-#define EVAS_OBJECT_PROTECTED
+#define EFL_CANVAS_OBJECT_PROTECTED
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index a3ee86529d..dcae9481a3 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -1245,7 +1245,7 @@ EOLIAN static Eo *
 _elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   return obj;
 }
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 4301c5e417..face9848b4 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -540,7 +540,7 @@ EOLIAN static Eo *
 _elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
diff --git a/src/lib/elementary/elm_app_server_view.eo b/src/lib/elementary/elm_app_server_view.eo
index 52a1194fde..6aad03e108 100644
--- a/src/lib/elementary/elm_app_server_view.eo
+++ b/src/lib/elementary/elm_app_server_view.eo
@@ -44,7 +44,7 @@ class Elm.App.Server.View (Eo.Base)
         set {
         }
         values {
-            win: Evas.Object;
+            win: Efl.Canvas.Object;
         }
      }
      @property id {
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index 5b8e684119..a019102f55 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -123,7 +123,7 @@ _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
 {
   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED);
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   return obj;
 }
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index cbba1960b9..c6e635cb78 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -438,7 +438,7 @@ _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
 {
   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index c99ccade4e..96ad6051a5 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -139,7 +139,7 @@ class Elm.Box (Elm.Widget)
              You must free this list with eina_list_free() once you are done with it.
            ]]
-            return: free(own(list<Evas.Object>), eina_list_free) @warn_unused;
+            return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
         }
      }
      pack_end {
@@ -160,7 +160,7 @@ class Elm.Box (Elm.Widget)
         ]]
         params {
-            @in subobj: Evas.Object; [[The object to add to the box]]
+            @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
         }
      }
      unpack_all {
@@ -188,7 +188,7 @@ class Elm.Box (Elm.Widget)
         ]]
         params {
-            @in subobj: Evas.Object; [[The object to unpack]]
+            @in subobj: Efl.Canvas.Object; [[The object to unpack]]
         }
      }
      pack_after {
@@ -209,8 +209,8 @@ class Elm.Box (Elm.Widget)
         ]]
         params {
-            @in subobj: Evas.Object; [[The object to add to the box]]
+            @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
-            @in after: Evas.Object; [[The object after which to add it]]
+            @in after: Efl.Canvas.Object; [[The object after which to add it]]
         }
      }
      pack_start {
@@ -232,7 +232,7 @@ class Elm.Box (Elm.Widget)
         ]]
         params {
-            @in subobj: Evas.Object; [[The object to add to the box]]
+            @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
         }
      }
      recalculate {
@@ -265,8 +265,8 @@ class Elm.Box (Elm.Widget)
         ]]
         params {
-            @in subobj: Evas.Object; [[The object to add to the box]]
+            @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
-            @in before: Evas.Object; [[The object before which to add it]]
+            @in before: Efl.Canvas.Object; [[The object before which to add it]]
         }
      }
      clear {
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 4c7a848a4a..e6177257d2 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -228,7 +228,7 @@ EOLIAN static Eo *
 _elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 252956cb6c..fd6668068e 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -335,7 +335,7 @@ EOLIAN static Eo *
 _elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 08096dc475..405165fd8f 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1593,7 +1593,7 @@ _elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd)
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR);
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index 21c0096352..9b10a3f99b 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -367,7 +367,7 @@ EOLIAN static Eo *
 _elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX);
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index b9923085e4..23e2a04f75 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -798,7 +798,7 @@ EOLIAN static Eo *
 _elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index abda3735e9..aab7340d0a 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -2216,7 +2216,7 @@ EOLIAN static Eo *
 _elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER);
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index c512aa5a13..4cc2a05380 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -995,7 +995,7 @@ EOLIAN static Eo *
 _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 12d12e2132..e993ac0ed8 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -63,7 +63,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
            ]]
         }
         values {
-            parent: Evas.Object; [[The parent to use.]]
+            parent: Efl.Canvas.Object; [[The parent to use.]]
         }
      }
      @property direction_priority {
@@ -175,7 +175,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
         params {
            @in label: string; [[The Label of the new item]]
-            @in icon: Evas.Object @optional; [[Icon to be set on new item]]
+            @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
            @in data: const(void_ptr) @optional; [[Data passed to $func]]
         }
@@ -194,7 +194,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
         params {
            @in label: string; [[The Label of the new item]]
-            @in icon: Evas.Object @optional; [[Icon to be set on new item]]
+            @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
            @in data: const(void_ptr) @optional; [[Data passed to $func]]
         }
diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c
index 907a052931..0698e1d517 100644
--- a/src/lib/elementary/elm_datetime.c
+++ b/src/lib/elementary/elm_datetime.c
@@ -892,7 +892,7 @@ EOLIAN static Eo *
 _elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR);
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 0102a23c7c..48f84fef81 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -461,7 +461,7 @@ EOLIAN static Eo *
 _elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 959e0188fc..36fbf59bc9 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1463,7 +1463,7 @@ EOLIAN static Eo *
 _elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 274f52b4e5..92146a1961 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -179,7 +179,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
         return: Elm.Widget.Item;
         params {
            @in label: string; [[The label of the diskselector item.]]
-            @in icon: Evas.Object @optional; [[The icon object to use at left side of the item. An
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use at left side of the item. An
            icon can be any Evas object, but usually it is an icon created
            with elm_icon_add(). ]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c9100daa09..0c5e25c7b2 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3951,7 +3951,7 @@ EOLIAN static Eo *
 _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 69b86adb59..8fdba32d90 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -381,7 +381,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
            ]]
         }
         values {
-            parent: Evas.Object @nullable; [[The object to use as parent for the hover.]]
+            parent: Efl.Canvas.Object @nullable; [[The object to use as parent for the hover.]]
         }
      }
      @property prediction_allow {
@@ -574,7 +574,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
              change the internal textblock object). This applies to all cursors
              returned from textblock calls, and all the other derivative values.
            ]]
-            return: Evas.Object;
+            return: Efl.Canvas.Object;
         }
      }
      @property cursor_geometry {
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 0da66390bc..d4003c1474 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -670,7 +670,7 @@ _elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c
index 4e5f02a038..b89d5a23fd 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/elm_frame.c
@@ -202,7 +202,7 @@ EOLIAN static Eo *
 _elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME);
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index edbb52a6df..4e509647cc 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4357,7 +4357,7 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE);
diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index 8ff492d6b1..ab4c99cd78 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -201,7 +201,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
                 floating "orphans" that can be re-used elsewhere if the user wants
                 to.]]
                params {
-                     @out l: own(list<own(Evas.Object)>); [[The contents list to return.]]
+                     @out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]]
                }
           }
      }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 18ec3d9ef9..ac67e68ed3 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5708,7 +5708,7 @@ _elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd)
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo
index 1decfa5aab..324ebd532d 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -326,7 +326,7 @@ class Elm.Genlist.Item(Elm.Widget.Item)
                  elsewhere if the user wants to.
                ]]
                params {
-                     @out l: own(list<own(Evas.Object)>); [[The contents list to return.]]
+                     @out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]]
                }
           }
           update {
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index a0f9e30a42..5711a4b68c 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -3825,7 +3825,7 @@ EOLIAN static Eo *
 _elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   return obj;
 }
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index 988e86b152..8d63081391 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -121,7 +121,7 @@ class Elm.Gesture_Layer (Elm.Widget)
         ]]
         return: bool; [[$true on success, $false otherwise.]]
         params {
-            @in target: Evas.Object; [[The object to attach.]]
+            @in target: Efl.Canvas.Object; [[The object to attach.]]
         }
      }
      cb_del {
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index dfddc9df31..c376fa8d78 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -358,7 +358,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
     ((version > 0) && (version <= 3)) ? version : EVAS_GL_GLES_2_X;
   _elm_glview_constructor(obj, sd);
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
   eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 349408a683..d68625b3a0 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -169,7 +169,7 @@ EOLIAN static Eo *
 _elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
   return obj;
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index db3397cfe9..a0c1d628c1 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -25,7 +25,7 @@ class Elm.Grid (Elm.Widget)
              It's possible to remove objects from the grid when walking this
              list, but these removals won't be reflected on it.
            ]]
-            return: free(own(list<Evas.Object>), eina_list_free) @warn_unused;
+            return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
         }
      }
      clear {
@@ -37,13 +37,13 @@ class Elm.Grid (Elm.Widget)
      unpack {
         [[Unpack a child from a grid object]]
         params {
-            @in subobj: Evas.Object; [[The child to unpack]]
+            @in subobj: Efl.Canvas.Object; [[The child to unpack]]
         }
      }
      pack {
         [[Pack child at given position and size]]
         params {
-            @in subobj: Evas.Object; [[The child to pack.]]
+            @in subobj: Efl.Canvas.Object; [[The child to pack.]]
            @in x: Evas.Coord; [[The virtual x coord at which to pack it.]]
            @in y: Evas.Coord; [[The virtual y coord at which to pack it.]]
            @in w: Evas.Coord; [[The virtual width at which to pack it.]]
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 2d554891cf..729cddff44 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -671,7 +671,7 @@ EOLIAN static Eo *
 _elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 135c342c79..04dcfe6186 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -25,7 +25,7 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
            [[Get the target object for the hover.]]
         }
         values {
-            target: Evas.Object; [[The target object.]]
+            target: Efl.Canvas.Object; [[The target object.]]
         }
      }
      best_content_location_get @const {
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 9d4b2fceac..c11b44588a 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -30,7 +30,7 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
         get {
         }
         values {
-            parent: Evas.Object @nullable; [[The parent to use]]
+            parent: Efl.Canvas.Object @nullable; [[The parent to use]]
         }
      }
      @property expanded {
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index ff9d1d6e42..168e243ad0 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -617,7 +617,7 @@ _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 5b2536d4b2..cfdd9b344d 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -1259,7 +1259,7 @@ EOLIAN static Eo *
 _elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR);
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 5c1e166cce..32c2b3d97f 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -234,7 +234,7 @@ EOLIAN static Eo *
 _elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_PAN_CLASS));
-   evas_obj_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   return obj;
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index b9b3a85a3e..f1b74adf63 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -382,7 +382,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
         set {
         }
         values {
-            pan: Evas.Object @nullable;
+            pan: Efl.Canvas.Object @nullable;
         }
      }
      @property page_change_cb {
@@ -467,7 +467,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
         set {
         }
         values {
-            content: Evas.Object @nullable;
+            content: Efl.Canvas.Object @nullable;
         }
      }
      @property edge_left_cb {
@@ -522,8 +522,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
         set {
         }
         values {
-            edje_object: Evas.Object;
+            edje_object: Efl.Canvas.Object;
-            hit_rectangle: Evas.Object;
+            hit_rectangle: Efl.Canvas.Object;
         }
      }
      @property last_page {
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 38908d8b3a..28df916036 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -116,7 +116,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
     }
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
   return obj;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 12e5707c00..d95ce92020 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -414,7 +414,7 @@ EOLIAN static Eo *
 _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 9d87908f72..4ffc97e1fd 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -1899,7 +1899,7 @@ _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
   sd->obj = obj;
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index e7e52c4908..92b4fb9f8a 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -94,7 +94,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
              hooking callbacks to signals, etc.) can be done with
              proper elementary functions.
            ]]
-            return: Evas.Object; [[An Evas_Object with the edje layout
+            return: Efl.Canvas.Object; [[An Evas_Object with the edje layout
                                     settings loaded \@ref elm_layout_file_set.]]
         }
      }
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 29ac55cea5..7c3a072095 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2553,7 +2553,7 @@ EOLIAN static Eo *
 _elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 6b48304316..11de7b6c37 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -228,8 +228,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
         params {
            @in before: Elm.Widget.Item; [[The list item to insert before.]]
            @in label: string; [[The label of the list item.]]
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
-            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
+            @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
@@ -275,8 +275,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
         params {
            @in after: Elm.Widget.Item; [[The list item to insert after.]]
            @in label: string; [[The label of the list item.]]
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
-            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
+            @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
@@ -345,8 +345,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
         params {
            @in label: string; [[The label of the list item.]]
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
-            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
+            @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
@@ -376,8 +376,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
         params {
            @in label: string; [[The label of the list item.]]
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
-            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
+            @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
@@ -414,8 +414,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
         params {
            @in label: string; [[The label of the list item.]]
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
-            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
+            @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
            @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list
diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo
index 939048bdab..755b7ec864 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/elm_list_item.eo
@@ -53,7 +53,7 @@ class Elm.List.Item(Elm.Widget.Item)
                     ]]
                }
                values {
-                     obj: Evas.Object; [[The base Edje object associated with the item.]]
+                     obj: Efl.Canvas.Object; [[The base Edje object associated with the item.]]
                }
           }
           @property prev {
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 3888d6c058..7466cc961a 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4236,7 +4236,7 @@ _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index a8b0b926b2..cc9311b1ff 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -348,7 +348,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
      }
      track_add {
         [[Add a track on the map.]]
-         return: Evas.Object; [[The route object. This is an elm object of type Route.]]
+         return: Efl.Canvas.Object; [[The route object. This is an elm object of type Route.]]
         params {
            @in emap: void_ptr; [[The emap route object.]]
         }
@@ -547,7 +547,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
      track_remove {
         [[Remove a track from the map.]]
         params {
-            @in route: Evas.Object; [[The track to remove.]]
+            @in route: Efl.Canvas.Object; [[The track to remove.]]
         }
      }
      overlay_route_add {
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index e98c3fef66..c6e1fa200f 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -316,7 +316,7 @@ EOLIAN static Eo *
 _elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
   return obj;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 358d1634db..04e33cc6a5 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -786,7 +786,7 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
   Eo *parent = NULL;
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   parent = eo_parent_get(obj);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU);
diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo
index d187779392..3aae16a355 100644
--- a/src/lib/elementary/elm_menu_item.eo
+++ b/src/lib/elementary/elm_menu_item.eo
@@ -69,7 +69,7 @@ class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection)
               Warning: Don't manipulate this object!
             ]]
-             return: Evas.Object; [[The base Edje object containing the
+             return: Efl.Canvas.Object; [[The base Edje object containing the
                                     swallowed content associated with the item.]]
        }
   }
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 5c7e5bf9f3..db17a9b144 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -71,7 +71,7 @@ class Elm.Multibuttonentry (Elm.Layout)
         get {
            [[Get the entry of the multibuttonentry object]]
-            return: Evas.Object; [[The entry object, or NULL if none]]
+            return: Efl.Canvas.Object; [[The entry object, or NULL if none]]
         }
      }
      @property selected_item {
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 95c54c6e04..83c1f2d009 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -73,7 +73,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
           is complete.
          ]]
-         return: Evas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]]
+         return: Efl.Canvas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]]
      }
      item_insert_before {
         [[Insert a new item into the naviframe before item $before.
@@ -85,9 +85,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
         params {
            @in before: Elm.Widget.Item; [[The naviframe item to insert before.]]
            @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
-            @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
+            @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
-            @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
+            @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
-            @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
+            @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
            @in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
         }
      }
@@ -106,9 +106,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
         return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
         params {
            @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
-            @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
+            @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
-            @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
+            @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
-            @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
+            @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
            @in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
         }
      }
@@ -116,7 +116,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
         [[Simple version of item_promote.]]
         params {
-            @in content: Evas.Object;
+            @in content: Efl.Canvas.Object;
         }
      }
      item_insert_after {
@@ -132,9 +132,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
         params {
            @in after: Elm.Widget.Item; [[The naviframe item to insert after.]]
            @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
-            @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
+            @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
-            @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
+            @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
-            @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
+            @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
            @in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
         }
      }
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 810e71e52c..ed376194e8 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -494,7 +494,7 @@ EOLIAN static Eo *
 _elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
   return obj;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 5a057e3e67..2e20914531 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1174,7 +1174,7 @@ EOLIAN static Eo *
 _elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index f9c406d6f5..d8f7c4fdb7 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -331,7 +331,7 @@ EOLIAN static Eo *
 _elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE);
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 0436a3dc37..cd1c3118ac 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -304,7 +304,7 @@ EOLIAN static Eo *
 _elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 139c5111ef..ca0f3864da 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -1511,7 +1511,7 @@ EOLIAN static Eo *
 _elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index b456137f29..6d442c5abc 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -134,7 +134,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
              modify it. It is for inspection only, and hooking callbacks
              to. Nothing else. It may be deleted at any time as well.
            ]]
-            return: Evas.Object; [[The internal image object handle or $null]]
+            return: Efl.Canvas.Object; [[The internal image object handle or $null]]
         }
      }
      @property image_size {
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 3dc73f7014..9654577b64 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -144,7 +144,7 @@ EOLIAN static Eo *
 _elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 9e3a60ff80..8f077da72f 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -16,7 +16,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
              Note: Be careful to not manipulate it, as it is under control of
              elementary.
            ]]
-            return: Evas.Object; [[The inlined image object or $null.]]
+            return: Efl.Canvas.Object; [[The inlined image object or $null.]]
         }
      }
      connect {
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 9d4aa06d38..90745ca7b3 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -153,7 +153,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
         return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
         params {
            @in label: string; [[The Label of the new item.]]
-            @in icon: Evas.Object @optional; [[Icon to be set on new item.]]
+            @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]]
            @in data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index dfca0e11c9..120141feae 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -516,7 +516,7 @@ EOLIAN static Eo *
 _elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT);
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 16060fc095..b93070173e 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -119,7 +119,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
           @since 1.8]]
-         return: const(Evas.Object); [[A valid widget handle, on success, or $NULL, otherwise]]
+         return: const(Efl.Canvas.Object); [[A valid widget handle, on success, or $NULL, otherwise]]
         params {
            @in name: string; [[The name of the item (as declared in the prefs collection) to get object from]]
         }
@@ -151,7 +151,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
         return: bool; [[$true, on success, $false otherwise]]
         params {
            @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]]
-            @in child: Evas.Object; [[The object to occupy the item]]
+            @in child: Efl.Canvas.Object; [[The object to occupy the item]]
         }
      }
      item_editable_set {
@@ -182,7 +182,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
           @since 1.8]]
-         return: Evas.Object; [[The unswallowed object, or NULL on errors]]
+         return: Efl.Canvas.Object; [[The unswallowed object, or NULL on errors]]
         params {
            @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]]
         }
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c
index 3913d1337e..4c07e9dd24 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/elm_progressbar.c
@@ -359,7 +359,7 @@ EOLIAN static Eo *
 _elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR);
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index 28fbc8e4eb..5b1dd018aa 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -276,7 +276,7 @@ EOLIAN static Eo *
 _elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON);
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 1be44f4093..043c36a763 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -57,7 +57,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
      @property selected_object {
         get {
            [[Get the selected radio object.]]
-            return: Evas.Object; [[The selected radio object]]
+            return: Efl.Canvas.Object; [[The selected radio object]]
         }
      }
      group_add {
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 4e78c00a5e..85a20731d5 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -186,7 +186,7 @@ EOLIAN static Eo *
 _elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   return obj;
 }
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 3f173ae340..7f03561a2e 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -951,7 +951,7 @@ EOLIAN static Eo *
 _elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE);
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 0b31ff4e7d..20c1f0f0c1 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -706,7 +706,7 @@ _elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd E
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 55390f65ed..b0de254139 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -57,7 +57,7 @@ class Elm.Segment_Control (Elm.Layout)
         return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
         params {
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
            @in label: string @optional; [[The label of the item.]]
            @in idx: int; [[Item position. Value should be between 0 and items count.]]
         }
@@ -115,7 +115,7 @@ class Elm.Segment_Control (Elm.Layout)
         return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
         params {
-            @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
+            @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
            @in label: string @optional; [[The label of the item.  Note that, NULL is different from empty string "".]]
         }
      }
@@ -126,7 +126,7 @@ class Elm.Segment_Control (Elm.Layout)
           it was created, with function elm_segment_control_item_add(), or later
           with function elm_object_item_part_content_set(). If no icon
           was passed as argument, it will return $NULL.]]
-         return: Evas.Object; [[The left side icon associated to the item at $index.]]
+         return: Efl.Canvas.Object; [[The left side icon associated to the item at $index.]]
         params {
            @in idx: int; [[The index of the segment item.]]
         }
diff --git a/src/lib/elementary/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo
index 4caccc11d4..e8f175a1ac 100644
--- a/src/lib/elementary/elm_segment_control_item.eo
+++ b/src/lib/elementary/elm_segment_control_item.eo
@@ -15,8 +15,8 @@ class Elm.Segment_Control.Item(Elm.Widget.Item)
      object_get @const {
             [[Get the real Evas(Edje) object created to implement the view of a given segment_control item.
-               Base object is the @Evas.Object that represents that item.]]
+               Base object is the @Efl.Canvas.Object that represents that item.]]
-             return: Evas.Object; [[The base Edje object associated with $it]]
+             return: Efl.Canvas.Object; [[The base Edje object associated with $it]]
        }
      selected_set {
             [[Set the selected state of an item.
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index a79f20ae14..e7b5e710d9 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -98,7 +98,7 @@ EOLIAN static Eo *
 _elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR);
   return obj;
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index b499e9f77a..cb61366a5d 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1286,7 +1286,7 @@ EOLIAN static Eo *
 _elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index 729378525f..0efebad999 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -389,7 +389,7 @@ EOLIAN static Eo *
 _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION);
diff --git a/src/lib/elementary/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo
index e03a9f2b33..7510a88cc2 100644
--- a/src/lib/elementary/elm_slideshow_item.eo
+++ b/src/lib/elementary/elm_slideshow_item.eo
@@ -25,7 +25,7 @@ class Elm.Slideshow.Item(Elm.Widget.Item)
             lower level callbacks for events on that object. Do not delete
             this object under any circumstances.]]
-           return: Evas.Object;
+           return: Efl.Canvas.Object;
        }
   }
   implements {
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index bb5c44990f..f7e306081f 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1451,7 +1451,7 @@ EOLIAN static Eo *
 _elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON);
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 1e8cafe226..e5efebdc0e 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -222,7 +222,7 @@ EOLIAN static Eo *
 _elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
   return obj;
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index b2064d547d..9050ea2e35 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -51,7 +51,7 @@ class Elm.Table (Elm.Widget)
      }
      child_get @const {
         [[Get child object of table at given coordinates.]]
-         return: Evas.Object; [[Child of object if find if not return $null.]]
+         return: Efl.Canvas.Object; [[Child of object if find if not return $null.]]
         params {
            @in col: int; [[Column number of child object.]]
            @in row: int; [[Row number of child object.]]
@@ -68,7 +68,7 @@ class Elm.Table (Elm.Widget)
           means only takes that 1 cell.
         ]]
         params {
-            @in subobj: Evas.Object; [[The subobject to be modified in the table.]]
+            @in subobj: Efl.Canvas.Object; [[The subobject to be modified in the table.]]
            @in column: int; [[Column number.]]
            @in row: int; [[Row number.]]
            @in colspan: int;
@@ -79,7 +79,7 @@ class Elm.Table (Elm.Widget)
      pack_get {
         [[Get the packing location of an existing child of the table.]]
         params {
-            @in subobj: Evas.Object; [[The subobject to be modified in the table.]]
+            @in subobj: Efl.Canvas.Object; [[The subobject to be modified in the table.]]
            @out column: int; [[Column number.]]
            @out row: int; [[Row number.]]
            @out colspan: int;
@@ -90,7 +90,7 @@ class Elm.Table (Elm.Widget)
      unpack {
         [[Remove child from table.]]
         params {
-            @in subobj: Evas.Object; [[The subobject.]]
+            @in subobj: Efl.Canvas.Object; [[The subobject.]]
         }
      }
      pack {
@@ -108,7 +108,7 @@ class Elm.Table (Elm.Widget)
           able to fit in 16bits will result in failure.
         ]]
         params {
-            @in subobj: Evas.Object; [[The subobject to be added to the table.]]
+            @in subobj: Efl.Canvas.Object; [[The subobject to be added to the table.]]
            @in column: int; [[Column number.]]
            @in row: int; [[Row number.]]
            @in colspan: int;
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index b9393977e8..c0a5767471 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -583,7 +583,7 @@ EOLIAN static Eo *
 _elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, "Elm_Thumb");
+   efl_canvas_object_type_set(obj, "Elm_Thumb");
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 787ce908db..599f349e59 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -3094,7 +3094,7 @@ EOLIAN static Eo *
 _elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR);
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index f508135acc..f3f4282c90 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -136,7 +136,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
         get {
         }
         values {
-            parent: Evas.Object; [[The parent of the menu objects.]]
+            parent: Efl.Canvas.Object; [[The parent of the menu objects.]]
         }
      }
      @property standard_priority {
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index 55746e6184..6f9f641a15 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -18,7 +18,7 @@ struct Elm.Toolbar.Item.State
   ]]
   label: string;
   icon_str: string;
-   icon: Evas.Object;
+   icon: Efl.Canvas.Object;
   func: Evas_Smart_Cb ;
   data: const(void_ptr);
 }
@@ -122,7 +122,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
                     ]]
                }
                values {
-                     obj: Evas.Object; [[The base Edje object associated with $it.]]
+                     obj: Efl.Canvas.Object; [[The base Edje object associated with $it.]]
                }
           }
           @property icon_object {
@@ -133,7 +133,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
                     ]]
                }
                values {
-                     obj: Evas.Object; [[The icon object.]]
+                     obj: Efl.Canvas.Object; [[The icon object.]]
                }
           }
           @property separator {
@@ -162,7 +162,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
                     ]]
                }
                values {
-                     menu: Evas.Object; [[Item's menu object or $null on failure.]]
+                     menu: Efl.Canvas.Object; [[Item's menu object or $null on failure.]]
                }
           }
           @property state {
diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c
index 41ea4ce820..1ba65d7b6d 100644
--- a/src/lib/elementary/elm_video.c
+++ b/src/lib/elementary/elm_video.c
@@ -283,7 +283,7 @@ EOLIAN static Eo *
 _elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo
index cda43aef37..31f1f349b0 100644
--- a/src/lib/elementary/elm_video.eo
+++ b/src/lib/elementary/elm_video.eo
@@ -36,7 +36,7 @@ class Elm.Video (Elm.Layout, Efl.File,
      @property emotion {
         get {
            [[Get the underlying Emotion object.]]
-            return: Evas.Object; [[the underlying Emotion object.]]
+            return: Efl.Canvas.Object; [[the underlying Emotion object.]]
         }
      }
      @property title {
diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo
index 1c2bd19231..fee6e6a815 100644
--- a/src/lib/elementary/elm_view_form.eo
+++ b/src/lib/elementary/elm_view_form.eo
@@ -17,7 +17,7 @@ class Elm.View.Form (Eo.Base)
             ]]
             params {
                 @in propname: string; [[Property name]]
-                 @in evas: Evas.Object; [[Evas widget]]
+                 @in evas: Efl.Canvas.Object; [[Evas widget]]
             }
        }
    }
diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo
index 29329128b6..3e0292ca97 100644
--- a/src/lib/elementary/elm_view_list.eo
+++ b/src/lib/elementary/elm_view_list.eo
@@ -9,7 +9,7 @@ class Elm.View.List (Eo.Base)
               @since 1.11
             ]]
             params {
-                 @in genlist: Evas.Object; [[Genlist object]]
+                 @in genlist: Efl.Canvas.Object; [[Genlist object]]
                 @in item_type: Elm.Genlist.Item.Type; [[Item type]]
                 @in item_style: string; [[The current item style name. $null would be default.]]
             }
@@ -20,7 +20,7 @@ class Elm.View.List (Eo.Base)
               @since 1.11
             ]]
             params {
-                 @out widget: Evas.Object; [[Returned widget]]
+                 @out widget: Efl.Canvas.Object; [[Returned widget]]
             }
        }
        property_connect {
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index b0f01d4a10..685e6a4b80 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -307,7 +307,7 @@ class Elm.Web (Elm.Widget)
              return the internal reference. Be careful using it as it may
              interfere with elm_web behavior.
            ]]
-            return: Evas.Object; [[The internal ewk_view object or $null
+            return: Efl.Canvas.Object; [[The internal ewk_view object or $null
                                     if it does not exist. (Failure to
                                     create or Elementary compiled
                                     without ewebkit)]]
diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c
index 008893aa98..f561fb562b 100644
--- a/src/lib/elementary/elm_web2.c
+++ b/src/lib/elementary/elm_web2.c
@@ -96,7 +96,7 @@ _elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
   sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks);
   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER);
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 34e78feda2..8d1d8b28e8 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -105,10 +105,10 @@ static void
 _propagate_event(void *data, const Eo_Event *event);
 EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
-                          { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del },
+                          { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del },
                          { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide });
 EO_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
-                          { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del });
+                          { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del });
 EO_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
                          { EFL_EVENT_KEY_DOWN, _propagate_event },
                          { EFL_EVENT_KEY_UP, _propagate_event },
@@ -574,7 +574,7 @@ _elm_widget_efl_canvas_group_group_no_render_set(Eo *obj, Elm_Widget_Smart_Data
   EINA_ITERATOR_FOREACH(it, o)
     {
       if (evas_object_data_get(o, "_elm_leaveme")) continue;
-       evas_obj_no_render_set(o, hide);
+       efl_canvas_object_no_render_set(o, hide);
     }
   eina_iterator_free(it);
 }
@@ -626,7 +626,7 @@ _elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *_p
   evas_object_color_get(obj, &r, &g, &b, &a);
   evas_object_color_set(child, r, g, b, a);
-   evas_obj_no_render_set(child, evas_obj_no_render_get(obj));
+   efl_canvas_object_no_render_set(child, efl_canvas_object_no_render_get(obj));
   evas_object_clip_set(child, evas_object_clip_get(obj));
   if (evas_object_visible_get(obj))
@@ -4427,7 +4427,7 @@ EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
                          { EFL_GFX_EVENT_MOVE, _track_obj_view_update },
                          { EFL_GFX_EVENT_SHOW, _track_obj_view_update },
                          { EFL_GFX_EVENT_HIDE, _track_obj_view_update },
-                          { EVAS_OBJECT_EVENT_DEL, _track_obj_view_del });
+                          { EFL_CANVAS_OBJECT_EVENT_DEL, _track_obj_view_del });
 static void
 _track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED)
@@ -5812,7 +5812,7 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
   sd->on_create = EINA_TRUE;
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
   evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
   parent = eo_parent_get(obj);
   elm_obj_widget_parent_set(obj, parent);
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 274b0574cc..7d3da020b4 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -159,12 +159,12 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
              the list of objects. The previous list will be deleted and this list
              will be managed by elementary. After it is set, don't modify it.]]
            values {
-               objs: list<Evas.Object>; [[Chain of objects to pass focus]]
+               objs: list<Efl.Canvas.Object>; [[Chain of objects to pass focus]]
            }
         }
         get {
            values {
-               objs: const(list<Evas.Object>); [[Chain of objects]]
+               objs: const(list<Efl.Canvas.Object>); [[Chain of objects]]
            }
         }
      }
@@ -209,7 +209,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
            legacy: elm_widget_parent_get; /* Needed because we don't do duplication removal for legacy names. */
         }
         values {
-            parent: Evas.Object @nullable;
+            parent: Efl.Canvas.Object @nullable;
         }
      }
      @property access_info {
@@ -261,7 +261,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
            return: bool;
         }
         values {
-            edj: Evas.Object;
+            edj: Efl.Canvas.Object;
            wname: string;
            welement: string;
            wstyle: string;
@@ -271,7 +271,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         set {
         }
         values {
-            sobj: Evas.Object @nullable;
+            sobj: Efl.Canvas.Object @nullable;
         }
      }
      @property display_mode {
@@ -309,7 +309,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         set {
         }
         values {
-            sobj: Evas.Object @nullable;
+            sobj: Efl.Canvas.Object @nullable;
            sub_obj: bool;
         }
      }
@@ -327,7 +327,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
            [[Function to operate on a given widget's scrollabe children when necessary.
              Warning: free the returned list with eina_list_free().]]
-            return: free(own(list<Evas.Object>), eina_list_free) @warn_unused;
+            return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
         }
      }
      @property scroll_hold {
@@ -373,7 +373,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      }
      @property top {
         get {
-            return: Evas.Object;
+            return: Efl.Canvas.Object;
         }
      }
      @property focus_order {
@@ -388,7 +388,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      }
      @property can_focus_child_list {
         get {
-            return: free(own(list<Evas.Object>), eina_list_free) @warn_unused;
+            return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
         }
      }
      @property focused_item {
@@ -407,7 +407,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      }
      @property parent_widget {
         get @virtual_pure {
-            return: Evas.Object;
+            return: Efl.Canvas.Object;
            legacy: null;
         }
      }
@@ -419,7 +419,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      @property focused_object {
         [[Current focused object in object tree.]]
         get {
-            return: Evas.Object; [[Current focused or $null, if there is no focused object.]]
+            return: Efl.Canvas.Object; [[Current focused or $null, if there is no focused object.]]
         }
      }
      @property parent2 {
@@ -428,7 +428,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         get {
         }
         values {
-            parent: Evas.Object @nullable;
+            parent: Efl.Canvas.Object @nullable;
         }
      }
      @property part_text {
@@ -444,7 +444,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         }
      }
      newest_focus_order_get @const {
-         return: Evas.Object;
+         return: Efl.Canvas.Object;
         params {
            @out newest_focus_order: uint;
            @in can_focus_only: bool;
@@ -462,7 +462,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
           @since 1.8]]
         params {
-            @in next: Evas.Object @nullable; [[Focus next object]]
+            @in next: Efl.Canvas.Object @nullable; [[Focus next object]]
            @in dir: Elm.Focus_Direction; [[Focus direction]]
         }
      }
@@ -470,7 +470,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         [[Get the next object with specific focus direction.
           @since 1.8]]
-         return: Evas.Object; [[Focus next object]]
+         return: Efl.Canvas.Object; [[Focus next object]]
         params {
            @in dir: Elm.Focus_Direction; [[Focus direction]]
         }
@@ -503,8 +503,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
           Note: On focus cycle, only will be evaluated children of this container.]]
         params {
-            @in child: Evas.Object; [[The child to be added in custom chain.]]
+            @in child: Efl.Canvas.Object; [[The child to be added in custom chain.]]
-            @in relative_child: Evas.Object @optional; [[The relative object to position the child.]]
+            @in relative_child: Efl.Canvas.Object @optional; [[The relative object to position the child.]]
         }
      }
      part_text_translate {
@@ -535,7 +535,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         [['Virtual' function handling sub objects being added.]]
         return: bool;
         params {
-            @in sobj: Evas.Object;
+            @in sobj: Efl.Canvas.Object;
         }
      }
      focus_direction_manager_is {
@@ -546,7 +546,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      event {
         [['Virtual' function handling input events on the widget.]]
         params {
-            @in source: Evas.Object;
+            @in source: Efl.Canvas.Object;
            @in type: Evas.Callback_Type;
            @in event_info: void_ptr;
         }
@@ -604,9 +604,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      focus_direction @virtual_pure {
         [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]]
         params {
-            @in base: const(Evas.Object);
+            @in base: const(Efl.Canvas.Object);
            @in degree: double;
-            @out direction: Evas.Object;
+            @out direction: Efl.Canvas.Object;
            @out direction_item: Elm.Widget.Item;
            @out weight: double;
         }
@@ -633,7 +633,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         return: bool;
      }
      name_find @const {
-         return: Evas.Object;
+         return: Efl.Canvas.Object;
         params {
            @in name: string;
            @in recurse: int;
@@ -642,11 +642,11 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      focus_list_direction_get @const {
         return: bool;
         params {
-            @in base: const(Evas.Object);
+            @in base: const(Efl.Canvas.Object);
            @in items: const(list<Eo.Base>);
            @in list_data_get: list_data_get_func_type;
            @in degree: double;
-            @out direction: Evas.Object;
+            @out direction: Efl.Canvas.Object;
            @out direction_item: Elm.Widget.Item;
            @out weight: double;
         }
@@ -687,7 +687,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         return: bool;
         params {
            @in dir: Elm.Focus_Direction;
-            @out next: Evas.Object;
+            @out next: Efl.Canvas.Object;
            @out next_item: Elm.Widget.Item;
         }
      }
@@ -729,7 +729,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         [['Virtual' function handling passing focus to sub-objects.]]
         params {
            @in dir: Elm.Focus_Direction;
-            @out next: Evas.Object;
+            @out next: Efl.Canvas.Object;
            @out next_item: Elm.Widget.Item;
         }
         return: bool;
@@ -740,7 +740,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
            @in items: const(list<Eo.Base>);
            @in list_data_get: list_data_get_func_type;
            @in dir: Elm.Focus_Direction;
-            @out next: Evas.Object;
+            @out next: Efl.Canvas.Object;
            @out next_item: Elm.Widget.Item;
         }
      }
@@ -754,9 +754,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
      focus_direction_get @const {
         return: bool;
         params {
-            @in base: const(Evas.Object);
+            @in base: const(Efl.Canvas.Object);
            @in degree: double;
-            @out direction: Evas.Object;
+            @out direction: Efl.Canvas.Object;
            @out direction_item: Elm.Widget.Item;
            @out weight: double;
         }
@@ -783,7 +783,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
         [['Virtual' function handling sub objects being removed.]]
         return: bool;
         params {
-            @in sobj: Evas.Object;
+            @in sobj: Efl.Canvas.Object;
         }
      }
      tooltip_add {
@@ -803,8 +803,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
           Note: On focus cycle, only will be evaluated children of this container.]]
         params {
-            @in child: Evas.Object; [[The child to be added in custom chain.]]
+            @in child: Efl.Canvas.Object; [[The child to be added in custom chain.]]
-            @in relative_child: Evas.Object @optional; [[The relative object to position the child.]]
+            @in relative_child: Efl.Canvas.Object @optional; [[The relative object to position the child.]]
         }
      }
      @property focus_move_policy {
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index ea87eef9fa..ba81cc96a4 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -108,7 +108,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                     part: string @nullable; [[The content part name  (NULL for the default content)]]
                }
                values {
-                     content: Evas.Object; [[The content of the object item]]
+                     content: Efl.Canvas.Object; [[The content of the object item]]
                }
           }
           @property part_text {
@@ -189,14 +189,14 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                  [[Get highlight order
                    @since 1.8]]
-                return: const(list<Evas.Object>);
+                return: const(list<Efl.Canvas.Object>);
           }
           access_order_set {
                [[Set highlight order
                  @since 1.8]]
                params {
-                     @in objs: own(list<Evas.Object>); [[Order of objects to pass highlight]]
+                     @in objs: own(list<Efl.Canvas.Object>); [[Order of objects to pass highlight]]
                }
           }
           widget_get @const {
@@ -204,7 +204,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                  Note: This returns the widget object itself that an item belongs to.
                  Note: Every elm_object_item supports this API]]
-                  return: Evas.Object; [[The widget object]]
+                  return: Efl.Canvas.Object; [[The widget object]]
           }
           del {
                [[Delete the given item.]]
@@ -260,7 +260,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                params {
                     part: string; [[The content part name to unset (NULL for the default content)]]
                }
-                return: Evas.Object;
+                return: Efl.Canvas.Object;
           }
           part_text_custom_update @protected {
                [[Update additional text part content]]
@@ -322,7 +322,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                [[Get an accessible object of the object item.
                  @since 1.8]]
-                return: Evas.Object; [[Accessible object of the object item or NULL for any error]]
+                return: Efl.Canvas.Object; [[Accessible object of the object item or NULL for any error]]
           }
           domain_translatable_part_text_set {
                [[Set the text for an object item's part, marking it as translatable.
@@ -408,7 +408,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                  See: @.track_get
                  @since 1.8]]
-                return: Evas.Object; [[The track object]]
+                return: Efl.Canvas.Object; [[The track object]]
           }
           untrack {
                [[This retrieve the track object of the item.
@@ -472,7 +472,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                [[Register object item as an accessible object.
                  @since 1.8]]
-                return: Evas.Object; [[Accessible object of the object item or NULL for any error]]
+                return: Efl.Canvas.Object; [[Accessible object of the object item or NULL for any error]]
           }
           access_unregister {
                [[Unregister accessible object of the object item.
@@ -498,14 +498,14 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                params {
                     dir: Elm.Focus_Direction; [[Focus direction]]
                }
-                return: Evas.Object; [[Focus next object]]
+                return: Efl.Canvas.Object; [[Focus next object]]
           }
           focus_next_object_set {
                [[Set the next object with specific focus direction.
                  @since 1.16]]
                params {
-                     next: Evas.Object @nullable; [[Focus next object]]
+                     next: Efl.Canvas.Object @nullable; [[Focus next object]]
                     dir: Elm.Focus_Direction; [[Focus direction]]
                }
           }
diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index abbd9ffff4..c98e6674e1 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -400,7 +400,7 @@ EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj);
 EAPI Ecore_Win32_Window *elm_win_win32_window_get(const Evas_Object *obj);
 /**
- * @brief Get the Ecore_Cocoa_Window of an Evas.Object.
+ * @brief Get the Ecore_Cocoa_Window of an Efl.Canvas.Object.
 *
 * @return The Ecore_Cocoa_Window of @c obj.
 *
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 1b3364ca07..b1ce922aa0 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
-#define EVAS_OBJECT_PROTECTED
+#define EFL_CANVAS_OBJECT_PROTECTED
 #include <Evas.h>
 #include <Ecore.h>
@@ -246,7 +246,7 @@ EOLIAN static Eo *
 _emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
 {
   obj = eo_constructor(eo_super(obj, MY_CLASS));
-   evas_obj_type_set(obj, E_OBJ_NAME);
+   efl_canvas_object_type_set(obj, E_OBJ_NAME);
   return obj;
 }
diff --git a/src/lib/ephysics/ephysics_body.cpp b/src/lib/ephysics/ephysics_body.cpp
index c2120265c0..98da084ae3 100644
--- a/src/lib/ephysics/ephysics_body.cpp
+++ b/src/lib/ephysics/ephysics_body.cpp
@@ -890,7 +890,7 @@ err_body:
 }
 static void
-_ephysics_body_evas_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_ephysics_body_efl_canvas_object_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
   EPhysics_Body *body = (EPhysics_Body *) data;
@@ -1214,7 +1214,7 @@ _ephysics_body_move(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord
 }
 static void
-_ephysics_body_evas_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+_ephysics_body_efl_canvas_object_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
   EPhysics_Body *body = (EPhysics_Body *) data;
author	Jean-Philippe Andre <jp.andre@samsung.com>	2016-06-21 13:26:15 +0900
committer	Jean-Philippe Andre <jp.andre@samsung.com>	2016-06-21 14:35:19 +0900
commit	7bf8da2baa243b972dd33d11ba873f6165e18fbf (patch)
tree	91e8d9be8b6d16cd684178afbe081266fa1921fb /src
parent	2f0b9edbb4b5e47d2d4a1380edc6ad1828134c41 (diff)