diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 4ee01f9ce1..64c438667c 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1,6 +1,6 @@
 import edje_types;
 
-class Edje.Object (Evas.Smart_Clipped, Efl.File, Efl.Container)
+class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container)
 {
    legacy_prefix: edje_object;
    eo_prefix: edje_obj;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index 0387bd4a12..398de388c8 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Pan (Evas.Smart_Clipped)
+class Elm.Pan (Evas.Smart.Clipped)
 {
    eo_prefix: elm_obj_pan;
    data: Elm_Pan_Smart_Data;
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 4d678c5962..56ec70c2ef 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -4,7 +4,7 @@ type @extern Evas_Object_Box_Layout: __undefined_type; /* FIXME: Function pointe
 type @extern Eina_Free_Cb: __undefined_type; /* FIXME: Function pointers are not supported  */
 type @extern va_list: __undefined_type; /* FIXME: va_list is not supported */
 
-class Evas.Box (Evas.Smart_Clipped)
+class Evas.Box (Evas.Smart.Clipped)
 {
    legacy_prefix: evas_object_box;
    eo_prefix: evas_obj_box;
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index c140af9be4..77e063c4f3 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -1,4 +1,4 @@
-class Evas.Grid (Evas.Smart_Clipped)
+class Evas.Grid (Evas.Smart.Clipped)
 {
    legacy_prefix: evas_object_grid;
    eo_prefix: evas_obj_grid;
diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo
index e9eb3f3c88..4f0b93a840 100644
--- a/src/lib/evas/canvas/evas_smart_clipped.eo
+++ b/src/lib/evas/canvas/evas_smart_clipped.eo
@@ -1,4 +1,7 @@
-class Evas.Smart_Clipped (Evas.Object.Smart)
+/* XXX: It's Evas.Smart.Clipped and not Evas.Object.Smart.Clipped because of
+   clashes with legacy. Not edaling with it too much because it'll be deprecated
+   soon anyway. */
+class Evas.Smart.Clipped (Evas.Object.Smart)
 {
    legacy_prefix: evas_object_smart_clipped;
    eo_prefix: evas_obj_smart_clipped;
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 346c9c0291..942e0647cd 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -9,7 +9,7 @@ enum Evas.Object_Table.Homogeneous_Mode {
      item = 2
 }
 
-class Evas.Table (Evas.Smart_Clipped)
+class Evas.Table (Evas.Smart.Clipped)
 {
    legacy_prefix: evas_object_table;
    eo_prefix: evas_obj_table;