diff --git a/src/bin/about.c b/src/bin/about.c
index 1023b9a..a6a7b5d 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,7 +8,7 @@ _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    if (o)
 	eo_do(o, evas_obj_position_set(10, 40),
             evas_obj_size_set(win_w - 20, win_h - 50),
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 103c70c..ff2dfee 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 3b03606..54527f8 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index c061c96..3aab91d 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index b489238..06e4980 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 2f56d8a..eb29468 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index bc5903a..9567181 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 0faf59f..ad84c44 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 3c46fbc..048b77f 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 5196aff..1dc759a 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index f28a980..8428973 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index c3f9ab8..02a1c02 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 2a396d9..d39b169 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 09428df..15013f8 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 95fe06c..9463c00 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 7086a38..247784d 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index ed7bee5..3fb7126 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 7d91162..204d418 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index c464d80..629fbcb 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 9ea8778..25dc0f2 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 9ab2ab1..96c873b 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 3aedd91..097d20b 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index ddf1b43..7fe2287 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index e93babf..0c302a8 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index a62421f..df61030 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index b902d73..2ea4525 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index e9e3e4d..62ab251 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 19e3227..54b4f0f 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 001d942..f2cf861 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index da53f69..8e5c7de 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index a914f25..7163a1b 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 895b3fa..bec8612 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 8ec102a..5652e60 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 20453b3..787e27c 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,7 +22,7 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
    if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
@@ -30,7 +30,7 @@ static void _setup(void)
             evas_obj_size_set(720, 420),
             evas_obj_visibility_set(EINA_TRUE));
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
    if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 6a9e9c2..33b88c3 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 1a1087a..48757d4 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index 60a9d96..c36ce9d 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -28,7 +28,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
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 f55b14b..b018637 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -28,7 +28,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index e652c33..0ee2d25 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -28,7 +28,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 52090e2..b01d894 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -28,7 +28,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 46196cd..a2fedca 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         if (o)
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index aca5e85..4b8f201 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         if (o)
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 4cc2ab4..8bf3d1f 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         if (o)
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 994a952..4923fe7 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         if (o)
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index a763be3..0adfa95 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         if (o)
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 0887430..4888eba 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         if (o)
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 1bf0249..468f971 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         if (o)
@@ -39,7 +39,7 @@ static void _setup(void)
                  evas_obj_image_smooth_scale_set(0),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         if (o)
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 61728f6..1180793 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
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 b8e868d..3a8f39c 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 441bbcb..87a81eb 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 53aa001..38418db 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 9307b2c..a15ff63 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 85b38c0..5912f44 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index be909b3..1a4d002 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index b88488c..9d2f0a3 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index ee9ce78..54a5ae7 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 8e17bad..11e5bd6 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index eebf68a..c557c14 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 28da7af..c23f3c7 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(EVAS_OBJ_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 9804a3d..f5dadce 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(EVAS_OBJ_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
         if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index dedc471..9ee5e18 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-        o = eo_add(EVAS_OBJ_LINE_CLASS, evas);
+        o = eo_add(EVAS_LINE_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 4e0101c..5aa8340 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -73,7 +73,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-        o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
+        o = eo_add(EVAS_POLYGON_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index d539255..600a5d4 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(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
             evas_obj_image_fill_set(0, 0, 120, 160),
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 1; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
 	if (o)
 	eo_do(o, evas_obj_image_source_set(src),
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index be9598f..ee53d8e 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -26,7 +26,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
             evas_obj_image_fill_set(0, 0, 120, 160),
@@ -36,7 +36,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM / 2; i++)
      {
-	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
 	if (o)
 	eo_do(o, evas_obj_image_source_set(src, NULL),
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 3b8d8c8..43b251b 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -27,7 +27,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
      {
-	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
@@ -46,7 +46,7 @@ static void _setup(void)
    for (  ; i < OBNUM ; i ++)
      {
 	s = o_texts[i % st];
-	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_image_source_set(s));
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 812ba2f..6c88d39 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -30,7 +30,7 @@ static void _setup(void)
 	"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
    };
    srnd();
-   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    o_texts[0] = o;
    if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
@@ -55,7 +55,7 @@ static void _setup(void)
 	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
    for (i = 1  ; i < OBNUM ; i ++)
      {
-	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_image_source_set(o_texts[0]));
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index dc5c8ee..d7cc901 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_OBJ_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_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 ca99d20..11b4281 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_OBJ_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_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 dc1bf84..325f717 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_OBJ_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_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 1c1c2f9..db23e26 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_OBJ_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_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 98ecba7..aa1305d 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_OBJ_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_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 7e0e667..8e4227d 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_OBJ_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 12f21af..8900574 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -25,7 +25,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 9dde5ca..decedd7 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -32,7 +32,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 0da103f..0e6539d 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -27,7 +27,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 2120f9d..d6e0e53 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -34,7 +34,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index 702516f..0824f2a 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 251a311..29b964c 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 80b2437..63301ed 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 54a70c8..7353b58 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/ui.c b/src/bin/ui.c
index b5a28a4..b07ef0b 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -586,7 +586,7 @@ _ui_menu_item_add(char *icon, char *text, void (*func) (void))
    Menu_Item *mi;
 
    mi = malloc(sizeof(Menu_Item));
-   mi->o_icon = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(mi->o_icon);
    if (mi->o_icon)
 	eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL),
@@ -607,7 +607,7 @@ _ui_setup(void)
    Evas_Coord x, y, w, h;
    time_t t0, t;
 
-   o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_position_set(0, 0),
@@ -622,7 +622,7 @@ _ui_setup(void)
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _ui_mouse_move, NULL);
    o_bg = o;
 
-   o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_position_set(0, 0),
@@ -632,7 +632,7 @@ _ui_setup(void)
             evas_obj_visibility_set(EINA_TRUE));
    o_wallpaper = o;
 
-   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
@@ -648,7 +648,7 @@ _ui_setup(void)
             evas_obj_visibility_set(EINA_TRUE));
    o_title = o;
 
-   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_text_font_set("Vera", 9),
@@ -664,7 +664,7 @@ _ui_setup(void)
             evas_obj_visibility_set(EINA_TRUE));
    o_byline = o;
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
@@ -676,7 +676,7 @@ _ui_setup(void)
             evas_obj_visibility_set(EINA_TRUE));
    o_menu_logo = o;
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_position_set(win_w - 128, - 128),
@@ -685,7 +685,7 @@ _ui_setup(void)
             evas_obj_visibility_set(EINA_TRUE));
    o_menu_icon = o;
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_position_set(0, 0),
@@ -694,7 +694,7 @@ _ui_setup(void)
             evas_obj_image_fill_set(0, 0, 48, 48));
    o_menu_icon_sel = o;
 
-   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_position_set(0, 0),
@@ -704,7 +704,7 @@ _ui_setup(void)
             evas_obj_image_border_set(7, 7, 7, 7));
    o_menu_text_sel = o;
 
-   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    eo_unref(o);
    if (o)
 	eo_do(o, evas_obj_text_font_set("Vera", 10),
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index a5e1434..07941f6 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                    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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index e75c8b8..dc2eded 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                  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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 4f1175d..4607a12 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                  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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index e31054c..9f87471 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,14 +31,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                  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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 1]),
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 61f7d48..70da798 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -31,14 +31,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                  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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 1]),
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 186cc4c..19877ee 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                  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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index add5e8d..126f303 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        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),
                  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_OBJ_TEXT_CLASS, evas);
+        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_text_set(icons[i % 13]),
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 856887c..ea194a0 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index fdbd036..0bf97d3 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 95242c4..e7db9c5 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 11905c1..a99a4fc 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(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -70,7 +70,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index c17bcb7..1f27ee3 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 74c6fde..6fbd65d 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 76515ae..5c403ee 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 42065b9..c959a9a 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -91,7 +91,7 @@ static void _setup(void)
                  evas_obj_size_set(win_w, ICON_SIZE),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         eo_do(o, evas_obj_image_filled_set(1),
                  evas_obj_image_border_set(2, 2, 2, 2),
@@ -99,7 +99,7 @@ static void _setup(void)
                  evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
                  evas_obj_visibility_set(EINA_TRUE));
 
-        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+        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_text_set(labels[i % 26]),