diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 8471b04..f6a906d 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(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index b8bd673..5ea4a33 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(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 735226e..e5c846e 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(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index a26fb6b..3df015f 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(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 8e976b7..3b5102e 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(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index af98b49..c87f6ed 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(EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 36286b7..f8353cd 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -391,7 +391,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    win_w = ui_w;
    win_h = ui_h;
 
-   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   o = eo_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);
@@ -401,7 +401,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    eo_event_callback_array_add(o, ui_callbacks(), NULL);
    o_bg = o;
 
-   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   o = eo_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);