fix eo break.

Its api are still unstable. make it work again.

113 files changed, 286 insertions, 286 deletions

diff --git a/src/bin/about.c b/src/bin/about.c
index 46e18fa..c5a780f 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -49,7 +49,7 @@ _setup(void)
 static void
 _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
    o_text = NULL;
 }
 
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 2c18889..eb05518 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         efl_image_border_set(o, 6, 6, 6, 6);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 853f165..ebdbc77 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_color_set(o, 64, 64, 64, 255);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index ac1f71b..0e76376 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index f501049..53d436e 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,7 +24,7 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
         efl_file_set(o, build_path("logo.png"), NULL);
@@ -40,7 +40,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 7ed0300..ca2257a 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < MANYNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < MANYNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 5d87368..10d57d3 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 80a2a64..8f4b1bb 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index bd207e4..d95ac47 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 97bed05..9ce4919 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index c83901d..b530c07 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index db448b5..e48a27f 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 79c2ba7..94d4255 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 3918fcf..d7f538e 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index c25620b..4d2d3d5 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 1f6ff17..4b73cfe 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index f5ca31d..9d661d4 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 7f515fa..3c4310b 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index c36b694..7423975 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index c0078d9..0a122d4 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index badd9a5..ab3617e 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 5689be1..4479343 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 9318df1..6a84b35 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index f777ff2..3888efb 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index b34e8d3..00cdb36 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index e99a94a..bc32293 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 36bc01b..eca9176 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("frame.png"), NULL);
         efl_image_border_set(o, 8, 8, 8, 8);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index b119da9..148ee12 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index db108d1..f861222 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index ad33287..f1c5011 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         efl_image_border_set(o, 6, 6, 6, 6);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index cb74a54..db0b341 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index cf8cd92..0f31d2b 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 6eb4dfe..7e656ac 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index dbbb28b..7eb1606 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,14 +22,14 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
    efl_file_set(o, build_path("im1.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
    efl_gfx_size_set(o, 720, 420);
    efl_gfx_visible_set(o, EINA_TRUE);
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
    efl_file_set(o, build_path("im2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 2; i++) eo_del(o_images[i]);
+   for (i = 0; i < 2; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 9ebf5e0..b96ab75 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -27,7 +27,7 @@ static void _setup(void)
    pixels = malloc(sizeof (int) * 640 * 480);
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 8b88394..0493c95 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -27,7 +27,7 @@ static void _setup(void)
    pixels = malloc(sizeof (int) * 640 * 480);
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 1);
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index 526d4c2..2138de3 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -77,7 +77,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    // FIXME: the object is not destroyed anymore so we can't free the data
    /* free(yp); */
    /* free(up); */
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 93417da..3dee9f8 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index cb0ad52..8c936f6 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 963e30b..b7a4396 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index abc2732..4d528e9 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index f83a546..587be91 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -169,7 +169,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index fd842c3..83f7026 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -163,7 +163,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index b06e700..04b7f81 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -161,7 +161,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 2adc07f..66a3710 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 7394971..9ec1efe 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -168,7 +168,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index b1aca66..378b127 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         char buf[256];
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -38,7 +38,7 @@ static void _setup(void)
         efl_image_smooth_scale_set(o, 0);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -56,8 +56,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < CNUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_reflec[i]);
+        efl_del(o_images[i]);
+        efl_del(o_reflec[i]);
      }
 }
 
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 5af331b..3ca4c8b 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index f60137f..bf2085a 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index f4c85ab..f0a7599 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 5887202..f456325 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 5a888f3..0c3e13a 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 1408e50..288ef6f 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 0ce0f44..01dcfc1 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 592b2c6..ab5515a 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index 662d490..d080bc0 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index a23b309..5499121 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index c192ea8..6ed37ab 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index f673cfc..08ece39 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 2c041d5..9d51f26 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("e-logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 4421d8a..41b86eb 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 7449ec7..2626cd2 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index 307ef49..821fb5b 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 0d4fa2c..175cb41 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index bf74171..ef38394 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 75f9d80..4e45e32 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index deea90b..c4a01aa 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index f4b0734..facdf61 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index cf5292d..d24bba4 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index b1701a9..8a85596 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index d2dbc57..8d586f7 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 500, 444);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 499e6ce..4d5ac81 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 500, 444);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
-   eo_del(o_mask);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
+   efl_del(o_mask);
 }
 
 /* loop - do things */
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 1f7e9fe..4eda01f 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("tp.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 640, 480);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 1492ca9..dab8ef0 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 #define PI (double) 3.141592654
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 269dacf..3bc3ca7 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -68,7 +68,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_POLYGON_CLASS, evas);
+        o = efl_add(EFL_CANVAS_POLYGON_CLASS, evas);
         o_images[i] = o;
         a = (rnd()&0xff) / 2;
         r = ((rnd()&0xff) * a) / 255;
@@ -85,7 +85,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 95cd4cf..3538877 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -22,7 +22,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_file_set(o, build_path("logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
    efl_gfx_size_set(o, 120, 160);
@@ -32,7 +32,7 @@ static void _setup(void)
 
    for (i = 1; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_images[i] = o;
         efl_canvas_proxy_source_set(o, src);
         efl_gfx_size_set(o, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 9d77179..66d6fee 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -45,7 +45,7 @@ static void _setup(void)
    for (  ; i < OBNUM ; i ++)
      {
         s = o_texts[i % st];
-        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_texts[i] = o;
         efl_canvas_proxy_source_set(o, s);
         /* FIXME s == NULL*/
@@ -62,7 +62,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index c7a5d66..453b3b8 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -50,7 +50,7 @@ static void _setup(void)
    efl_gfx_visible_set(o, EINA_TRUE);
    for (i = 1  ; i < OBNUM ; i ++)
      {
-        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_texts[i] = o;
         efl_canvas_proxy_source_set(o, o_texts[0]);
         efl_gfx_size_get(o_texts[0], &w, &h);
@@ -71,7 +71,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index a199668..abaea7f 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
         r = ((rnd()&0xff) * a) / 255;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 0df2b35..3277454 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
         r = ((rnd()&0xff) * a) / 255;
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 411a521..79b65cd 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
         o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 22f4452..adf9f48 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
         o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 1f08255..60b8d8c 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
         o_images[i] = o;
         a = 0xff;
         r = ((rnd()&0xff) * a) / 255;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 7871ab1..6e8e582 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
         o_images[i] = o;
         a = 0xff;
         r = ((rnd()&0xff) * a) / 255;
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index ff9a755..ce764c1 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -54,7 +54,7 @@ static void _setup(void)
      {
         Evas_Coord tw, th, cent;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -85,7 +85,7 @@ static void _setup(void)
       "blur { 5, dst = a, color = '#ff0' }"
      ;
 
-   o = eo_add(EFL_CANVAS_SNAPSHOT_CLASS, evas);
+   o = efl_add(EFL_CANVAS_SNAPSHOT_CLASS, evas);
    o_snap = o;
    efl_gfx_visible_set(o, EINA_TRUE);
    efl_gfx_position_set(o, 50, 50);
@@ -102,10 +102,10 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
-   eo_del(o_snap);
+   efl_del(o_snap);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index df6ca78..b72d2a9 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index c3cc4d0..0ad1321 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -57,7 +57,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index e313e9e..58ce358 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 88d7400..8d074ed 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -60,7 +60,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index 62a593a..400adeb 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -58,7 +58,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 35cf8fa..38d6b49 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -119,7 +119,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index a598e56..398754c 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -90,7 +90,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
 }
 
 /* loop - do things */
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 4f11d54..7ab9d19 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -102,7 +102,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
    o_text = NULL;
 }
 
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 824e33e..fad356f 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test,
    Menu_Item *mi;
 
    mi = malloc(sizeof(Menu_Item));
-   mi->o_icon = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_file_set(mi->o_icon, build_path(icon), NULL);
    efl_gfx_size_set(mi->o_icon, 32, 32);
    efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32);
@@ -376,11 +376,11 @@ _ui_menu_item_full_add(Eina_Bool test,
 
 #define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func)
 
-EO_CALLBACKS_ARRAY_DEFINE(ui_callbacks,
-                          { EFL_EVENT_KEY_DOWN, _ui_key },
-                          { EFL_EVENT_POINTER_DOWN, _ui_mouse_down },
-                          { EFL_EVENT_POINTER_UP, _ui_mouse_up },
-                          { EFL_EVENT_POINTER_MOVE, _ui_mouse_move });
+EFL_CALLBACKS_ARRAY_DEFINE(ui_callbacks,
+                           { EFL_EVENT_KEY_DOWN, _ui_key },
+                           { EFL_EVENT_POINTER_DOWN, _ui_mouse_down },
+                           { EFL_EVENT_POINTER_UP, _ui_mouse_up },
+                           { EFL_EVENT_POINTER_MOVE, _ui_mouse_move });
 
 void
 ui_setup(unsigned int ui_w, unsigned int ui_h)
@@ -391,17 +391,17 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    win_w = ui_w;
    win_h = ui_h;
 
-   o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_gfx_size_set(o, win_w, win_h);
    efl_gfx_color_set(o, 0, 0, 0, 0);
    efl_gfx_stack_layer_set(o, 1000);
    evas_object_focus_set(o, 1);
    efl_gfx_visible_set(o, EINA_TRUE);
-   eo_event_callback_array_add(o, ui_callbacks(), NULL);
+   efl_event_callback_array_add(o, ui_callbacks(), NULL);
    o_bg = o;
 
-   o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_gfx_size_set(o, win_w, win_h);
    efl_gfx_color_set(o, 255, 255, 255, 255);
@@ -435,7 +435,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_byline = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2));
    efl_file_set(o, build_path("e-logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -445,21 +445,21 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_menu_logo = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, win_w - 128, - 128);
    efl_gfx_fill_set(o, 0, 0, 256, 256);
    efl_gfx_size_set(o, 256, 256);
    efl_gfx_visible_set(o, EINA_TRUE);
    o_menu_icon = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_file_set(o, build_path("icon_sel.png"), NULL);
    efl_gfx_size_set(o, 48, 48);
    efl_gfx_fill_set(o, 0, 0, 48, 48);
    o_menu_icon_sel = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_file_set(o, build_path("text_sel.png"), NULL);
    efl_gfx_size_set(o, 96, 32);
diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c
index 73bb9dd..993b811 100644
--- a/src/bin/vg_basic_circle.c
+++ b/src/bin/vg_basic_circle.c
@@ -30,7 +30,7 @@ static void _setup(void)
         Eo *vector;
         double r = 35, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, r * 2 + stroke_w * 2, r * 2 + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        circle = eo_add(EFL_VG_SHAPE_CLASS, root);
+        circle = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_circle(circle, r + stroke_w, r + stroke_w, r);
         efl_gfx_shape_stroke_width_set(circle, stroke_w);
         efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128);
@@ -52,7 +52,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c
index b4346cd..da25236 100644
--- a/src/bin/vg_basic_gradient.c
+++ b/src/bin/vg_basic_gradient.c
@@ -36,7 +36,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         efl_gfx_gradient_stop_set(gradient, stops, 3);
         efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
         efl_gfx_gradient_linear_start_set(gradient, 10, 10);
         efl_gfx_gradient_linear_end_set(gradient, 50, 50);
 
-        rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+        rect = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_vg_shape_fill_set(rect, gradient);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
@@ -65,7 +65,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c
index be0b5d8..58318b7 100644
--- a/src/bin/vg_basic_rect.c
+++ b/src/bin/vg_basic_rect.c
@@ -30,7 +30,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+        rect = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
         efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
@@ -52,7 +52,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
index 451022f..6fd521b 100644
--- a/src/bin/vg_scaled.c
+++ b/src/bin/vg_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_objects[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        o_gradient[i] = gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        o_gradient[i] = gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         efl_gfx_gradient_stop_set(gradient, stops, 3);
         efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
         efl_gfx_gradient_linear_start_set(gradient, 10, 10);
         efl_gfx_gradient_linear_end_set(gradient, 50, 50);
 
-        o_shapes[i] = rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+        o_shapes[i] = rect = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_vg_shape_fill_set(rect, gradient);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
@@ -67,7 +67,7 @@ static void _cleanup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_del(o_objects[i]);
+        efl_del(o_objects[i]);
         o_objects[i] = NULL;
      }
 }
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 367d07e..93633fb 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -71,8 +71,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index bcfe230..e66480f 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 75a929b..724e7f5 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -78,8 +78,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 83dfeac..1a42604 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,7 +31,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 1]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -54,8 +54,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 3bcc64d..59af84c 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -31,7 +31,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 1]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -58,8 +58,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index b98c38a..8f06902 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 0c6b923..3fe43ed 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 4a9155a..a1377ef 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
@@ -85,8 +85,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 937727b..34e9ec7 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
@@ -93,8 +93,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index a942052..4338d06 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
@@ -85,8 +85,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index ec65e20..151172b 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
@@ -93,8 +93,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index c5ce307..61075c7 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -83,14 +83,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -113,9 +113,9 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_icons[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_icons[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 60582d1..734ba5f 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -83,14 +83,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -130,9 +130,9 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_icons[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_icons[i]);
+        efl_del(o_texts[i]);
      }
 }
 
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 4d58c75..ef26f69 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -83,14 +83,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -111,9 +111,9 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
-   for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < NUM; i++) efl_del(o_images[i]);
+   for (i = 0; i < NUM; i++) efl_del(o_icons[i]);
+   for (i = 0; i < NUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index ac64c93..7afa4ee 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -83,14 +83,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         efl_image_border_set(o, 2, 2, 2, 2);
         efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -129,9 +129,9 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
-        eo_del(o_icons[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_images[i]);
+        efl_del(o_icons[i]);
+        efl_del(o_texts[i]);
      }
 }