Eo: Finish the renaming of Eo to the EFL.

This renames all the rest of the API to the EFL namespace except for
Eo_Event that will follow soon.

Obviously breaks both API and ABI.

66 files changed, 1332 insertions, 1332 deletions

diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index adfbb9938f..ee32e61697 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -6,8 +6,8 @@
 Eina_Bool
 _evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Image_Load_Opts lo;
 
    if (o->cur->u.f == f)
@@ -36,7 +36,7 @@ _efl_canvas_image_efl_file_mmap_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 void
 _evas_image_mmap_get(const Eo *eo_obj, const Eina_File **f, const char **key)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (f)
      *f = o->cur->mmaped_source ? o->cur->u.f : NULL;
@@ -54,8 +54,8 @@ _efl_canvas_image_efl_file_mmap_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 Eina_Bool
 _evas_image_file_set(Eo *eo_obj, const char *file, const char *key)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Image_Load_Opts lo;
    const char *file2;
 
@@ -95,7 +95,7 @@ _efl_canvas_image_efl_file_file_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 void
 _evas_image_file_get(const Eo *eo_obj, const char **file, const char **key)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (file)
      {
@@ -117,7 +117,7 @@ _efl_canvas_image_efl_file_file_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
 Efl_Image_Load_Error
 _evas_image_load_error_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_error;
 }
@@ -139,7 +139,7 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel)
      }
    // FIXME: if already busy preloading, then dont request again until
    // preload done
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (cancel)
      {
         if (o->preloading)
@@ -161,8 +161,8 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel)
 void
 _evas_image_load_async_start(Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    _image_preload_internal(eo_obj, o, EINA_FALSE);
@@ -177,8 +177,8 @@ _efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj, void *_pd EINA_UNU
 void
 _evas_image_load_async_cancel(Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    evas_object_async_block(obj);
    _image_preload_internal(eo_obj, o, EINA_TRUE);
@@ -193,8 +193,8 @@ _efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj, void *_pd EINA_UN
 void
 _evas_image_load_dpi_set(Eo *eo_obj, double dpi)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (dpi == o->load_opts->dpi) return;
    evas_object_async_block(obj);
@@ -221,7 +221,7 @@ _efl_canvas_image_efl_image_load_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED
 double
 _evas_image_load_dpi_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_opts->dpi;
 }
@@ -235,8 +235,8 @@ _efl_canvas_image_efl_image_load_load_dpi_get(Eo *eo_obj, void *_pd EINA_UNUSED
 void
 _evas_image_load_size_set(Eo *eo_obj, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if ((o->load_opts->w == w) && (o->load_opts->h == h)) return;
    evas_object_async_block(obj);
@@ -267,7 +267,7 @@ _efl_canvas_image_efl_image_load_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED
 void
 _evas_image_load_size_get(const Eo *eo_obj, int *w, int *h)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (w) *w = o->load_opts->w;
    if (h) *h = o->load_opts->h;
@@ -282,8 +282,8 @@ _efl_canvas_image_efl_image_load_load_size_get(Eo *eo_obj, void *_pd EINA_UNUSED
 void
 _evas_image_load_scale_down_set(Eo *eo_obj, int scale_down)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (o->load_opts->scale_down_by == scale_down) return;
    evas_object_async_block(obj);
@@ -310,7 +310,7 @@ _efl_canvas_image_efl_image_load_load_scale_down_set(Eo *eo_obj, void *_pd EINA_
 int
 _evas_image_load_scale_down_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_opts->scale_down_by;
 }
@@ -324,8 +324,8 @@ _efl_canvas_image_efl_image_load_load_scale_down_get(Eo *eo_obj, void *_pd EINA_
 void
 _evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if ((o->load_opts->region.x == x) && (o->load_opts->region.y == y) &&
        (o->load_opts->region.w == w) && (o->load_opts->region.h == h)) return;
@@ -358,7 +358,7 @@ _efl_canvas_image_efl_image_load_load_region_set(Eo *eo_obj, void *_pd EINA_UNUS
 void
 _evas_image_load_region_get(const Eo *eo_obj, int *x, int *y, int *w, int *h)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (x) *x = o->load_opts->region.x;
    if (y) *y = o->load_opts->region.y;
@@ -375,8 +375,8 @@ _efl_canvas_image_efl_image_load_load_region_get(Eo *eo_obj, void *_pd EINA_UNUS
 void
 _evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (o->load_opts->orientation == !!enable) return;
    evas_object_async_block(obj);
@@ -395,7 +395,7 @@ _efl_canvas_image_efl_image_load_load_orientation_set(Eo *eo_obj, void *_pd EINA
 Eina_Bool
 _evas_image_load_orientation_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return o->load_opts->orientation;
 }
@@ -409,8 +409,8 @@ _efl_canvas_image_efl_image_load_load_orientation_get(Eo *eo_obj, void *_pd EINA
 Eina_Bool
 _evas_image_load_region_support_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return ENFN->image_can_region_get(ENDT, o->engine_data);
 }
@@ -425,8 +425,8 @@ _efl_canvas_image_efl_image_load_load_region_support_get(Eo *eo_obj, void *_pd E
 Eina_Bool
 _evas_image_animated_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_get)
      return EINA_FALSE;
@@ -443,14 +443,14 @@ _efl_canvas_image_efl_image_animated_animated_get(Eo *eo_obj, void *_pd EINA_UNU
 int
 _evas_image_animated_frame_count_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_frame_count_get ||
        !evas_object_image_animated_get(eo_obj))
      return -1;
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    return ENFN->image_animated_frame_count_get(ENDT, o->engine_data);
 }
 
@@ -463,8 +463,8 @@ _efl_canvas_image_efl_image_animated_animated_frame_count_get(Eo *eo_obj, void *
 Efl_Image_Animated_Loop_Hint
 _evas_image_animated_loop_type_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_loop_type_get ||
        !evas_object_image_animated_get(eo_obj))
@@ -482,8 +482,8 @@ _efl_canvas_image_efl_image_animated_animated_loop_type_get(Eo *eo_obj, void *_p
 int
 _evas_image_animated_loop_count_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_animated_loop_count_get ||
        !evas_object_image_animated_get(eo_obj))
@@ -501,8 +501,8 @@ _efl_canvas_image_efl_image_animated_animated_loop_count_get(Eo *eo_obj, void *_
 double
 _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int frame_count = 0;
 
    if (!ENFN->image_animated_frame_count_get ||
@@ -525,8 +525,8 @@ _efl_canvas_image_efl_image_animated_animated_frame_duration_get(Eo *eo_obj, voi
 Eina_Bool
 _evas_image_animated_frame_set(Eo *eo_obj, int frame_index)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int frame_count = 0;
 
    if (!o->cur->u.file) return EINA_FALSE;
@@ -567,7 +567,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_set(Eo *eo_obj, void *_pd EI
 int
 _evas_image_animated_frame_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!o->cur->u.file) return EINA_FALSE;
    if (!evas_object_image_animated_get(eo_obj)) return EINA_FALSE;
@@ -583,7 +583,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_get(Eo *eo_obj, void *_pd EI
 EOLIAN static void
 _efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int *w, int *h)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (w) *w = o->cur->image.w;
    if (h) *h = o->cur->image.h;
@@ -742,8 +742,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_data_set(Eo *eo_obj, void *_pd EINA_UNUS
                                                  void *pixels, int w, int h, int stride,
                                                  Efl_Gfx_Colorspace cspace)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return _image_pixels_set(obj, o, pixels, w, h, stride, cspace, EINA_FALSE);
 }
@@ -753,8 +753,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS
                                                  const void *pixels, int w, int h, int stride,
                                                  Efl_Gfx_Colorspace cspace)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    return _image_pixels_set(obj, o, (void *) pixels, w, h, stride, cspace, EINA_TRUE);
 }
@@ -762,8 +762,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS
 EOLIAN static void *
 _efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!o->buffer_data_set || !o->engine_data || !ENFN->image_data_direct)
      return NULL;
@@ -778,8 +778,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
                                             int x, int y, int w, int h,
                                             Efl_Gfx_Colorspace cspace, int *stride)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int len = 0, s = 0, width = 0, height = 0;
    void *data = NULL;
 
@@ -820,8 +820,8 @@ EOLIAN static Eina_Bool
 _efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED,
                                               void *data, int length)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_data_unmap || !o->engine_data)
      return EINA_FALSE;
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c
index d0b6a2e217..47f5a0158e 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.c
+++ b/src/lib/evas/canvas/efl_canvas_proxy.c
@@ -6,8 +6,8 @@
 Eina_Bool
 _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    if (obj->delete_me && eo_src)
      {
         WRN("Setting deleted object %p as image source %p", eo_src, eo_obj);
@@ -15,7 +15,7 @@ _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
      }
    if (eo_src)
      {
-        Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
         if (src->delete_me)
           {
              WRN("Setting object %p to deleted image source %p", eo_src, eo_obj);
@@ -65,7 +65,7 @@ _efl_canvas_proxy_source_set(Eo *eo_obj, void *_pd EINA_UNUSED, Evas_Object *eo_
 Evas_Object *
 _evas_image_proxy_source_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->source;
 }
 
@@ -79,8 +79,8 @@ void
 _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
 {
    Evas_Object_Protected_Data *src_obj;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    source_clip = !!source_clip;
    if (o->proxy_src_clip == source_clip) return;
@@ -89,7 +89,7 @@ _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
 
    if (!o->cur->source) return;
 
-   src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
    evas_object_change(o->cur->source, src_obj);
 }
 
@@ -102,7 +102,7 @@ _efl_canvas_proxy_source_clip_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool s
 Eina_Bool
 _evas_image_proxy_source_clip_get(const Eo *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->proxy_src_clip;
 }
 
@@ -115,8 +115,8 @@ _efl_canvas_proxy_source_clip_get(Eo *eo_obj, void *_pd EINA_UNUSED)
 void
 _evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    source_events = !!source_events;
    if (obj->proxy->src_events == source_events) return;
@@ -139,7 +139,7 @@ _efl_canvas_proxy_source_events_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool
 Eina_Bool
 _evas_image_proxy_source_events_get(const Eo *eo_obj)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    return obj->proxy->src_events;
 }
 
@@ -152,7 +152,7 @@ _efl_canvas_proxy_source_events_get(Eo *eo_obj, void *_pd EINA_UNUSED)
 Evas_Object *
 _evas_object_image_source_get(Evas_Object *eo_obj)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->source;
 }
 
@@ -163,7 +163,7 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox
 
    if (!o->cur->source) return;
 
-   cur_source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   cur_source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
 
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
      {
@@ -215,9 +215,9 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox
 void
 _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
 {
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    _evas_image_file_set(eo_proxy, NULL, NULL);
 
@@ -244,14 +244,14 @@ _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
 static inline void *
 _proxy_image_get(Evas_Image_Data *o)
 {
-   Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
    Evas_Image_Data *source_img = NULL;
 
    if (!source)
      return NULL;
 
-   if (eo_isa(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
-     source_img = eo_data_scope_get(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   if (efl_isa(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
+     source_img = efl_data_scope_get(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (source_img)
      return source_img->engine_data;
@@ -266,8 +266,8 @@ _efl_canvas_proxy_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
                                             int x, int y, int w, int h,
                                             Efl_Gfx_Colorspace cspace, int *stride)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    int len = 0, s = 0, width = 0, height = 0;
    void *image, *data = NULL;
 
@@ -315,8 +315,8 @@ EOLIAN static Eina_Bool
 _efl_canvas_proxy_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED,
                                               void *data, int length)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    if (!ENFN->image_data_unmap || !o->engine_data)
      return EINA_FALSE;
@@ -334,7 +334,7 @@ void
 _evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
                         int x, int y, Eina_Bool do_async)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Object_Protected_Data *proxy;
    Evas_Func *func;
 
@@ -344,7 +344,7 @@ _evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void
         o->proxyerror = 1;
      }
 
-   proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
+   proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
    func = proxy->layer->evas->engine.func;
    func->context_color_set(output, context, 0, 0, 0, 255);
    func->context_multiplier_unset(output, context);
diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.c b/src/lib/evas/canvas/efl_canvas_scene3d.c
index 367e50277c..ef4e491c7f 100644
--- a/src/lib/evas/canvas/efl_canvas_scene3d.c
+++ b/src/lib/evas/canvas/efl_canvas_scene3d.c
@@ -6,8 +6,8 @@
 EOLIAN static void
 _efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_Scene *scene)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Image_Load_Opts lo;
 
    if (o->cur->scene == scene) return;
@@ -24,7 +24,7 @@ _efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_
 EOLIAN static Evas_Canvas3D_Scene *
 _efl_canvas_scene3d_scene3d_get(Eo *eo_obj, void *pd EINA_UNUSED)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    return o->cur->scene;
 }
 
@@ -38,7 +38,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
    Evas_Canvas3D_Scene_Public_Data scene_data;
    Evas_Canvas3D_Scene_Data *pd_scene = NULL;
 
-   pd_scene = eo_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS);
+   pd_scene = efl_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS);
 
    if ((pd_scene->w == 0) || (pd_scene->h == 0)) return;
    if (!pd_scene->camera_node)
@@ -47,7 +47,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
         return;
      }
 
-   e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (pd_scene->surface)
      {
@@ -141,9 +141,9 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
 void
 _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
-   Evas_Canvas3D_Scene_Data *pd_scene = eo_data_scope_get(scene,
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Canvas3D_Scene_Data *pd_scene = efl_data_scope_get(scene,
                                                     EVAS_CANVAS3D_SCENE_CLASS);
    EINA_COW_WRITE_BEGIN(evas_object_3d_cow, obj->data_3d, Evas_Object_3D_Data,
                         data)
@@ -151,7 +151,7 @@ _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene)
         data->surface = NULL;
         data->w = 0;
         data->h = 0;
-        eo_ref(scene);
+        efl_ref(scene);
      }
    EINA_COW_WRITE_END(evas_object_3d_cow, obj->data_3d, data);
 
@@ -173,12 +173,12 @@ _evas_image_3d_unset(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data
    if (!o->cur->scene) return;
 
    Evas_Canvas3D_Scene_Data *pd_scene =
-      eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
+      efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
 
    EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
      {
         pd_scene->images = eina_list_remove(pd_scene->images, eo_obj);
-        eo_unref(state_write->scene);
+        efl_unref(state_write->scene);
         state_write->scene = NULL;
      }
    EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
@@ -215,7 +215,7 @@ _efl_canvas_scene3d_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
                                             int x, int y, int w, int h,
                                             Efl_Gfx_Colorspace cspace, int *stride EINA_UNUSED)
 {
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
    Evas_Public_Data *e;
    Evas_Canvas3D_Object_Data *pd_parent;
    Evas_Canvas3D_Scene_Data *pd_scene;
@@ -238,9 +238,9 @@ _efl_canvas_scene3d_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
         return NULL;
      }
 
-   pd_parent = eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_OBJECT_CLASS);
-   e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
-   pd_scene = eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
+   pd_parent = efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_OBJECT_CLASS);
+   e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
+   pd_scene = efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
 
    if (e->engine.func->drawable_size_get)
       {
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c
index 9aae7999f6..9f77ce6c92 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.c
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.c
@@ -8,12 +8,12 @@ _efl_canvas_snapshot_efl_object_constructor(Eo *eo_obj, void *pd EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
 
-   eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
    if (!eo_obj) return NULL;
 
    efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE);
 
-   obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    EINA_COW_STATE_WRITE_BEGIN(obj, sw, cur)
      sw->snapshot = EINA_TRUE;
    EINA_COW_STATE_WRITE_END(obj, sw, cur);
diff --git a/src/lib/evas/canvas/efl_canvas_surface.c b/src/lib/evas/canvas/efl_canvas_surface.c
index 13c86f0c6a..9d3437b1a0 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.c
+++ b/src/lib/evas/canvas/efl_canvas_surface.c
@@ -5,7 +5,7 @@
 EOLIAN static Eo *
 _efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd)
 {
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
    pd->surf.version = EVAS_NATIVE_SURFACE_VERSION;
    return eo;
 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
index 116aad03ab..6ef23d6761 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
@@ -12,8 +12,8 @@ _efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Da
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
    if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_TBM))
@@ -22,7 +22,7 @@ _efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Da
         return NULL;
      }
 
-   pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
+   pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
    pd->base->surf.type = EVAS_NATIVE_SURFACE_TBM;
    return eo;
 }
@@ -32,10 +32,10 @@ _efl_canvas_surface_tbm_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Dat
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM);
-   eo_data_unref(eo, pd->base);
+   efl_data_unref(eo, pd->base);
    efl_destructor(eo);
 }
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
index f15e969d1b..040a874b1c 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
@@ -12,8 +12,8 @@ _efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wa
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
    if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_WL))
@@ -22,7 +22,7 @@ _efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wa
         return NULL;
      }
 
-   pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
+   pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
    pd->base->surf.type = EVAS_NATIVE_SURFACE_WL;
    return eo;
 }
@@ -32,10 +32,10 @@ _efl_canvas_surface_wayland_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Way
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL);
-   eo_data_unref(eo, pd->base);
+   efl_data_unref(eo, pd->base);
    efl_destructor(eo);
 }
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c
index c463a157d8..36a5f5f163 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c
@@ -13,8 +13,8 @@ _efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Da
 {
    Evas_Object_Protected_Data *obj;
 
-   eo = efl_constructor(eo_super(eo, MY_CLASS));
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   eo = efl_constructor(efl_super(eo, MY_CLASS));
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return NULL;
 
    if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_X11))
@@ -23,7 +23,7 @@ _efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Da
         return NULL;
      }
 
-   pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
+   pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
    pd->base->surf.version = EVAS_NATIVE_SURFACE_VERSION;
    pd->base->surf.type = EVAS_NATIVE_SURFACE_X11;
    return eo;
@@ -34,10 +34,10 @@ _efl_canvas_surface_x11_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_X11_Dat
 {
    Evas_Object_Protected_Data *obj;
 
-   obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+   obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
 
    ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11);
-   eo_data_unref(eo, pd->base);
+   efl_data_unref(eo, pd->base);
    efl_destructor(eo);
 }
 
diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c
index 95a4ae7fc0..524f75c111 100644
--- a/src/lib/evas/canvas/efl_event_hold.c
+++ b/src/lib/evas/canvas/efl_event_hold.c
@@ -63,7 +63,7 @@ _efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_H
 EOLIAN static Eo *
 _efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    pd->eo = obj;
    return obj;
 }
@@ -73,8 +73,8 @@ _efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNU
                                        Efl_Object *owner, void **priv)
 {
    // TODO: Implement a cache. Depends only on how many hold events we trigger.
-   Efl_Event *evt = eo_add(MY_CLASS, owner);
-   if (priv) *priv = eo_data_scope_get(evt, MY_CLASS);
+   Efl_Event *evt = efl_add(MY_CLASS, owner);
+   if (priv) *priv = efl_data_scope_get(evt, MY_CLASS);
    return evt;
 }
 
@@ -89,8 +89,8 @@ EOLIAN static Efl_Event *
 _efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd)
 {
    Efl_Event_Hold_Data *ev;
-   Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
-   ev = eo_data_scope_get(evt, MY_CLASS);
+   Efl_Event *evt = efl_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
+   ev = efl_data_scope_get(evt, MY_CLASS);
    if (ev)
      {
         memcpy(ev, pd, sizeof(*ev));
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c
index 7729432167..81dcd3f118 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_event_key.c
@@ -20,7 +20,7 @@ _del_hook(Eo *evt)
      {
         if (efl_parent_get(evt))
           {
-             eo_ref(evt);
+             efl_ref(evt);
              efl_parent_set(evt, NULL);
           }
         s_cached_event = evt;
@@ -48,11 +48,11 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
      }
    else
      {
-        evt = eo_add(EFL_EVENT_KEY_CLASS, owner);
+        evt = efl_add(EFL_EVENT_KEY_CLASS, owner);
         efl_del_intercept_set(evt, _del_hook);
      }
 
-   ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+   ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
    ev->fake = EINA_FALSE;
    if (priv) *priv = ev;
 
@@ -71,7 +71,7 @@ _efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED)
 EOLIAN static Efl_Object *
 _efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_event_reset(obj);
    return obj;
 }
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 8bd45c42a8..8db2735352 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -31,7 +31,7 @@ _del_hook(Eo *evt)
      {
         if (efl_parent_get(evt))
           {
-             eo_ref(evt);
+             efl_ref(evt);
              efl_parent_set(evt, NULL);
           }
         s_cached_event = evt;
@@ -59,11 +59,11 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
      }
    else
      {
-        evt = eo_add(EFL_EVENT_POINTER_CLASS, owner);
+        evt = efl_add(EFL_EVENT_POINTER_CLASS, owner);
         efl_del_intercept_set(evt, _del_hook);
      }
 
-   ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+   ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
    ev->fake = EINA_FALSE;
    if (priv) *priv = ev;
 
@@ -82,7 +82,7 @@ _efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
 EOLIAN static Efl_Object *
 _efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
 {
-   efl_constructor(eo_super(obj, MY_CLASS));
+   efl_constructor(efl_super(obj, MY_CLASS));
    efl_event_reset(obj);
    return obj;
 }
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 82b810518d..36f4f3837f 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -125,7 +125,7 @@ _evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e)
 void
 _evas_post_event_callback_free(Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Post_Callback *pc;
 
    EINA_LIST_FREE(e->post_events, pc)
@@ -139,7 +139,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
 {
    _eo_evas_object_cb_info *info;
    Eina_Inlist *itr;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return;
    if (!obj->callbacks) return;
@@ -164,7 +164,7 @@ evas_event_callback_all_del(Evas *eo_e)
 {
    _eo_evas_object_cb_info *info;
    Eina_Inlist *itr;
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (!e) return;
    if (!e->callbacks) return;
@@ -316,7 +316,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
         if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
               (type <= EVAS_CALLBACK_KEY_UP))
           {
-             Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *smart_parent = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
              evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, efl_event_desc, efl_event_info);
           }
      }
@@ -333,7 +333,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
 EAPI void
 evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -362,7 +362,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return NULL;
    if (!func) return NULL;
@@ -393,7 +393,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return NULL;
    if (!func) return NULL;
@@ -426,7 +426,7 @@ evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func,
 EAPI void
 evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
@@ -448,7 +448,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
 EAPI void *
 evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    _eo_evas_cb_info *info;
 
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
@@ -484,7 +484,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if (!e) return NULL;
    if (!func) return NULL;
@@ -516,7 +516,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e) return;
    EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
    pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback);
@@ -539,7 +539,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func)
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e) return;
    EINA_LIST_FOREACH(e->post_events, l, pc)
      {
@@ -561,7 +561,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func,
    return;
    MAGIC_CHECK_END();
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e) return;
    EINA_LIST_FOREACH(e->post_events, l, pc)
      {
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index ab222e634f..109838e122 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -28,7 +28,7 @@ _evas_canvas3d_camera_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED,
 void
 evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node)
 {
-   Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(camera, MY_CLASS);
+   Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(camera, MY_CLASS);
    int count = 0;
 
    if (!pd->nodes)
@@ -48,7 +48,7 @@ evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *
 void
 evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node)
 {
-   Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(camera, MY_CLASS);
+   Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(camera, MY_CLASS);
    int count = 0;
 
    if (!pd->nodes)
@@ -66,7 +66,7 @@ EOLIAN static Eo *
 _evas_canvas3d_camera_efl_object_constructor(Eo *obj,
                                        Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA);
 
    return obj;
@@ -85,14 +85,14 @@ _evas_canvas3d_camera_efl_object_destructor(Eo *obj,
         it = eina_hash_iterator_key_new(pd->nodes);
         while (eina_iterator_next(it, &data))
           {
-             node = eo_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
+             node = efl_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
              node->data.camera.camera = NULL;
           }
 
         eina_hash_free(pd->nodes);
      }
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Canvas3D_Camera *
@@ -101,7 +101,7 @@ evas_canvas3d_camera_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
@@ -161,8 +161,8 @@ _evas_canvas3d_camera_node_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Camera
 {
    Eina_Matrix4 matrix_vp;
    Eina_Quaternion planes[6];
-   Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
-   Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_Vector3 central_point;
 
    if (!node || pd_node->type != EVAS_CANVAS3D_NODE_TYPE_MESH)
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index 77a7d49d93..f71c54df7e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -29,7 +29,7 @@ void
 evas_canvas3d_light_node_add(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(light, MY_CLASS);
+   Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(light, MY_CLASS);
    if (pd->nodes == NULL)
      {
         pd->nodes = eina_hash_pointer_new(NULL);
@@ -50,7 +50,7 @@ void
 evas_canvas3d_light_node_del(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(light, MY_CLASS);
+   Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(light, MY_CLASS);
    if (pd->nodes == NULL)
      {
         ERR("No node to delete.");
@@ -72,14 +72,14 @@ evas_canvas3d_light_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT);
    evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0);
    evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0);
@@ -108,14 +108,14 @@ _evas_canvas3d_light_efl_object_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd
         it = eina_hash_iterator_key_new(pd->nodes);
         while (eina_iterator_next(it, &data))
           {
-             node = eo_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
+             node = efl_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
              node->data.light.light = NULL;
           }
 
         eina_hash_free(pd->nodes);
      }
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 150f5eb810..802fcde3cc 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -39,7 +39,7 @@ void
 evas_canvas3d_material_mesh_add(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh)
 {
    int count = 0;
-   Evas_Canvas3D_Material_Data *pd = eo_data_scope_get(material, MY_CLASS);
+   Evas_Canvas3D_Material_Data *pd = efl_data_scope_get(material, MY_CLASS);
 
    if (pd->meshes == NULL)
      {
@@ -61,7 +61,7 @@ void
 evas_canvas3d_material_mesh_del(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh)
 {
    int count = 0;
-   Evas_Canvas3D_Material_Data *pd = eo_data_scope_get(material, MY_CLASS);
+   Evas_Canvas3D_Material_Data *pd = efl_data_scope_get(material, MY_CLASS);
 
    if (pd->meshes == NULL)
      {
@@ -84,14 +84,14 @@ evas_canvas3d_material_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL);
 
    evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
@@ -118,7 +118,7 @@ _evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Da
         it = eina_hash_iterator_key_new(pd->meshes);
         while (eina_iterator_next(it, &data))
           {
-             mesh = eo_data_scope_get(data, EVAS_CANVAS3D_MESH_CLASS);
+             mesh = efl_data_scope_get(data, EVAS_CANVAS3D_MESH_CLASS);
              if (mesh->frames)
                {
                   EINA_LIST_FOREACH(mesh->frames, l, f)
@@ -136,7 +136,7 @@ _evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Da
              evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
           }
      }
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -187,12 +187,12 @@ _evas_canvas3d_material_texture_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Ev
         if (pd->attribs[attrib].texture)
           {
              evas_canvas3d_texture_material_del(pd->attribs[attrib].texture, obj);
-             eo_unref(pd->attribs[attrib].texture);
+             efl_unref(pd->attribs[attrib].texture);
           }
 
         pd->attribs[attrib].texture = texture;
         evas_canvas3d_texture_material_add(texture, obj);
-        eo_ref(texture);
+        efl_ref(texture);
      }
 
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL);
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index e59497f9af..d9e5b68f6c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -213,7 +213,7 @@ void
 evas_canvas3d_mesh_node_add(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
    if (pd->nodes == NULL)
      {
         pd->nodes = eina_hash_pointer_new(NULL);
@@ -234,7 +234,7 @@ void
 evas_canvas3d_mesh_node_del(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
 {
    int count = 0;
-   Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS);
+   Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
    if (pd->nodes == NULL)
      {
         ERR("No node to delete.");
@@ -256,14 +256,14 @@ evas_canvas3d_mesh_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
    _mesh_init(pd);
 
@@ -274,7 +274,7 @@ EOLIAN static void
 _evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
 {
    _mesh_fini(pd);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -371,11 +371,11 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int
    if (f->material)
      {
         evas_canvas3d_material_mesh_del(f->material, obj);
-        eo_unref(f->material);
+        efl_unref(f->material);
      }
 
    f->material = material;
-   eo_ref(material);
+   efl_ref(material);
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL);
    evas_canvas3d_material_mesh_add(material, obj);
 }
@@ -920,7 +920,7 @@ _evas_canvas3d_mesh_from_primitive_set(Eo *obj,
 {
    if ((primitive == NULL) || (obj == NULL)) return;
 
-   Evas_Canvas3D_Primitive_Data *ppd = eo_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS);
+   Evas_Canvas3D_Primitive_Data *ppd = efl_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS);
 
    evas_common_set_model_from_primitive(obj, frame, ppd);
 }
@@ -968,7 +968,7 @@ _mesh_frame_find(Evas_Canvas3D_Mesh *mesh, int frame,
 {
    Eina_List *left, *right;
    Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1;
-   Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
 
    left = pdmesh->frames;
    right = eina_list_next(left);
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index c4f6eeedf7..4454571626 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -60,7 +60,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
    Eina_Bool ret = EINA_FALSE;
 
    target_node = (Evas_Canvas3D_Node *)event->info;
-   pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
+   pd_target = efl_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
    collision_list = (Eina_List *)data;
    eo_desc = efl_object_legacy_only_event_description_get("collision");
 
@@ -68,7 +68,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
      {
         EINA_LIST_FOREACH(collision_list, l, n)
           {
-             pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+             pd = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
              if (box_intersection_box(&pd_target->aabb, &pd->aabb))
                ret = efl_event_callback_call(target_node, eo_desc, n);
           }
@@ -184,7 +184,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No
      EINA_LIST_FOREACH(pd->members, l, n)
        {
           /*Skip change orientation if node is billboard*/
-          Evas_Canvas3D_Node_Data *pdm = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
+          Evas_Canvas3D_Node_Data *pdm = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
           if (pdm->billboard_target)
             continue;
           evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj);
@@ -224,7 +224,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva
 static Eina_Bool
 _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    Eina_Bool transform_dirty = EINA_FALSE, parent_dirty = EINA_FALSE;
 
    transform_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION);
@@ -238,7 +238,7 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
      {
         if (pd->parent)
           {
-             Evas_Canvas3D_Node_Data *pdparent = eo_data_scope_get(pd->parent, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdparent = efl_data_scope_get(pd->parent, MY_CLASS);
              const Eina_Vector3 *scale_parent = &pdparent->scale_world;
              const Eina_Quaternion *orientation_parent = &pdparent->orientation_world;
 
@@ -315,10 +315,10 @@ _node_billboard_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
    Eina_Vector3   target;
    Eina_Vector3   up;
-   Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, MY_CLASS);
    if (pd_node->billboard_target)
      {
-        Evas_Canvas3D_Node_Data *pd_target = eo_data_scope_get(pd_node->billboard_target,
+        Evas_Canvas3D_Node_Data *pd_target = efl_data_scope_get(pd_node->billboard_target,
                                                        MY_CLASS);
         eina_vector3_set(&target, pd_target->position.x, pd_target->position.y,
                       pd_target->position.z);
@@ -353,7 +353,7 @@ _node_billboard_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 static Eina_Bool
 _node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    if (pd->type == EVAS_CANVAS3D_NODE_TYPE_CAMERA)
      {
         if (pd->data.camera.camera)
@@ -446,7 +446,7 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
    int i;
    int count;
    Eina_Vector3 *vertices = NULL;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_Bool transform_orientation_dirty;
    Eina_Bool transform_position_dirty;
    Eina_Bool transform_scale_dirty;
@@ -497,7 +497,7 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
 Eina_Bool
 node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
    Eina_List *current;
    Evas_Canvas3D_Node *datanode;
    const Efl_Event_Description *eo_desc = NULL;
@@ -507,7 +507,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
    _update_node_shapes(node);
    EINA_LIST_FOREACH(pd->members, current, datanode)
      {
-        Evas_Canvas3D_Node_Data *datapd = eo_data_scope_get(datanode, EVAS_CANVAS3D_NODE_CLASS);
+        Evas_Canvas3D_Node_Data *datapd = efl_data_scope_get(datanode, EVAS_CANVAS3D_NODE_CLASS);
         evas_box3_union(&pd->obb, &pd->obb, &datapd->obb);
         evas_box3_union(&pd->aabb, &pd->aabb, &datapd->aabb);
      }
@@ -523,7 +523,7 @@ static Eina_Bool
 _node_update_done(Evas_Canvas3D_Node *obj, void *data EINA_UNUSED)
 {
    //@FIXME
-   Evas_Canvas3D_Object_Data *pdobject = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
+   Evas_Canvas3D_Object_Data *pdobject = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
    memset(&pdobject->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
    return EINA_TRUE;
 }
@@ -556,7 +556,7 @@ _evas_canvas3d_node_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D_No
 static void
 _node_free(Evas_Canvas3D_Object *obj)
 {
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(obj, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(obj, MY_CLASS);
 
    if (pd->members)
      {
@@ -565,7 +565,7 @@ _node_free(Evas_Canvas3D_Object *obj)
 
         EINA_LIST_FOREACH(pd->members, l, n)
           {
-             eo_unref(n);
+             efl_unref(n);
           }
 
         eina_list_free(pd->members);
@@ -583,7 +583,7 @@ _node_free(Evas_Canvas3D_Object *obj)
 
         EINA_LIST_FOREACH(pd->data.mesh.meshes, l, m)
           {
-             eo_unref(m);
+             efl_unref(m);
           }
 
         eina_list_free(pd->data.mesh.meshes);
@@ -603,7 +603,7 @@ void
 evas_canvas3d_node_scene_root_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_root == NULL)
      {
         pd->scenes_root = eina_hash_pointer_new(NULL);
@@ -624,7 +624,7 @@ void
 evas_canvas3d_node_scene_root_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_root == NULL)
      {
         ERR("No scene to delete.");
@@ -649,7 +649,7 @@ void
 evas_canvas3d_node_scene_camera_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_camera == NULL)
      {
         pd->scenes_camera = eina_hash_pointer_new(NULL);
@@ -670,7 +670,7 @@ void
 evas_canvas3d_node_scene_camera_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
 {
    int count = 0;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->scenes_camera == NULL)
      {
         ERR("No scene to delete.");
@@ -707,7 +707,7 @@ evas_canvas3d_node_traverse(Evas_Canvas3D_Node *from, Evas_Canvas3D_Node *to, Ev
 
              if (node == from)
                break;
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              node = pdnode->parent;
 
              if (node == NULL)
@@ -723,7 +723,7 @@ evas_canvas3d_node_traverse(Evas_Canvas3D_Node *from, Evas_Canvas3D_Node *to, Ev
 
              if (node == to)
                break;
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              node = pdnode->parent;
 
              if (node == NULL)
@@ -771,7 +771,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
           {
              /* Dequeue a node. */
              node = eina_list_data_get(nodes);
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
 
              nodes = eina_list_remove_list(nodes, nodes);
 
@@ -795,7 +795,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
           {
              /* Pop a node from the stack. */
              node = eina_list_data_get(nodes);
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              nodes = eina_list_remove_list(nodes, nodes);
 
              /* Call node function on the node. */
@@ -825,7 +825,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
           {
              /* Peek a node from the stack. */
              node = eina_list_data_get(nodes);
-             Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS);
+             Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
              if (eina_list_count(pdnode->members) == 0)
                {
                   /* The peeked node is a leaf node,
@@ -852,7 +852,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
                    * its childs into the stack. */
                    Evas_Canvas3D_Node_Data *pdlast;
                    if (last )
-                     pdlast= eo_data_scope_get(last, MY_CLASS);
+                     pdlast= efl_data_scope_get(last, MY_CLASS);
                   if (last && pdlast->parent == node)
                     {
                        /* Visit the node as it doesn't have any unvisited child node. */
@@ -893,7 +893,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
    Evas_Canvas3D_Mesh_Data *mesh_pd;
    Evas_Canvas3D_Mesh_Frame *f;
    Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    unsigned short int *index;
    int stride, tex_stride, normal_stride;
 
@@ -903,14 +903,14 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
         /*In case LOD calculate distance to the camera node*/
         if (pd->lod)
           {
-              Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(scene_data->camera_node, MY_CLASS);
+              Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(scene_data->camera_node, MY_CLASS);
               scene_data->lod_distance = eina_vector3_distance_get(&pd_camera->position, &pd->position_world);
           }
         /* calculation of tangent space for all meshes */
         list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node);
         EINA_LIST_FOREACH(list_meshes, l, mesh)
           {
-             mesh_pd = eo_data_scope_get(mesh, MY_CLASS);
+             mesh_pd = efl_data_scope_get(mesh, MY_CLASS);
              f = evas_canvas3d_mesh_frame_find(mesh_pd, 0);
              if (!f)
                {
@@ -964,8 +964,8 @@ Eina_Bool
 evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
 {
    Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
-   Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(scene_data->camera_node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(scene_data->camera_node, MY_CLASS);
    Evas_Canvas3D_Camera *camera = (Evas_Canvas3D_Camera*)pd_camera->data.camera.camera;
 
    Eina_List *list_meshes, *l;
@@ -1012,7 +1012,7 @@ Eina_Bool
 evas_canvas3d_node_light_collect(Evas_Canvas3D_Node *node, void *data)
 {
    Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
-   Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
    if (pd->type == EVAS_CANVAS3D_NODE_TYPE_LIGHT)
      scene_data->light_nodes = eina_list_append(scene_data->light_nodes, node);
 
@@ -1025,7 +1025,7 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(eo_self, type));
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_self, type));
    return eo_obj;
 }
 
@@ -1069,7 +1069,7 @@ _evas_canvas3d_node_efl_object_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd E
 {
    _node_free(obj);
 
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static Evas_Canvas3D_Node_Type
@@ -1086,14 +1086,14 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
         ERR("Failed to add a member node (adding to itself).");
         return;
      }
-   Evas_Canvas3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pdmember = efl_data_scope_get(member, MY_CLASS);
    if (!pdmember || pdmember->parent == obj)
      return;
 
    if (pdmember->parent)
      {
         /* Detaching from previous parent. */
-         Evas_Canvas3D_Node_Data *pdmemberparent = eo_data_scope_get(pdmember->parent, MY_CLASS);
+         Evas_Canvas3D_Node_Data *pdmemberparent = efl_data_scope_get(pdmember->parent, MY_CLASS);
         pdmemberparent->members = eina_list_remove(pdmemberparent->members, member);
 
         /* Mark changed. */
@@ -1102,7 +1102,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
    else
      {
         /* Should get a new reference. */
-        eo_ref(member);
+        efl_ref(member);
      }
 
    /* Add the member node. */
@@ -1119,7 +1119,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
 EOLIAN static void
 _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Node *member)
 {
-   Evas_Canvas3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS);
+   Evas_Canvas3D_Node_Data *pdmember = efl_data_scope_get(member, MY_CLASS);
    if (!pdmember || pdmember->parent != obj)
      {
         ERR("Failed to delete a member node (not a member of the given node)");
@@ -1137,7 +1137,7 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
    evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL);
 
    /* Decrease reference count. */
-   eo_unref(member);
+   efl_unref(member);
 }
 
 EOLIAN static Evas_Canvas3D_Node *
@@ -1456,11 +1456,11 @@ _evas_canvas3d_node_camera_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
      {
         /* Detach previous camera object. */
         evas_canvas3d_camera_node_del(pd->data.camera.camera, obj);
-        eo_unref(pd->data.camera.camera);
+        efl_unref(pd->data.camera.camera);
      }
 
    pd->data.camera.camera = camera;
-   eo_ref(camera);
+   efl_ref(camera);
 
    /* Register change notification on the camera for this node. */
    evas_canvas3d_camera_node_add(camera, obj);
@@ -1491,11 +1491,11 @@ _evas_canvas3d_node_light_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3
      {
         /* Detach previous light object. */
         evas_canvas3d_light_node_del(pd->data.light.light, obj);
-        eo_unref(pd->data.light.light);
+        efl_unref(pd->data.light.light);
      }
 
    pd->data.light.light = light;
-   eo_ref(light);
+   efl_ref(light);
 
    /* Register change notification on the light for this node. */
    evas_canvas3d_light_node_add(light, obj);
@@ -1542,7 +1542,7 @@ _evas_canvas3d_node_mesh_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
      }
 
    pd->data.mesh.meshes = eina_list_append(pd->data.mesh.meshes, mesh);
-   eo_ref(mesh);
+   efl_ref(mesh);
 
    /* Register change notification. */
    evas_canvas3d_mesh_node_add(mesh, obj);
@@ -1569,7 +1569,7 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
 
    pd->data.mesh.meshes = eina_list_remove(pd->data.mesh.meshes, mesh);
    evas_canvas3d_mesh_node_del(mesh, obj);
-   eo_unref(mesh);
+   efl_unref(mesh);
 
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL);
    evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL);
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 8f9911517b..9dde9f899c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -7,7 +7,7 @@ EOLIAN static Eo *
 _evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
 {
    Eo *e = NULL;
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    e = efl_parent_get(obj);
    pd->evas = e;
    pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID;
@@ -21,7 +21,7 @@ EOLIAN static Evas *
 {
    if (klass == EVAS_CANVAS_CLASS)
      return pd->evas;
-   return efl_provider_find(eo_super(obj, MY_CLASS), klass);
+   return efl_provider_find(efl_super(obj, MY_CLASS), klass);
 }
 
 EOLIAN static void
@@ -76,7 +76,7 @@ _evas_canvas3d_object_efl_object_event_callback_priority_add(Eo *obj,
 {
    Eina_Bool r = EINA_FALSE;
 
-   r = efl_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data);
+   r = efl_event_callback_priority_add(efl_super(obj, MY_CLASS), desc, priority, func, user_data);
    evas_canvas3d_object_callback_register(obj, desc->name, user_data);
 
    return r;
@@ -89,7 +89,7 @@ _evas_canvas3d_object_efl_object_event_callback_del(Eo *obj, Evas_Canvas3D_Objec
                                            const void *user_data)
 {
    Eina_Bool r = EINA_FALSE;
-   r = efl_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data);
+   r = efl_event_callback_del(efl_super(obj, MY_CLASS), desc, func, user_data);
    if (r) evas_canvas3d_object_callback_unregister(obj, desc->name);
    return r;
 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c
index 07e63a802d..bcfa90eda4 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.c
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c
@@ -20,14 +20,14 @@ evas_canvas3d_primitive_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE);
    _primitive_init(pd);
 
@@ -37,7 +37,7 @@ _evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive
 EOLIAN static void
 _evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
 {
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 4e5cc39b29..f172188e5e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -37,7 +37,7 @@ _evas_canvas3d_scene_evas_canvas3d_object_change_notify(Eo *eo_obj EINA_UNUSED,
 
    EINA_LIST_FOREACH(pd->images, l, eo)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
         evas_object_change(eo, obj);
      }
 }
@@ -64,14 +64,14 @@ evas_canvas3d_scene_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
 EOLIAN static Eo *
 _evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE);
    evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0);
    pd->shadows_enabled = EINA_FALSE;
@@ -92,14 +92,14 @@ _evas_canvas3d_scene_root_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_C
    if (pd->root_node)
      {
         evas_canvas3d_node_scene_root_del(pd->root_node, obj);
-        eo_unref(pd->root_node);
+        efl_unref(pd->root_node);
      }
 
    pd->root_node = node;
 
    if (node)
      {
-        eo_ref(node);
+        efl_ref(node);
         evas_canvas3d_node_scene_root_add(node, obj);
      }
 
@@ -301,7 +301,7 @@ _pick_data_mesh_add(Evas_Canvas3D_Pick_Data *data, const Evas_Ray3 *ray,
 
    evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
                                               &tex0, &tex1, &tex_weight);
-   Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
+   Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
    if (pdmesh->indices)
      {
         unsigned int i0, i1, i2;
@@ -561,7 +561,7 @@ _node_pick(Evas_Canvas3D_Node *node, void *data)
    Evas_Ray3            ray;
    Evas_Canvas3D_Pick_Data   *pick = (Evas_Canvas3D_Pick_Data *)data;
    Eina_Matrix4            mvp;
-   Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
+   Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
 
    evas_canvas3d_node_tree_traverse(node, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE,
                                  node_aabb_update, NULL);
@@ -630,8 +630,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
    Evas_Canvas3D_Node *picked_node = NULL;
    const Efl_Event_Description *eo_desc = NULL;
 
-   pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
-   e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
+   pd_parent = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
+   e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
 
    _pick_data_init(&data, e, x, y);
    px = round(x * pd->w / e->viewport.w);
@@ -704,8 +704,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
      }
    /* Update the scene graph. */
    evas_canvas3d_object_update((Eo *) obj);
-   pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
-   pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
+   pd_camera_node = efl_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   pd_camera = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
    eina_matrix4_multiply(&data.matrix_vp,
                       &pd_camera->projection,
                       &pd_camera_node->data.camera.matrix_world_to_eye);
@@ -740,15 +740,15 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea
    Evas_Canvas3D_Object_Data *pd_parent;
    Evas_Public_Data *e;
 
-   pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
-   e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
+   pd_parent = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
+   e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
 
    _pick_data_init(&data, e, x, y);
 
    /* Update the scene graph. */
    evas_canvas3d_object_update((Eo *) obj);
-   pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
-   pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
+   pd_camera_node = efl_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
+   pd_camera = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
    eina_matrix4_multiply(&data.matrix_vp,
                       &pd_camera->projection,
                       &pd_camera_node->data.camera.matrix_world_to_eye);
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index d27a803316..0e152e797b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -6,7 +6,7 @@
 static inline void
 _texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Object_Protected_Data *src)
 {
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src)
      {
         proxy_src->proxy_textures = eina_list_append(proxy_src->proxy_textures, texture);
@@ -20,7 +20,7 @@ _texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Obj
 static inline void
 _texture_proxy_unset(Evas_Canvas3D_Texture_Data *texture)
 {
-   Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(texture->source, EFL_CANVAS_OBJECT_CLASS);
 
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src);
      {
@@ -55,8 +55,8 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
    /* Code taken from _proxy_subrender() in file evas_object_image.c */
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(obj, MY_CLASS);
    Evas_Object_Protected_Data *source;
    void *ctx;
    int w, h;
@@ -67,9 +67,9 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
 
    // TODO: replace this function by evas_render_proxy_subrender (as appropriate)
 
-   source = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+   source = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
 
-   is_image = eo_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+   is_image = efl_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
 
    EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write)
      {
@@ -166,11 +166,11 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
    Evas_Canvas3D_Material_Data *material = NULL;
 
    evas = evas_object_evas_get(obj);
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(obj, MY_CLASS);
 
    if (pd->engine_data)
      {
-        Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+        Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
         if (e->engine.func->texture_free)
           e->engine.func->texture_free(e->engine.data.output, pd->engine_data);
         pd->engine_data = NULL;
@@ -181,7 +181,7 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
         it = eina_hash_iterator_key_new(pd->materials);
         EINA_ITERATOR_FOREACH(it, data)
           {
-             material = eo_data_scope_get(data, EVAS_CANVAS3D_MATERIAL_CLASS);
+             material = efl_data_scope_get(data, EVAS_CANVAS3D_MATERIAL_CLASS);
              if (!material) continue;
              for (i = 0; i < EVAS_CANVAS3D_MATERIAL_ATTRIB_COUNT; i++)
                {
@@ -225,8 +225,8 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D
      {
         Eo *evas = NULL;
         evas = evas_object_evas_get(obj);
-        Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
-        Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
+        Evas_Object_Protected_Data *src = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
 
         if (pd->engine_data == NULL)
           {
@@ -270,7 +270,7 @@ void
 evas_canvas3d_texture_material_add(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material)
 {
    int count = 0;
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
    if (pd->materials == NULL)
      {
         pd->materials = eina_hash_pointer_new(NULL);
@@ -292,7 +292,7 @@ void
 evas_canvas3d_texture_material_del(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material)
 {
    int count = 0;
-   Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS);
+   Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
    if (pd->materials == NULL)
      {
         ERR("No material to delete.");
@@ -313,7 +313,7 @@ evas_canvas3d_texture_add(Evas *e)
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
-   Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+   Evas_Object *eo_obj = efl_add(MY_CLASS, e);
    return eo_obj;
 }
 
@@ -321,7 +321,7 @@ evas_canvas3d_texture_add(Evas *e)
 EOLIAN static Eo *
 _evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
 {
-   obj = efl_constructor(eo_super(obj, MY_CLASS));
+   obj = efl_constructor(efl_super(obj, MY_CLASS));
    pd->atlas_enable = EINA_TRUE;
 
    evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE);
@@ -333,7 +333,7 @@ EOLIAN static void
 _evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd  EINA_UNUSED)
 {
    _texture_fini(obj);
-   efl_destructor(eo_super(obj, MY_CLASS));
+   efl_destructor(efl_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -344,7 +344,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd,
    Eo *evas = NULL;
    void *image = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (!pd->engine_data && e->engine.func->texture_new)
      pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
@@ -379,7 +379,7 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c
    void *image;
 
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (!pd->engine_data && e->engine.func->texture_new)
      pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
@@ -407,7 +407,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    Evas_Object_Protected_Data *src;
 
    if (source == pd->source)
@@ -424,7 +424,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
         return;
      }
 
-   src = eo_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS);
+   src = efl_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS);
 
    if (src->delete_me)
      {
@@ -452,7 +452,7 @@ _evas_canvas3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
    if (pd->source == NULL)
      return;
 
-   src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
 
    if (src_obj->proxy->src_invisible == !visible)
      return;
@@ -474,7 +474,7 @@ _evas_canvas3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
    if (pd->source == NULL)
      return EINA_FALSE;
 
-   src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
+   src_obj = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
    return !src_obj->proxy->src_invisible;
 }
 
@@ -484,7 +484,7 @@ _evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D
    Evas_Colorspace format = -1;
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
 
    if (e->engine.func->image_colorspace_get &&
        e->engine.func->texture_image_get)
@@ -503,7 +503,7 @@ _evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, i
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_size_get)
      {
         e->engine.func->texture_size_get(e->engine.data.output,
@@ -516,7 +516,7 @@ _evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Ca
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_wrap_set)
      {
         e->engine.func->texture_wrap_set(e->engine.data.output,
@@ -530,7 +530,7 @@ _evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Ca
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_wrap_set)
      {
         e->engine.func->texture_wrap_get(e->engine.data.output,
@@ -543,7 +543,7 @@ _evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_filter_set)
      {
         e->engine.func->texture_filter_set(e->engine.data.output,
@@ -557,7 +557,7 @@ _evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Textu
 {
    Eo *evas = NULL;
    evas = evas_object_evas_get(obj);
-   Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
    if (e->engine.func->texture_filter_get)
      {
         e->engine.func->texture_filter_get(e->engine.data.output,
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index dd26c2887b..cb79f32b66 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -178,7 +178,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
         if (obj->smart.parent)
           {
              Evas_Object_Protected_Data *smart_parent_obj =
-                eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+                efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
              evas_object_child_map_across_mark
                 (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0, NULL);
           }
@@ -233,7 +233,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
 
    evas_object_async_block(obj);
 
-   clip = eo_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS);
+   clip = efl_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS);
    if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
    if (eo_obj == eo_clip)
      {
@@ -483,7 +483,7 @@ static void
 _clipper_del_cb(void *data, const Eo_Event *event)
 {
    Evas_Object *eo_obj = data;
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
 
    if (!obj) return;
 
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index a0eb26f0ae..0b9a438d78 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -42,12 +42,12 @@ evas_device_add(Evas *eo_e)
 
    SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS, NULL);
 
-   dev = eo_add(EFL_INPUT_DEVICE_CLASS, eo_e);
+   dev = efl_add(EFL_INPUT_DEVICE_CLASS, eo_e);
 
-   d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
    d->evas = eo_e;
 
-   e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    e->devices = eina_list_append(e->devices, dev);
    efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
 
@@ -61,7 +61,7 @@ evas_device_del(Evas_Device *dev)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   eo_unref(dev);
+   efl_unref(dev);
 }
 
 EAPI void
@@ -70,13 +70,13 @@ evas_device_push(Evas *eo_e, Evas_Device *dev)
    SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS);
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e->cur_device)
      {
         e->cur_device = eina_array_new(4);
         if (!e->cur_device) return;
      }
-   eo_ref(dev);
+   efl_ref(dev);
    eina_array_push(e->cur_device, dev);
 }
 
@@ -87,9 +87,9 @@ evas_device_pop(Evas *eo_e)
 
    SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS);
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    dev = eina_array_pop(e->cur_device);
-   if (dev) eo_unref(dev);
+   if (dev) efl_unref(dev);
 }
 
 EAPI const Eina_List *
@@ -101,11 +101,11 @@ evas_device_list(Evas *eo_e, const Evas_Device *dev)
      {
         SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS, NULL);
 
-        Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
         return d->children;
      }
 
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    return e->devices;
 }
 
@@ -114,7 +114,7 @@ evas_device_name_set(Evas_Device *dev, const char *name)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_name_set(dev, name);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -133,7 +133,7 @@ evas_device_description_set(Evas_Device *dev, const char *desc)
 
    efl_input_device_description_set(dev, desc);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
 }
 
@@ -148,8 +148,8 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(d->evas, EVAS_CANVAS_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(d->evas, EVAS_CANVAS_CLASS);
    if (parent)
      {
         SAFETY_CHECK(parent, EFL_INPUT_DEVICE_CLASS);
@@ -159,7 +159,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
    if (d->parent == parent) return;
    if (d->parent)
      {
-        Efl_Input_Device_Data *p = eo_data_scope_get(d->parent, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *p = efl_data_scope_get(d->parent, EFL_INPUT_DEVICE_CLASS);
         p->children = eina_list_remove(p->children, dev);
      }
    else if (parent)
@@ -167,7 +167,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
    d->parent = parent;
    if (parent)
      {
-        Efl_Input_Device_Data *p = eo_data_scope_get(parent, EFL_INPUT_DEVICE_CLASS);
+        Efl_Input_Device_Data *p = efl_data_scope_get(parent, EFL_INPUT_DEVICE_CLASS);
         p->children = eina_list_append(p->children, dev);
      }
    else
@@ -187,7 +187,7 @@ evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
 
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_type_set(dev, clas);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -203,7 +203,7 @@ EAPI void
 evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_subtype_set(dev, clas);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -219,7 +219,7 @@ EAPI void
 evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src)
 {
    SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
-   Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
+   Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
 
    efl_input_device_source_set(dev, src);
    evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -236,11 +236,11 @@ _evas_device_cleanup(Evas *eo_e)
 {
    Evas_Device *dev;
    
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (e->cur_device)
      {
         while ((dev = eina_array_pop(e->cur_device)))
-          eo_unref(dev);
+          efl_unref(dev);
         eina_array_free(e->cur_device);
         e->cur_device = NULL;
      }
@@ -255,7 +255,7 @@ _evas_device_top_get(const Evas *eo_e)
 {
    int num;
    
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (!e->cur_device) return NULL;
    num = eina_array_count(e->cur_device);
    if (num < 1) return NULL;
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 67d4ed9d0c..c0b53480b5 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -31,7 +31,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte
 {
    if (obj->smart.parent)
      {
-        Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *smart_parent_obj = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
         _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed);
      }
 
@@ -132,7 +132,7 @@ _efl_event_desc_get(Evas_Callback_Type type)
    if (_info_pflags) *_info_pflags = efl_event_flags_get(_eoev); \
    } while (0)
 #define EV_RESET(a) do { if (a) efl_event_reset(a); } while (0)
-#define EV_DEL(a) do { if (a) { eo_unref(a); } a = NULL; } while (0)
+#define EV_DEL(a) do { if (a) { efl_unref(a); } a = NULL; } while (0)
 
 #if 0
 # define DDD_DO 1
@@ -456,10 +456,10 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Mouse_Down *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Evas_Object_Protected_Data *child;
    Efl_Event_Pointer *pe = NULL;
@@ -497,7 +497,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
 
    EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
      {
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
             (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
           {
@@ -516,7 +516,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
    copy = evas_event_list_copy(src->proxy->src_event_in);
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         ev->canvas = point;
         _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x,
                                    &ev->canvas.y,
@@ -536,10 +536,10 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Mouse_Move *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->cur.canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -561,7 +561,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
         Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
 
              if ((evas_object_clippers_is_visible(eo_child, child) ||
                  child->mouse_grabbed) &&
@@ -587,7 +587,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
           {
              eo_child = outs->data;
              outs = eina_list_remove(outs, eo_child);
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
              if ((child->mouse_grabbed == 0) && (!e->delete_me))
                {
                   if (child->mouse_in) continue;
@@ -621,7 +621,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
 
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
 
              ev->cur.canvas = point;
 
@@ -667,7 +667,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
         int event_id2 = _evas_event_counter;
         EINA_LIST_FOREACH(ins, l, eo_child)
           {
-              child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+              child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
               if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
                 {
                    if (!child->mouse_in)
@@ -709,10 +709,10 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
                                    Evas_Event_Mouse_Up *ev, int event_id,
                                    Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -731,7 +731,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
         if (src->delete_me) break;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
              (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
             (child->mouse_grabbed > 0))
@@ -764,9 +764,9 @@ static void
 _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev,
                                int event_id, Efl_Event_Hold *parent_he)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *child;
    Efl_Event_Hold *he = NULL;
    Evas_Object *eo_child;
@@ -777,7 +777,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
    EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
      {
         if (src->delete_me) return;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         EV_CALL(eo_child, child, EVAS_CALLBACK_HOLD, ev, event_id, he, parent_he);
         if (src->layer->evas->delete_me) break;
      }
@@ -790,10 +790,10 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
                                 Evas_Event_Mouse_Wheel *ev, int event_id,
                                 Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -810,7 +810,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
         if (src->delete_me) return;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         ev->canvas = point;
         _evas_event_havemap_adjust(eo_child, child,
                                    &ev->canvas.x,
@@ -829,10 +829,10 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Multi_Down *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Precision_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -850,7 +850,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
 
    EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
      {
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
           {
              child->mouse_grabbed += (addgrab + 1);
@@ -868,7 +868,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
                                    &ev->canvas.x,
                                    &ev->canvas.y,
                                    child->mouse_grabbed);
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id, pe, parent_pe);
         if (e->delete_me) break;
      }
@@ -883,10 +883,10 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e,
                                    Evas_Event_Multi_Up *ev, int event_id,
                                    Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Precision_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -905,7 +905,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e,
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
         ev->canvas = point;
-        child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+        child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
         if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
              (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
             (child->mouse_grabbed > 0))
@@ -931,10 +931,10 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                      Evas_Event_Multi_Move *ev, int event_id,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Precision_Point canvas = ev->cur.canvas;
    Efl_Event_Pointer *pe = NULL;
 
@@ -957,7 +957,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
         Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
              if (((evas_object_clippers_is_visible(eo_child, child)) ||
                   ((child->mouse_grabbed) &&
                   (!evas_event_passes_through(eo_child, child)) &&
@@ -969,7 +969,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                              &ev->cur.canvas.x,
                                              &ev->cur.canvas.y,
                                              child->mouse_grabbed);
-                  child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+                  child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
                   EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe);
                   if (e->delete_me || e->is_frozen) break;
                }
@@ -990,7 +990,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
         Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
         EINA_LIST_FOREACH(copy, l, eo_child)
           {
-             child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+             child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
              ev->cur.canvas = point;
 
              if (evas_object_is_in_output_rect(eo_child, child,
@@ -1010,7 +1010,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
                                              &ev->cur.canvas.x,
                                              &ev->cur.canvas.y,
                                              child->mouse_grabbed);
-                  child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
+                  child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
                   EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe);
                   if (e->delete_me || e->is_frozen) break;
                }
@@ -1038,10 +1038,10 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
                                    Evas_Event_Mouse_In *ev, int event_id,
                                    Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
    Evas_Object *eo_child;
@@ -1067,7 +1067,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
    point = ev->canvas;
    EINA_LIST_FOREACH(ins, l, eo_child)
      {
-        Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child,
+        Evas_Object_Protected_Data *child = efl_data_scope_get(eo_child,
                                                         EFL_CANVAS_OBJECT_CLASS);
         if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
           {
@@ -1100,10 +1100,10 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
                                     Evas_Event_Mouse_Out *ev, int event_id,
                                     Efl_Event_Pointer *parent_pe)
 {
-   Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Point canvas = ev->canvas;
    Efl_Event_Pointer *pe = NULL;
    Evas_Object *eo_child;
@@ -1122,7 +1122,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
 
    EINA_LIST_FOREACH(copy, l, eo_child)
      {
-        Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child,
+        Evas_Object_Protected_Data *child = efl_data_scope_get(eo_child,
                                                         EFL_CANVAS_OBJECT_CLASS);
         if (!child->mouse_in) continue;
         child->mouse_in = 0;
@@ -1160,7 +1160,7 @@ _evas_event_object_list_in_get(Evas *eo_e, Eina_List *in,
 static Eina_List *
 _evas_event_objects_event_list_no_frozen_check(Evas *eo_e, Evas_Object *stop, int x, int y)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Layer *lay;
    Eina_List *in = NULL;
 
@@ -1188,7 +1188,7 @@ _evas_canvas_tree_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, E
 Eina_List *
 evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
 
    if ((!e->layers) || (e->is_frozen)) return NULL;
    D("------------------------------GET EVETNS AT ............... %i %i\n", x, y); 
@@ -1247,7 +1247,7 @@ evas_event_thaw(Evas *eo_e)
 EOLIAN void
 _evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e)
 {
-   efl_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   efl_event_freeze(efl_super(eo_e, EVAS_CANVAS_CLASS));
    e->is_frozen = EINA_TRUE;
 }
 
@@ -1255,8 +1255,8 @@ EOLIAN void
 _evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e)
 {
    int fcount = -1;
-   efl_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS));
-   fcount = efl_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS));
+   efl_event_thaw(efl_super(eo_e, EVAS_CANVAS_CLASS));
+   fcount = efl_event_freeze_count_get(efl_super(eo_e, EVAS_CANVAS_CLASS));
    if (0 == fcount)
      {
         Evas_Layer *lay;
@@ -1294,7 +1294,7 @@ evas_event_thaw_eval(Evas *eo_e)
    MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
    return;
    MAGIC_CHECK_END();
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    if (0 == evas_event_freeze_get(eo_e))
      {
         _canvas_event_thaw_eval_internal(eo_e, e);
@@ -1306,7 +1306,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
                                        unsigned int timestamp, const void *data,
                                        Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy;
    Evas_Event_Mouse_Down ev;
@@ -1338,7 +1338,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    _evas_walk(e);
    /* append new touch point to the touch point list */
@@ -1362,7 +1362,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
             (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
           {
@@ -1377,7 +1377,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
      }
    EINA_LIST_FOREACH(copy, l, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if (obj->delete_me) continue;
         ev.canvas.x = e->pointer.x;
         ev.canvas.y = e->pointer.y;
@@ -1394,7 +1394,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
    _evas_post_event_callback_call(eo_e, e);
    /* update touch point's state to EVAS_TOUCH_POINT_STILL */
    _evas_touch_point_update(eo_e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_STILL);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    _evas_unwalk(e);
    EV_DEL(pe);
 }
@@ -1409,7 +1409,7 @@ static int
 _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
                 Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy, *ins, *ll;
    Evas_Event_Mouse_Out ev;
@@ -1431,7 +1431,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
    ev.timestamp = timestamp;
    ev.event_flags = e->default_event_flags;
    ev.dev = _evas_device_top_get(eo_e);
-   if (ev.dev) eo_ref(ev.dev);
+   if (ev.dev) efl_ref(ev.dev);
 
    /* get new list of ins */
    ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y);
@@ -1439,7 +1439,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
    copy = evas_event_list_copy(e->pointer.object.in);
    EINA_LIST_FOREACH(copy, ll, eo_obj)
      {
-        Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+        Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
         if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside))
           {
              if (!obj->mouse_in) continue;
@@ -1483,7 +1483,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
 
         EINA_LIST_FOREACH(ins, l, eo_obj_itr)
           {
-             Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj_itr = efl_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS);
              if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr))
                {
                   if (obj_itr->mouse_in) continue;
@@ -1523,7 +1523,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
      }
    if (e->pointer.inside)
      _canvas_event_feed_mouse_move_internal(eo_e, e, e->pointer.x, e->pointer.y, timestamp, data, pe);
-   if (ev.dev) eo_unref(ev.dev);
+   if (ev.dev) efl_unref(ev.dev);
    EV_DEL(pe);
 
    return post_called;
@@ -1534,7 +1534,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
                                      unsigned int timestamp, const void *data,
                                      Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy;
 
@@ -1568,7 +1568,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
         ev.timestamp = timestamp;
         ev.event_flags = e->default_event_flags;
         ev.dev = _evas_device_top_get(eo_e);
-        if (ev.dev) eo_ref(ev.dev);
+        if (ev.dev) efl_ref(ev.dev);
 
         _evas_walk(e);
         /* update released touch point */
@@ -1576,7 +1576,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
         copy = evas_event_list_copy(e->pointer.object.in);
         EINA_LIST_FOREACH(copy, l, eo_obj)
           {
-             Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+             Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
              if (((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
                  (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
                  (obj->mouse_grabbed > 0))
@@ -1609,7 +1609,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
         eina_list_free(copy);
         e->last_mouse_up_counter++;
         _evas_post_event_callback_call(eo_e, e);
-        if (ev.dev) eo_unref(ev.dev);
+        if (ev.dev) efl_unref(ev.dev);
      }
 
    if (e->pointer.mouse_grabbed == 0)
@@ -1639,7 +1639,7 @@ static void
 _canvas_event_feed_mouse_cancel_internal(Eo *eo_e, unsigned int timestamp, const void *data,
                                          Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Evas_Coord_Touch_Point *point;
    Eina_List *l, *ll;
    Evas_Event_Flags flags;
@@ -1679,7 +1679,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, int direction, int z,
                                         unsigned int timestamp, const void *data,
                                         Efl_Event_Pointer *parent_pe)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
+   Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    Efl_Event_Pointer *pe = NULL;
    Eina_List *l, *copy;
    Evas_Event_Mouse_Wheel ev;
@@ -1704,14 +1704,14 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, int direction, int z,
    ev.timestamp = timestamp;