diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index df2b4ab..e3ba82a 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -32,9 +32,9 @@ static void _setup(void)
 
    for (i = 1; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
-	o_images[i] = o;
-        evas_obj_image_source_set(o, src);
+        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o_images[i] = o;
+        efl_canvas_proxy_source_set(o, src);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 5e4fb80..626b7d0 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -35,9 +35,9 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM / 2; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_images[i] = o;
-        evas_obj_image_source_set(o, src, NULL);
+        efl_canvas_proxy_source_set(o, src, NULL);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 0d8ec83..01ce228 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -44,10 +44,10 @@ static void _setup(void)
 
    for (  ; i < OBNUM ; i ++)
      {
-	s = o_texts[i % st];
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
-	o_texts[i] = o;
-        evas_obj_image_source_set(o, s);
+        s = o_texts[i % st];
+        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o_texts[i] = o;
+        efl_canvas_proxy_source_set(o, s);
         /* FIXME s == NULL*/
         efl_gfx_size_get(s, &w, &h);
         efl_gfx_size_set(o, w, h);
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index eed870c..0d58c4a 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -50,9 +50,9 @@ static void _setup(void)
    efl_gfx_visible_set(o, EINA_TRUE);
    for (i = 1  ; i < OBNUM ; i ++)
      {
-	o = eo_add(EVAS_IMAGE_CLASS, evas);
-	o_texts[i] = o;
-	evas_obj_image_source_set(o, o_texts[0]);
+        o = eo_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);
 	efl_gfx_size_set(o, w, h);
 	efl_gfx_fill_set(o, 0, 0, w, h);