Evas object smart: Fix namespace to use . and not _.

83 files changed, 275 insertions, 275 deletions

diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index eb9f3054dd..b9672c4a52 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -9,7 +9,7 @@ class Edje.Edit (Edje.Object)
    implements {
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.del;
       Efl.File.file.set;
    }
 }
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index ae559fb0c7..4ee01f9ce1 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1987,14 +1987,14 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File, Efl.Container)
       Eo.Base.destructor;
       Eo.Base.dbg_info_get;
       Evas.Object.paragraph_direction.set;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
-      Evas.Object_Smart.smart_no_render.set;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
+      Evas.Object.Smart.smart_no_render.set;
       Efl.File.file.set;
       Efl.File.file.get;
       Efl.File.mmap.set;
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index ccf865c8db..cd80b8cf51 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -5,9 +5,9 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack_Linear, Efl.Pack_Layout)
       Eo.Base.constructor;
 
       // Smart obj
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.calculate;
 
       // Focus
       Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 775273b855..8ca7c435d6 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -5,9 +5,9 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack_Grid, Efl.Pack_Layout)
       Eo.Base.constructor;
 
       // Smart obj
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.calculate;
 
       // Focus
       Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index e21f83facc..901e8244f6 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -34,8 +34,8 @@ class Efl.Ui.Nstate(Elm.Button)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.event;
    }
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index 69ffa17f12..b2ef21053e 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -6,7 +6,7 @@ eo_prefix: elm_obj_access;
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.activate;
       Elm.Widget.on_focus;
    }
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index aa1d0e285f..57d757dc7c 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -69,7 +69,7 @@ class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo
index 7665577f94..a9b2511d19 100644
--- a/src/lib/elementary/elm_bg.eo
+++ b/src/lib/elementary/elm_bg.eo
@@ -95,7 +95,7 @@ class Elm.Bg (Elm.Layout, Efl.File)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
       Efl.File.file.set;
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index c10ae142ab..488f1e979e 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -283,9 +283,9 @@ class Elm.Box (Elm.Widget)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.calculate;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 2ae8538be0..9acef4b64a 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -37,7 +37,7 @@ class Elm.Bubble (Elm.Layout, Evas.Clickable_Interface)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index 5a92844654..7c5265be07 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/elm_button.eo
@@ -74,7 +74,7 @@ class Elm.Button (Elm.Layout, Evas.Clickable_Interface,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.activate;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index a2b4574bdd..750f4dc3b0 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -381,9 +381,9 @@ class Elm.Calendar (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo
index 31b67a84af..aba2dc082b 100644
--- a/src/lib/elementary/elm_check.eo
+++ b/src/lib/elementary/elm_check.eo
@@ -23,7 +23,7 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.activate;
       Elm.Widget.theme_apply;
       Elm.Widget.sub_object_del;
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index 8c757c9240..c974296ac6 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -161,8 +161,8 @@ class Elm.Clock (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.access;
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index af369af7a6..87093f1374 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -106,8 +106,8 @@ selected.]]
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index 4e711d41d9..039b0a0890 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -53,11 +53,11 @@ class Elm.Combobox (Elm.Button, Evas.Selectable_Interface,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.part_text.set;
       Elm.Widget.part_text.get;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index c719c21adb..7dac09813c 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -4,8 +4,8 @@ class Elm.Conformant (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.widget_parent.set;
       Elm.Widget.theme_apply;
       Elm.Layout.content_aliases.get;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 3cf82a6fd0..f9576989b5 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -201,8 +201,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action, Efl.Orientati
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.add;
       Elm.Widget.widget_parent.set;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_datetime.eo b/src/lib/elementary/elm_datetime.eo
index 7587f33160..b9b2fca95a 100644
--- a/src/lib/elementary/elm_datetime.eo
+++ b/src/lib/elementary/elm_datetime.eo
@@ -290,8 +290,8 @@ class Elm.Datetime (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index 4704c7699c..48521dfd7f 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -148,8 +148,8 @@ class Elm.Dayselector (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 65b5386def..b188d10fb5 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -195,11 +195,11 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.access;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 9b33fe5799..824744a951 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -933,13 +933,13 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.resize;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.hide;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.resize;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.hide;
       Elm.Widget.activate;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 0ea6ba7b54..d6f7fd4003 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -32,8 +32,8 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface_Fileselector,
       class.constructor;
       class.destructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.focus_next;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.focus_direction;      
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index 80042ab90f..c9d44b0b02 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -83,8 +83,8 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface_Fileselector)
    }
    implements {
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Button.admits_autorepeat.get;
       Elm.Interface_Fileselector.selected_paths.get;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index c96aa48a76..4c86436903 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -83,8 +83,8 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface_Fileselector,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.add;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_flip.eo b/src/lib/elementary/elm_flip.eo
index 29c9107382..747413e73f 100644
--- a/src/lib/elementary/elm_flip.eo
+++ b/src/lib/elementary/elm_flip.eo
@@ -229,8 +229,8 @@ class Elm.Flip (Elm.Widget, Efl.Container)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.focus_direction;
       Elm.Widget.sub_object_add;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index d20924fac8..5dc916b674 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -124,8 +124,8 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/elm_frame.eo
index 0c798b11ff..edcb4d0394 100644
--- a/src/lib/elementary/elm_frame.eo
+++ b/src/lib/elementary/elm_frame.eo
@@ -49,8 +49,8 @@ class Elm.Frame (Elm.Layout, Evas.Clickable_Interface)
    implements {
       Eo.Base.constructor;
       class.constructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index d88aa49cfb..a40beaed22 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -538,11 +538,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo
index 2b643c1275..e67e18be98 100644
--- a/src/lib/elementary/elm_gengrid_pan.eo
+++ b/src/lib/elementary/elm_gengrid_pan.eo
@@ -4,9 +4,9 @@ class Elm.Gengrid_Pan (Elm.Pan)
    implements {
       class.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.resize;
       Elm.Pan.content_size.get;
       Elm.Pan.pos;
       Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index d58e159761..b5c4ccbbcf 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -524,11 +524,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.sub_object_add;
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index 926b0ccaf0..1a5065b462 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -4,10 +4,10 @@ class Elm.Genlist_Pan (Elm.Pan)
    implements {
       class.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Pan.content_size.get;
       Elm.Pan.pos;
       Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index f8f0d4691a..a2dea3bf0d 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -154,8 +154,8 @@ class Elm.Gesture_Layer (Elm.Widget)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.disable;
    }
 
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index 5bddacdafb..495c83131e 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -182,9 +182,9 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View)
    implements {
       class.constructor;
       Eo.Base.finalize;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.on_focus;
       Efl.Gfx.View.view_size.get;
       Efl.Gfx.View.view_size.set;
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index c5c0a2ea68..4fe07ecac2 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -53,8 +53,8 @@ class Elm.Grid (Elm.Widget)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 2f6ca0d944..411cce81da 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -58,12 +58,12 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface_Atspi_Widge
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.sub_object_add;
       Elm.Widget.widget_parent;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 405d37d3ac..2e96a87593 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -90,10 +90,10 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
       class.constructor;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.widget_parent.set;
       Elm.Widget.theme_apply;
       Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index bd007b72b7..fe22bdfc77 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -14,8 +14,8 @@ class Elm.Icon (Elm.Image)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Efl.File.file.set;
    }
diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo
index a1ef3f4313..db35665d99 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/elm_image.eo
@@ -139,16 +139,16 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
       Edje.Object.size_max.get;
       Edje.Object.size_min_calc;
       Edje.Object.calc_force;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.clip.set;
-      Evas.Object_Smart.clip_unset;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.color.set;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.clip.set;
+      Evas.Object.Smart.clip_unset;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.color.set;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
       Evas.Draggable_Interface.drag_target.set;
       Evas.Draggable_Interface.drag_target.get;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index c9315bc471..8cac9e076f 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -235,8 +235,8 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, Evas.Selectable_Interface
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index 45b2870d37..1bdcc5aa91 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -42,7 +42,7 @@ enum Elm.Scroller.Movement_Block
 }
 
 
-mixin Elm.Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
+mixin Elm.Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object.Smart)
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_scrollable;
@@ -663,8 +663,8 @@ mixin Elm.Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
    }
    implements {
       class.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
    }
    events {
       changed;
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 38e9929d2d..fcf10fc322 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -20,7 +20,7 @@ class Elm.Inwin (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.widget_parent.set;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index a93b98f983..27b70b3e6e 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -121,7 +121,7 @@ class Elm.Label (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index aca8c4605e..11fd02df3c 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -329,9 +329,9 @@ class Elm.Layout (Elm.Widget, Efl.Container, Efl.File)
       Eo.Base.dbg_info_get;
       Efl.File.file.set;
       Efl.File.file.get;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.calculate;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.calculate;
       Elm.Widget.focus_direction;
       Elm.Widget.sub_object_add;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index d421341c47..d6a1d7b698 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -427,11 +427,11 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 310f846f33..ffcda15bf5 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -624,11 +624,11 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
       Elm.Widget.event;
diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo
index 8520de6850..d7ba9b3cd5 100644
--- a/src/lib/elementary/elm_map_pan.eo
+++ b/src/lib/elementary/elm_map_pan.eo
@@ -4,9 +4,9 @@ class Elm.Map_Pan (Elm.Pan)
    implements {
       class.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.resize;
       Elm.Pan.content_size.get;
       Elm.Pan.pos;
       Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index 3aa5f57b4b..89562edc47 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -128,12 +128,12 @@ class Elm.Mapbuf (Elm.Widget, Efl.Container)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.sub_object_del;
       Efl.Container.content.get;
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 2aa849f565..6c8ea476ca 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -70,9 +70,9 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm.Interface_Atspi_Select
       class.constructor;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.widget_parent;
       Elm.Widget.theme_apply;
       Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 0db01233d9..73e61cd84c 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -174,8 +174,8 @@ class Elm.Multibuttonentry (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 5e499552cf..d666d6e33d 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -140,9 +140,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index 37e75eae8b..6df03803ce 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -77,12 +77,12 @@ class Elm.Notify (Elm.Widget, Efl.Container)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.focus_direction;
       Elm.Widget.widget_parent;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index bf5bab1823..0387bd4a12 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -51,12 +51,12 @@ class Elm.Pan (Evas.Smart_Clipped)
    implements {
       Eo.Base.constructor;
       class.constructor;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
    }
    events {
       changed;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index 664f4b70ba..ca2ac7e25c 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -67,11 +67,11 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
-      Evas.Object_Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
+      Evas.Object.Smart.move;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index 881eb7efdd..011e0e4203 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -133,7 +133,7 @@ class Elm.Panes (Elm.Layout, Evas.Clickable_Interface)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index f08e8e807d..8954eb3a8c 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -5,8 +5,8 @@ class Elm.Photo (Elm.Widget, Efl.File, Evas.Clickable_Interface, Evas.Draggable_
       class.constructor;
       Eo.Base.constructor;
       Efl.File.file.set;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
    }
 
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index 117903577d..471261ee89 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -187,11 +187,11 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
       Elm.Widget.event;
diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo
index 8831f6aa33..ef5ff22302 100644
--- a/src/lib/elementary/elm_photocam_pan.eo
+++ b/src/lib/elementary/elm_photocam_pan.eo
@@ -4,9 +4,9 @@ class Elm.Photocam_Pan (Elm.Pan)
    implements {
       class.constructor;
       Eo.Base.destructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.resize;
       Elm.Pan.content_size.get;
       Elm.Pan.pos;
       Elm.Pan.pos_min.get;
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index 3457ef67a0..d7d1cef469 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -4,8 +4,8 @@ class Elm.Player (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.event;
       Efl.Container.content.set;
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 3fe1af3855..892efcf6e1 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -30,7 +30,7 @@ class Elm.Plug (Elm.Widget, Evas.Clickable_Interface)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
    }
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index a36772cec8..f8bbbcc247 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -165,8 +165,8 @@ class Elm.Popup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 167022f108..d5be9539ef 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -214,8 +214,8 @@ class Elm.Prefs (Elm.Widget, Efl.File)
       Eo.Base.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_next;
    }
    events {
diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo
index e2e1bc754a..57f53cbeb5 100644
--- a/src/lib/elementary/elm_progressbar.eo
+++ b/src/lib/elementary/elm_progressbar.eo
@@ -55,8 +55,8 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 64c6527d09..95dd95c69e 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -76,8 +76,8 @@ class Elm.Radio (Elm.Check, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.activate;
       Elm.Widget.event;
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
index 2aa7562784..d703bfae76 100644
--- a/src/lib/elementary/elm_route.eo
+++ b/src/lib/elementary/elm_route.eo
@@ -40,8 +40,8 @@ class Elm.Route (Elm.Widget)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
    }
 
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 35adcac261..9292f7d8fe 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -58,10 +58,10 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.activate;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 0fda765d08..53f40c7b78 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -133,8 +133,8 @@ class Elm.Segment_Control (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 9ce35cf074..273afa72b9 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -17,7 +17,7 @@ class Elm.Separator (Elm.Layout)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 41b748abca..7afcbe2237 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -169,9 +169,9 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.activate;
       Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index ce46ec2f34..b6abc0974a 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -302,8 +302,8 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.event;
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 14907acfe3..eb4bf996ef 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -143,8 +143,8 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index 9d2ae65ba1..ab3ec13f6b 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -118,9 +118,9 @@ class Elm.Table (Elm.Widget)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.calculate;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index 6e9d0e254b..72e4bf88e3 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -8,10 +8,10 @@ class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface,
       Eo.Base.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.show;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.show;
       Evas.Draggable_Interface.drag_target.set;
       Evas.Draggable_Interface.drag_target.get;
    }
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index c578f0a3f0..2f8ebeb88b 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -343,12 +343,12 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.access;
       Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo
index 4bb4637cb6..160e79bf18 100644
--- a/src/lib/elementary/elm_video.eo
+++ b/src/lib/elementary/elm_video.eo
@@ -111,8 +111,8 @@ class Elm.Video (Elm.Layout, Efl.File, Elm.Interface_Atspi_Widget_Action)
       Eo.Base.constructor;
       Efl.File.file.set;
       Efl.File.file.get;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.event;
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 26c7838210..34ea4ac58f 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -20,7 +20,7 @@ struct Elm.Tooltip;
 struct Elm.Cursor;
 struct @extern Elm.Theme;
 
-abstract Elm.Widget (Evas.Object_Smart, Elm.Interface_Atspi_Accessible, Elm.Interface_Atspi_Component)
+abstract Elm.Widget (Evas.Object.Smart, Elm.Interface_Atspi_Accessible, Elm.Interface_Atspi_Component)
 {
    eo_prefix: elm_obj_widget;
    data: Elm_Widget_Smart_Data;
@@ -34,7 +34,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm.Interface_Atspi_Accessible, Elm.Inte
            the focus from this object, passing it back to the previous element in the
            focus chain list.
 
-           Warning: Only visible object can get a focus. Call @Evas.Object_Smart.show
+           Warning: Only visible object can get a focus. Call @Evas.Object.Smart.show
            before calling this API, if you want to give a focus to the evas object.]]
          set {
            [[$true set the focus to the object,
@@ -847,19 +847,19 @@ abstract Elm.Widget (Evas.Object_Smart, Elm.Interface_Atspi_Accessible, Elm.Inte
       Eo.Base.constructor;
       Eo.Base.destructor;
       Eo.Base.dbg_info_get;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.clip_unset;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.color.set;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.member_del;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.clip.set;
-      Evas.Object_Smart.member_add;
-      Evas.Object_Smart.resize;
-      Evas.Object_Smart.smart_no_render.set;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.clip_unset;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.color.set;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.member_del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.clip.set;
+      Evas.Object.Smart.member_add;
+      Evas.Object.Smart.resize;
+      Evas.Object.Smart.smart_no_render.set;
       @virtual .focus_direction;
       @virtual .focus_next;
       @virtual .parent_widget.get;
diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo
index 60bf3f920e..4b67ee9f5b 100644
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/elm_win.eo
@@ -1156,12 +1156,12 @@ class Elm.Win (Elm.Widget, Elm.Interface_Atspi_Window,
       class.constructor;
       Eo.Base.constructor;
       Eo.Base.finalize;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
       Elm.Widget.focus_direction;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index 39ee910564..88bf5c35a5 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,4 +1,4 @@
-class Emotion.Object (Evas.Object_Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image_Load) {
+class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image_Load) {
    eo_prefix: emotion_obj;
    methods {
         @property option {
@@ -52,15 +52,15 @@ class Emotion.Object (Evas.Object_Smart, Efl.File, Efl.Player, Efl.Image, Efl.Im
    }
    implements {
         Eo.Base.constructor;
-        Evas.Object_Smart.add;
-        Evas.Object_Smart.del;
-        Evas.Object_Smart.move;
-        Evas.Object_Smart.resize;
-        Evas.Object_Smart.show;
-        Evas.Object_Smart.hide;
-        Evas.Object_Smart.color.set;
-        Evas.Object_Smart.clip.set;
-        Evas.Object_Smart.clip_unset;
+        Evas.Object.Smart.add;
+        Evas.Object.Smart.del;
+        Evas.Object.Smart.move;
+        Evas.Object.Smart.resize;
+        Evas.Object.Smart.show;
+        Evas.Object.Smart.hide;
+        Evas.Object.Smart.color.set;
+        Evas.Object.Smart.clip.set;
+        Evas.Object.Smart.clip_unset;
         Efl.File.file.set;
         Efl.File.file.get;
         Efl.Player.play.set;
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 16dcc6cf9a..4d678c5962 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -657,10 +657,10 @@ class Evas.Box (Evas.Smart_Clipped)
       class.constructor;
       Eo.Base.constructor;
       Evas.Object.smart_data.get;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.resize;
    }
    events {
       child,added;
diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
index f5f544ebff..c7357f31d0 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -3,7 +3,7 @@
 struct @extern Evas.Smart;
 struct @extern Evas.Smart_Cb_Description;
 
-class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
+class Evas.Object.Smart (Evas.Object, Evas.Signal_Interface)
 {
    eo_prefix: evas_obj_smart;
    data: Evas_Smart_Data;
diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo
index b01872cb51..e9eb3f3c88 100644
--- a/src/lib/evas/canvas/evas_smart_clipped.eo
+++ b/src/lib/evas/canvas/evas_smart_clipped.eo
@@ -1,4 +1,4 @@
-class Evas.Smart_Clipped (Evas.Object_Smart)
+class Evas.Smart_Clipped (Evas.Object.Smart)
 {
    legacy_prefix: evas_object_smart_clipped;
    eo_prefix: evas_obj_smart_clipped;
@@ -6,15 +6,15 @@ class Evas.Smart_Clipped (Evas.Object_Smart)
 
    implements {
       Eo.Base.constructor;
-      Evas.Object_Smart.hide;
-      Evas.Object_Smart.clip.set;
-      Evas.Object_Smart.clip_unset;
-      Evas.Object_Smart.show;
-      Evas.Object_Smart.color.set;
-      Evas.Object_Smart.move;
-      Evas.Object_Smart.member_del;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.member_add;
+      Evas.Object.Smart.hide;
+      Evas.Object.Smart.clip.set;
+      Evas.Object.Smart.clip_unset;
+      Evas.Object.Smart.show;
+      Evas.Object.Smart.color.set;
+      Evas.Object.Smart.move;
+      Evas.Object.Smart.member_del;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.member_add;
    }
 }
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 897ea9b41b..346c9c0291 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -216,9 +216,9 @@ class Evas.Table (Evas.Smart_Clipped)
    implements {
       class.constructor;
       Eo.Base.constructor;
-      Evas.Object_Smart.add;
-      Evas.Object_Smart.del;
-      Evas.Object_Smart.calculate;
-      Evas.Object_Smart.resize;
+      Evas.Object.Smart.add;
+      Evas.Object.Smart.del;
+      Evas.Object.Smart.calculate;
+      Evas.Object.Smart.resize;
    }
 }
diff --git a/src/modules/elementary/web/none/elm_web_none.eo b/src/modules/elementary/web/none/elm_web_none.eo
index 6fc7c9b508..2e56c7968c 100644
--- a/src/modules/elementary/web/none/elm_web_none.eo
+++ b/src/modules/elementary/web/none/elm_web_none.eo
@@ -1,7 +1,7 @@
 class Elm.Web.None (Elm.Web)
 {
    implements {
-      Evas.Object_Smart.add;
+      Evas.Object.Smart.add;
       Elm.Web.tab_propagate.get;
       Elm.Web.tab_propagate.set;
       Elm.Web.webkit_view.get;