Move to EFL 1.12 interface.

79 files changed, 168 insertions, 168 deletions

diff --git a/configure.ac b/configure.ac
index bccd4ce..a667680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ esac
 
 # EFL dependencies
 
-PKG_CHECK_MODULES([EFL], eina >= 1.7.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
+PKG_CHECK_MODULES([EFL], eina >= 1.7.99 efl >= 1.11.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
 
 EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index d8d1361..4cc7de8 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("bar.png"), NULL),
+              efl_file_set(build_path("bar.png"), NULL),
               evas_obj_image_border_set(6, 6, 6, 6),
               evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 5079bb7..f8a7863 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("pan.png"), NULL),
+              efl_file_set(build_path("pan.png"), NULL),
               evas_obj_color_set(64, 64, 64, 255),
               evas_obj_image_border_set(3, 3, 3, 3),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 8b2f9a4..ddfae29 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 6796b16..a6a476a 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         a = rnd()&0xff;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_color_set(a, a, a, a),
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 380e7ac..571c388 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -31,8 +31,8 @@ static void _setup(void)
         w = 3 + ((n * (60 - 3)) / 100);
         h = 4 + ((n * (80 - 4)) / 100);
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_smooth_scale_set(1),
+              efl_file_set(build_path("logo.png"), NULL),
+              efl_image_smooth_scale_set(1),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 52b0b09..c70f20b 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_smooth_scale_set(0),
+              efl_file_set(build_path("logo.png"), NULL),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 0b32d37..95ce610 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_smooth_scale_set(0),
+              efl_file_set(build_path("logo.png"), NULL),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 2751315..b979feb 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
-              evas_obj_image_smooth_scale_set(0),
+              efl_file_set(build_path("image.png"), NULL),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 9aa06de..41c8f35 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
-              evas_obj_image_smooth_scale_set(0),
+              efl_file_set(build_path("image.png"), NULL),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index e62e520..3510450 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -37,7 +37,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index b36830e..a454eff 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
+             eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
+                   efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 6ac4388..9beef4e 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 09feea6..b918d54 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 9dea32d..5f0f425 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -37,7 +37,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 245a5b3..1699edd 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 9bde567..264ebe7 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index ee25519..7306698 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 5820130..f083a7b 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -37,7 +37,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 784f0db..076fd0b 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 0119a72..1e34dbc 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 25bed57..4cce7f8 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
           }
         else
           {
@@ -40,7 +40,7 @@ static void _setup(void)
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
              eo_do(o,
-                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   efl_file_set(build_path("image.png"), NULL),
                    evas_obj_position_set(x, y));
           }
         eo_do(o,
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index ff0bdd5..ac28e68 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_smooth_scale_set(1),
+              efl_file_set(build_path("logo.png"), NULL),
+              efl_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 6247db1..b96b911 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_smooth_scale_set(1),
+              efl_file_set(build_path("logo.png"), NULL),
+              efl_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 1f24762..783a648 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
-              evas_obj_image_smooth_scale_set(1),
+              efl_file_set(build_path("image.png"), NULL),
+              efl_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index d7da8cf..654995f 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
-              evas_obj_image_smooth_scale_set(1),
+              efl_file_set(build_path("image.png"), NULL),
+              efl_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 752bbe5..69cf05c 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("frame.png"), NULL),
+              efl_file_set(build_path("frame.png"), NULL),
               evas_obj_image_border_set(8, 8, 8, 8),
               evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 4d33565..8215814 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 5331f39..1815177 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160));
         a = rnd()&0xff;
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 72e8850..c7fe4da 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("bar.png"), NULL),
+              efl_file_set(build_path("bar.png"), NULL),
               evas_obj_image_border_set(6, 6, 6, 6),
               evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index d5c8a19..2e5fa59 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_border_set(43, 48, 48, 83),
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index fbe7fb3..73f3b00 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index fdd56d1..f12974e 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -26,7 +26,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index c0f6e2d..2159cb1 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -25,7 +25,7 @@ static void _setup(void)
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
    eo_do(o,
-         evas_obj_image_file_set(build_path("im1.png"), NULL),
+         efl_file_set(build_path("im1.png"), NULL),
          evas_obj_image_fill_set(0, 0, 720, 420),
          evas_obj_size_set(720, 420),
          evas_obj_visibility_set(EINA_TRUE));
@@ -33,7 +33,7 @@ static void _setup(void)
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
    eo_do(o,
-         evas_obj_image_file_set(build_path("im2.png"), NULL),
+         efl_file_set(build_path("im2.png"), NULL),
          evas_obj_image_fill_set(0, 0, 720, 420),
          evas_obj_size_set(720, 420),
          evas_obj_visibility_set(EINA_TRUE));
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 dc02971..2800955 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -36,7 +36,7 @@ static void _setup(void)
               evas_obj_image_alpha_set(0),
               evas_obj_image_fill_set(0, 0, 640, 480),
               evas_obj_size_set(640, 480),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index f6aed3a..803e4b1 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index b1e0efe..29e2229 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -58,7 +58,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index c296818..4b2d471 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 13547bb..323d35f 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -58,7 +58,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 606eb18..cb1f5f6 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 720, 420),
               evas_obj_size_set(720, 420),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index ec4693b..8954c02 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 720, 420),
               evas_obj_size_set(720, 420),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 2f373f4..f2cdf7a 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -33,20 +33,20 @@ static void _setup(void)
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         eo_do(o,
-              evas_obj_image_file_set(build_path(buf), NULL),
+              efl_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index c9dfafb..a27addd 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
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 e44b31d..1f8f27b 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 20677f2..40d1f49 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 107e663..7552048 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index e9dfdcd..c09ae09 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 0037a9b..e7fcf7c 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 81ff4ab..7f4969a 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 45e2ed3..8040da3 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index a71fc62..7c98d1f 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index e94f84d..0a37dd4 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
-              evas_obj_image_smooth_scale_set(0),
+              efl_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 921522e..58cad97 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+        eo_do(o, efl_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index d9b61bb..104dd4d 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o,
-              evas_obj_image_file_set(build_path("image.png"), NULL),
+              efl_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index ba21f73..9f9b775 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
+        eo_do(o, efl_file_set(build_path("tp.png"), NULL),
                  evas_obj_image_fill_set(0, 0, 640, 480),
                  evas_obj_size_set(640, 480),
                  evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index e61d721..a768c50 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -24,7 +24,7 @@ static void _setup(void)
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_do(o,
-         evas_obj_image_file_set(build_path("logo.png"), NULL),
+         efl_file_set(build_path("logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
          evas_obj_size_set(120, 160),
          evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 0585c06..45b4f2c 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
-   eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+   eo_do(o, efl_file_set(build_path("logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
          evas_obj_size_set(120, 160),
          evas_obj_position_set(-400, -300));
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 073202d..8443e4b 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -30,8 +30,8 @@ static void _setup(void)
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         eo_do(o,
-              evas_obj_text_font_set("Vera-Bold", 20),
-              evas_obj_text_set("This is a test string"),
+              efl_text_properties_font_set("Vera-Bold", 20),
+              efl_text_set("This is a test string"),
               evas_obj_text_style_set(st),
               evas_obj_color_set(255, 255, 255, 255),
               evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 6822963..81105f5 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -39,8 +39,8 @@ static void _setup(void)
             strs[rnd() % (sizeof(strs) / sizeof(char *))]);
 
    eo_do(o,
-         evas_obj_text_font_set("Vera-Bold", 20),
-         evas_obj_text_set(buf),
+         efl_text_properties_font_set("Vera-Bold", 20),
+         efl_text_set(buf),
          evas_obj_color_set(0, 0, 0, 255),
          evas_obj_size_get(&w, &h));
    x = (win_w / 2) - (w / 2);
@@ -93,7 +93,7 @@ static void _loop(double t, int f)
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))]);
    eo_do(o_texts[0],
-         evas_obj_text_set(buf),
+         efl_text_set(buf),
          evas_obj_size_get(&w, &h));
    for (i = 1; i < OBNUM; i++)
      {
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index b331d6f..be51708 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -27,8 +27,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-              evas_obj_text_set("This is a test string"),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
+              efl_text_set("This is a test string"),
               evas_obj_color_set(0, 0, 0, 255),
               evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index fe725a7..25db3cf 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,13 +34,13 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-        eo_do(o, evas_obj_text_set(buf),
+        eo_do(o, efl_text_set(buf),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_size_get(&w, &h));
         x = (win_w / 2) - (w / 2);
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-        eo_do(o_texts[i], evas_obj_text_set(buf));
+        eo_do(o_texts[i], efl_text_set(buf));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index ad893fc..5d5fc25 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -30,8 +30,8 @@ static void _setup(void)
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         eo_do(o,
-              evas_obj_text_font_set("Vera-Bold", 20),
-              evas_obj_text_set("This is a test string"),
+              efl_text_properties_font_set("Vera-Bold", 20),
+              efl_text_set("This is a test string"),
               evas_obj_text_style_set(st),
               evas_obj_color_set(255, 255, 255, 255),
               evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 6eb16ca..187c0f5 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,13 +36,13 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-        eo_do(o, evas_obj_text_set(buf),
+        eo_do(o, efl_text_set(buf),
                  evas_obj_text_style_set(st),
                  evas_obj_color_set(255, 255, 255, 255),
                  evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 5e228d2..bffc831 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test,
    mi = malloc(sizeof(Menu_Item));
    mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(mi->o_icon);
-   eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL),
+   eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
          evas_obj_size_set(32, 32),
          evas_obj_image_fill_set(0, 0, 32, 32));
    mi->test = test;
@@ -412,8 +412,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
 
    o = eo_add(EVAS_TEXT_CLASS, evas);
    eo_unref(o);
-   eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-         evas_obj_text_set("EXPEDITE"),
+   eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+         efl_text_set("EXPEDITE"),
          evas_obj_layer_set(100),
          evas_obj_color_set(0, 0, 0, 100),
          evas_obj_pass_events_set(1),
@@ -426,8 +426,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
 
    o = eo_add(EVAS_TEXT_CLASS, evas);
    eo_unref(o);
-   eo_do(o, evas_obj_text_font_set("Vera", 9),
-         evas_obj_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
+   eo_do(o, efl_text_properties_font_set("Vera", 9),
+         efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
          evas_obj_layer_set(100),
          evas_obj_color_set(0, 0, 0, 60),
          evas_obj_pass_events_set(1),
@@ -441,7 +441,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
-         evas_obj_image_file_set(build_path("e-logo.png"), NULL),
+         efl_file_set(build_path("e-logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
          evas_obj_size_set(120, 160),
          evas_obj_layer_set(-98),
@@ -460,7 +460,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(0, 0),
-         evas_obj_image_file_set(build_path("icon_sel.png"), NULL),
+         efl_file_set(build_path("icon_sel.png"), NULL),
          evas_obj_size_set(48, 48),
          evas_obj_image_fill_set(0, 0, 48, 48));
    o_menu_icon_sel = o;
@@ -468,7 +468,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    eo_do(o, evas_obj_position_set(0, 0),
-         evas_obj_image_file_set(build_path("text_sel.png"), NULL),
+         efl_file_set(build_path("text_sel.png"), NULL),
          evas_obj_size_set(96, 32),
          evas_obj_image_fill_set(0, 0, 96, 32),
          evas_obj_image_border_set(7, 7, 7, 7));
@@ -476,8 +476,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
 
    o = eo_add(EVAS_TEXT_CLASS, evas);
    eo_unref(o);
-   eo_do(o, evas_obj_text_font_set("Vera", 10),
-         evas_obj_text_set(""),
+   eo_do(o, efl_text_properties_font_set("Vera", 10),
+         efl_text_set(""),
          evas_obj_color_set(0, 0, 0, 100),
          evas_obj_pass_events_set(1),
          evas_obj_size_get(&w, &h));
@@ -610,7 +610,7 @@ ui_loop(void *data EINA_UNUSED)
 
                   o = o_menu_title;
                   eo_do(o, evas_obj_color_set(a, a, a, a),
-                        evas_obj_text_set(mi->text),
+                        efl_text_set(mi->text),
                         evas_obj_size_get(&tw, &th));
                   x = (win_w - tw) / 2;
                   y = (win_h / 2) + len + 48;
@@ -628,7 +628,7 @@ ui_loop(void *data EINA_UNUSED)
 
                   o = o_menu_icon;
                   snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
-                  eo_do(o, evas_obj_image_file_set(buf, NULL),
+                  eo_do(o, efl_file_set(buf, NULL),
                         evas_obj_color_set(a / 2, a / 2, a / 2, a / 2));
                }
              i++;
@@ -649,7 +649,7 @@ ui_menu(void)
 {
    eo_do(o_title, evas_obj_visibility_set(EINA_TRUE));
    eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE),
-         evas_obj_text_set
+         efl_text_set
          ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."));
    menu_active = 1;
    key_func = NULL;
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index b8d0b5a..6805d3d 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -48,15 +48,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                    evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                    evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                    evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(icons[i % 13]),
                  evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW),
                  evas_obj_color_set(255, 255, 255, 255),
                  evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index 3bfea5f..b3e2c0e 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -48,15 +48,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(icons[i % 13]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index dcf58c3..0c35a9b 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -48,15 +48,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-              evas_obj_text_set(icons[i % 13]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+              efl_text_set(icons[i % 13]),
               evas_obj_color_set(0, 0, 0, 255),
               evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 67390e8..983b0d8 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -33,15 +33,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 1]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(icons[i % 1]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 4c9f60a..23405be 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -33,15 +33,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 1]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(icons[i % 1]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index ca25f6d..86f71aa 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -48,15 +48,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(icons[i % 13]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 1855431..b186f43 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -48,15 +48,15 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+        eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
                  evas_obj_size_set(ICON_SIZE, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(icons[i % 13]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(icons[i % 13]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 7dbb9bb..546ee90 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -66,14 +66,14 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index def042c..5c4449d 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -66,14 +66,14 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 6b29bfe..7c5875f 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -66,14 +66,14 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 6148364..08de68d 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -66,14 +66,14 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index e6df6c1..0f0049f 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -87,7 +87,7 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
@@ -95,14 +95,14 @@ static void _setup(void)
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+                 efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 08df2bf..aaf5f39 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -87,7 +87,7 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
@@ -95,14 +95,14 @@ static void _setup(void)
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+                 efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 858d4ec..2211c17 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -87,7 +87,7 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
@@ -95,14 +95,14 @@ static void _setup(void)
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+                 efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 53d3a83..381b887 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -87,7 +87,7 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 efl_file_set(build_path("pan.png"), NULL),
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
@@ -95,14 +95,14 @@ static void _setup(void)
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
-                 evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+                 efl_file_set(build_path(icons[i % 13]), NULL),
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
-                 evas_obj_text_set(labels[i % 26]),
+        eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
+                 efl_text_set(labels[i % 26]),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_visibility_set(EINA_TRUE));
      }