diff --git a/legacy/elementary/src/lib/elm_app_client.eo b/legacy/elementary/src/lib/elm_app_client.eo
index d58ec3a21e..849e708f0c 100644
--- a/legacy/elementary/src/lib/elm_app_client.eo
+++ b/legacy/elementary/src/lib/elm_app_client.eo
@@ -1,14 +1,13 @@
-class Elm_App_Client (Eo.Base)
+class Elm.App_Client (Eo.Base)
 {
    legacy_prefix: null;
-   eo_prefix: elm_app_client;
    methods {
       @property views {
          get {
             [[Return a iterator with all views of application.]]
          }
          values {
-            ret: free(own(iterator<Elm_App_Client_View *> *), eina_iterator_free); [[The iterator with all views, must be freed after use.]]
+            ret: free(own(iterator<Elm.App_Client_View *> *), eina_iterator_free); [[The iterator with all views, must be freed after use.]]
          }
       }
       @property package {
diff --git a/legacy/elementary/src/lib/elm_app_client_view.eo b/legacy/elementary/src/lib/elm_app_client_view.eo
index 3a2e4e5684..81de5eeccc 100644
--- a/legacy/elementary/src/lib/elm_app_client_view.eo
+++ b/legacy/elementary/src/lib/elm_app_client_view.eo
@@ -1,7 +1,6 @@
-class Elm_App_Client_View (Eo.Base)
+class Elm.App_Client_View (Eo.Base)
 {
    legacy_prefix: null;
-   eo_prefix: elm_app_client_view;
    methods {
       @property state {
          get {
diff --git a/legacy/elementary/src/lib/elm_app_server.eo b/legacy/elementary/src/lib/elm_app_server.eo
index fe82edc9ad..3971cdaa1f 100644
--- a/legacy/elementary/src/lib/elm_app_server.eo
+++ b/legacy/elementary/src/lib/elm_app_server.eo
@@ -1,4 +1,4 @@
-class Elm_App_Server (Eo.Base)
+class Elm.App_Server (Eo.Base)
 {
    legacy_prefix: null;
    eo_prefix: elm_app_server;
@@ -17,7 +17,7 @@ class Elm_App_Server (Eo.Base)
             [[Return a iterator with all views of application]]
          }
          values {
-            ret: free(own(iterator<Elm_App_Server_View *> *), eina_iterator_free); [[Iterator with all views of application, you must free iterator after use]]
+            ret: free(own(iterator<Elm.App_Server_View *> *), eina_iterator_free); [[Iterator with all views of application, you must free iterator after use]]
          }
       }
       @property path {
@@ -72,7 +72,7 @@ class Elm_App_Server (Eo.Base)
            requested by create_view_cb.
          ]]
          params {
-            @in view: Elm_App_Server_View *; [[elm_app_server_view]]
+            @in view: Elm.App_Server_View *; [[elm_app_server_view]]
          }
       }
       title_set {
diff --git a/legacy/elementary/src/lib/elm_app_server_view.eo b/legacy/elementary/src/lib/elm_app_server_view.eo
index 51e32c59e9..416b373167 100644
--- a/legacy/elementary/src/lib/elm_app_server_view.eo
+++ b/legacy/elementary/src/lib/elm_app_server_view.eo
@@ -1,4 +1,4 @@
-class Elm_App_Server_View (Eo.Base)
+class Elm.App_Server_View (Eo.Base)
 {
    legacy_prefix: null;
    eo_prefix: elm_app_server_view;
diff --git a/legacy/elementary/src/lib/elm_atspi_app_object.eo b/legacy/elementary/src/lib/elm_atspi_app_object.eo
index 5371535db9..9603f45357 100644
--- a/legacy/elementary/src/lib/elm_atspi_app_object.eo
+++ b/legacy/elementary/src/lib/elm_atspi_app_object.eo
@@ -1,12 +1,12 @@
-class Elm_Atspi_App_Object (Eo.Base, Elm_Interface_Atspi_Accessible)
+class Elm.Atspi_App_Object (Eo.Base, Elm.Interface_Atspi_Accessible)
 {
    data: Elm_Atspi_App_Object_Data;
    implements {
       Eo.Base.destructor;
-      Elm_Interface_Atspi_Accessible.name.get;
-      Elm_Interface_Atspi_Accessible.description.get;
-      Elm_Interface_Atspi_Accessible.description.set;
-      Elm_Interface_Atspi_Accessible.role.get;
-      Elm_Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.name.get;
+      Elm.Interface_Atspi_Accessible.description.get;
+      Elm.Interface_Atspi_Accessible.description.set;
+      Elm.Interface_Atspi_Accessible.role.get;
+      Elm.Interface_Atspi_Accessible.children.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_button.eo b/legacy/elementary/src/lib/elm_button.eo
index ad58c3750e..f1b1164e3b 100644
--- a/legacy/elementary/src/lib/elm_button.eo
+++ b/legacy/elementary/src/lib/elm_button.eo
@@ -1,5 +1,5 @@
 class Elm.Button (Elm.Layout, Evas.Clickable_Interface,
-                  Elm_Interface_Atspi_Widget_Action)
+                  Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_button;
    methods {
@@ -97,6 +97,6 @@ class Elm.Button (Elm.Layout, Evas.Clickable_Interface,
       Elm.Layout.text_aliases.get;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_calendar.eo b/legacy/elementary/src/lib/elm_calendar.eo
index fe067df19f..6ab7afe5bc 100644
--- a/legacy/elementary/src/lib/elm_calendar.eo
+++ b/legacy/elementary/src/lib/elm_calendar.eo
@@ -75,7 +75,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
                             with @Elm.Calendar.mark_del.
                           ]]
 
-class Elm.Calendar (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Calendar (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_calendar;
    methods {
@@ -442,7 +442,7 @@ class Elm.Calendar (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Widget.focus_next;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_check.eo b/legacy/elementary/src/lib/elm_check.eo
index 8256c2f4b9..452ab93b9b 100644
--- a/legacy/elementary/src/lib/elm_check.eo
+++ b/legacy/elementary/src/lib/elm_check.eo
@@ -1,4 +1,4 @@
-class Elm.Check (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Check (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_check;
    methods {
@@ -50,8 +50,8 @@ class Elm.Check (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Layout.text_aliases.get;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_colorselector.eo b/legacy/elementary/src/lib/elm_colorselector.eo
index 43d882be86..e1d09af21c 100644
--- a/legacy/elementary/src/lib/elm_colorselector.eo
+++ b/legacy/elementary/src/lib/elm_colorselector.eo
@@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode
    all [[All possible color selector is displayed.]]
 }
 
-class Elm.Colorselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action,
+class Elm.Colorselector (Elm.Layout, Elm.Interface_Atspi_Widget_Action,
                          Evas.Clickable_Interface)
 {
    eo_prefix: elm_obj_colorselector;
@@ -115,7 +115,7 @@ selected.]]
       Elm.Widget.access;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       color,item,selected;
diff --git a/legacy/elementary/src/lib/elm_combobox.eo b/legacy/elementary/src/lib/elm_combobox.eo
index 0075530ce1..598a462b2c 100644
--- a/legacy/elementary/src/lib/elm_combobox.eo
+++ b/legacy/elementary/src/lib/elm_combobox.eo
@@ -1,5 +1,5 @@
 class Elm.Combobox (Elm.Button, Evas.Selectable_Interface,
-                    Elm_Interface_Atspi_Widget_Action,
+                    Elm.Interface_Atspi_Widget_Action,
                     Elm.Entry, Elm.Genlist, Elm.Hover)
 {
    eo_prefix: elm_obj_combobox;
@@ -46,7 +46,7 @@ class Elm.Combobox (Elm.Button, Evas.Selectable_Interface,
       Elm.Widget.event;
       Elm.Button.admits_autorepeat.get;
       Elm.Genlist.filter.set;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       dismissed;
diff --git a/legacy/elementary/src/lib/elm_ctxpopup.eo b/legacy/elementary/src/lib/elm_ctxpopup.eo
index 39accbec24..7298b1b5ff 100644
--- a/legacy/elementary/src/lib/elm_ctxpopup.eo
+++ b/legacy/elementary/src/lib/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
    unknown [[Ctxpopup does not determine it's direction yet.]]
 }
 
-class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_ctxpopup;
    methods {
@@ -232,8 +232,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Container.content_unset;
       Elm.Layout.sub_object_add_enable;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
    }
    events {
       dismissed;
diff --git a/legacy/elementary/src/lib/elm_diskselector.eo b/legacy/elementary/src/lib/elm_diskselector.eo
index 0a81a57818..65fad12d03 100644
--- a/legacy/elementary/src/lib/elm_diskselector.eo
+++ b/legacy/elementary/src/lib/elm_diskselector.eo
@@ -1,5 +1,5 @@
-class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
-                        Elm_Interface_Atspi_Widget_Action,
+class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
+                        Elm.Interface_Atspi_Widget_Action,
                         Evas.Clickable_Interface, Evas.Scrollable_Interface,
                         Evas.Selectable_Interface)
 {
@@ -208,8 +208,8 @@ class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
       Elm.Widget.translate;
       Elm.Widget.sub_object_del;
       Elm.Widget.event;
-      Elm_Interface_Scrollable.policy;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Scrollable.policy;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
    }
diff --git a/legacy/elementary/src/lib/elm_entry.eo b/legacy/elementary/src/lib/elm_entry.eo
index 61560bb3bf..ab6962c17d 100644
--- a/legacy/elementary/src/lib/elm_entry.eo
+++ b/legacy/elementary/src/lib/elm_entry.eo
@@ -96,8 +96,8 @@ enum Elm.Input.Hints
                                      @since 1.12]]
 }
 
-class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
-                 Elm_Interface_Atspi_Text, Elm_Interface_Atspi_Editable_Text, Efl.File,
+class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
+                 Elm.Interface_Atspi_Text, Elm.Interface_Atspi_Editable_Text, Efl.File,
                  Evas.Selectable_Interface, Evas.Scrollable_Interface)
 {
    eo_prefix: elm_obj_entry;
@@ -923,34 +923,34 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
       Elm.Layout.signal_emit;
       Elm.Layout.text.set;
       Elm.Layout.content_aliases.get;
-      Elm_Interface_Scrollable.policy.set;
-      Elm_Interface_Scrollable.bounce_allow.set;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Accessible.name.get;
-      Elm_Interface_Atspi_Text.text.get;
-      Elm_Interface_Atspi_Text.string.get;
-      Elm_Interface_Atspi_Text.attribute.get;
-      Elm_Interface_Atspi_Text.attributes.get;
-      Elm_Interface_Atspi_Text.default_attributes.get;
-      Elm_Interface_Atspi_Text.caret_offset.get;
-      Elm_Interface_Atspi_Text.caret_offset.set;
-      Elm_Interface_Atspi_Text.character.get;
-      Elm_Interface_Atspi_Text.character_extents.get;
-      Elm_Interface_Atspi_Text.character_count.get;
-      Elm_Interface_Atspi_Text.offset_at_point.get;
-      Elm_Interface_Atspi_Text.bounded_ranges.get;
-      Elm_Interface_Atspi_Text.range_extents.get;
-      Elm_Interface_Atspi_Text.selection.get;
-      Elm_Interface_Atspi_Text.selections_count.get;
-      Elm_Interface_Atspi_Text.selection_add;
-      Elm_Interface_Atspi_Text.selection_remove;
-      Elm_Interface_Atspi_Text.selection.set;
-      Elm_Interface_Atspi_Editable_Text.content.set;
-      Elm_Interface_Atspi_Editable_Text.insert;
-      Elm_Interface_Atspi_Editable_Text.copy;
-      Elm_Interface_Atspi_Editable_Text.cut;
-      Elm_Interface_Atspi_Editable_Text.delete;
-      Elm_Interface_Atspi_Editable_Text.paste;
+      Elm.Interface_Scrollable.policy.set;
+      Elm.Interface_Scrollable.bounce_allow.set;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Accessible.name.get;
+      Elm.Interface_Atspi_Text.text.get;
+      Elm.Interface_Atspi_Text.string.get;
+      Elm.Interface_Atspi_Text.attribute.get;
+      Elm.Interface_Atspi_Text.attributes.get;
+      Elm.Interface_Atspi_Text.default_attributes.get;
+      Elm.Interface_Atspi_Text.caret_offset.get;
+      Elm.Interface_Atspi_Text.caret_offset.set;
+      Elm.Interface_Atspi_Text.character.get;
+      Elm.Interface_Atspi_Text.character_extents.get;
+      Elm.Interface_Atspi_Text.character_count.get;
+      Elm.Interface_Atspi_Text.offset_at_point.get;
+      Elm.Interface_Atspi_Text.bounded_ranges.get;
+      Elm.Interface_Atspi_Text.range_extents.get;
+      Elm.Interface_Atspi_Text.selection.get;
+      Elm.Interface_Atspi_Text.selections_count.get;
+      Elm.Interface_Atspi_Text.selection_add;
+      Elm.Interface_Atspi_Text.selection_remove;
+      Elm.Interface_Atspi_Text.selection.set;
+      Elm.Interface_Atspi_Editable_Text.content.set;
+      Elm.Interface_Atspi_Editable_Text.insert;
+      Elm.Interface_Atspi_Editable_Text.copy;
+      Elm.Interface_Atspi_Editable_Text.cut;
+      Elm.Interface_Atspi_Editable_Text.delete;
+      Elm.Interface_Atspi_Editable_Text.paste;
       Efl.File.file.set;
       Efl.File.file.get;
    }
diff --git a/legacy/elementary/src/lib/elm_fileselector.eo b/legacy/elementary/src/lib/elm_fileselector.eo
index 14a9f8a7eb..70a50a0ab0 100644
--- a/legacy/elementary/src/lib/elm_fileselector.eo
+++ b/legacy/elementary/src/lib/elm_fileselector.eo
@@ -1,5 +1,5 @@
-class Elm.Fileselector (Elm.Layout, Elm_Interface_Fileselector,
-                        Elm_Interface_Atspi_Widget_Action,
+class Elm.Fileselector (Elm.Layout, Elm.Interface_Fileselector,
+                        Elm.Interface_Atspi_Widget_Action,
                         Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_fileselector;
@@ -42,22 +42,22 @@ class Elm.Fileselector (Elm.Layout, Elm_Interface_Fileselector,
       Elm.Widget.focus_next_manager_is;
       Elm.Layout.sizing_eval;
       Elm.Layout.text.set;
-      Elm_Interface_Fileselector.selected_paths.get;
-      Elm_Interface_Fileselector.custom_filter_append;
-      Elm_Interface_Fileselector.expandable;
-      Elm_Interface_Fileselector.thumbnail_size;
-      Elm_Interface_Fileselector.selected;
-      Elm_Interface_Fileselector.mime_types_filter_append;
-      Elm_Interface_Fileselector.hidden_visible;
-      Elm_Interface_Fileselector.filters_clear;
-      Elm_Interface_Fileselector.is_save;
-      Elm_Interface_Fileselector.path;
-      Elm_Interface_Fileselector.sort_method;
-      Elm_Interface_Fileselector.multi_select;
-      Elm_Interface_Fileselector.folder_only;
-      Elm_Interface_Fileselector.mode;
-      Elm_Interface_Fileselector.current_name;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Fileselector.selected_paths.get;
+      Elm.Interface_Fileselector.custom_filter_append;
+      Elm.Interface_Fileselector.expandable;
+      Elm.Interface_Fileselector.thumbnail_size;
+      Elm.Interface_Fileselector.selected;
+      Elm.Interface_Fileselector.mime_types_filter_append;
+      Elm.Interface_Fileselector.hidden_visible;
+      Elm.Interface_Fileselector.filters_clear;
+      Elm.Interface_Fileselector.is_save;
+      Elm.Interface_Fileselector.path;
+      Elm.Interface_Fileselector.sort_method;
+      Elm.Interface_Fileselector.multi_select;
+      Elm.Interface_Fileselector.folder_only;
+      Elm.Interface_Fileselector.mode;
+      Elm.Interface_Fileselector.current_name;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       done;
diff --git a/legacy/elementary/src/lib/elm_fileselector_button.eo b/legacy/elementary/src/lib/elm_fileselector_button.eo
index b2a22868b5..80042ab90f 100644
--- a/legacy/elementary/src/lib/elm_fileselector_button.eo
+++ b/legacy/elementary/src/lib/elm_fileselector_button.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector_Button (Elm.Button, Elm_Interface_Fileselector)
+class Elm.Fileselector_Button (Elm.Button, Elm.Interface_Fileselector)
 {
    eo_prefix: elm_obj_fileselector_button;
    methods {
@@ -87,17 +87,17 @@ class Elm.Fileselector_Button (Elm.Button, Elm_Interface_Fileselector)
       Evas.Object_Smart.del;
       Elm.Widget.theme_apply;
       Elm.Button.admits_autorepeat.get;
-      Elm_Interface_Fileselector.selected_paths.get;
-      Elm_Interface_Fileselector.expandable;
-      Elm_Interface_Fileselector.thumbnail_size;
-      Elm_Interface_Fileselector.selected;
-      Elm_Interface_Fileselector.hidden_visible;
-      Elm_Interface_Fileselector.is_save;
-      Elm_Interface_Fileselector.path;
-      Elm_Interface_Fileselector.sort_method;
-      Elm_Interface_Fileselector.multi_select;
-      Elm_Interface_Fileselector.folder_only;
-      Elm_Interface_Fileselector.mode;
+      Elm.Interface_Fileselector.selected_paths.get;
+      Elm.Interface_Fileselector.expandable;
+      Elm.Interface_Fileselector.thumbnail_size;
+      Elm.Interface_Fileselector.selected;
+      Elm.Interface_Fileselector.hidden_visible;
+      Elm.Interface_Fileselector.is_save;
+      Elm.Interface_Fileselector.path;
+      Elm.Interface_Fileselector.sort_method;
+      Elm.Interface_Fileselector.multi_select;
+      Elm.Interface_Fileselector.folder_only;
+      Elm.Interface_Fileselector.mode;
    }
    events {
       file,chosen;
diff --git a/legacy/elementary/src/lib/elm_fileselector_entry.eo b/legacy/elementary/src/lib/elm_fileselector_entry.eo
index 0bdacf7470..eab4f4b916 100644
--- a/legacy/elementary/src/lib/elm_fileselector_entry.eo
+++ b/legacy/elementary/src/lib/elm_fileselector_entry.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector_Entry (Elm.Layout, Elm_Interface_Fileselector,
+class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface_Fileselector,
                               Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_fileselector_entry;
@@ -96,11 +96,11 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm_Interface_Fileselector,
       Elm.Layout.text.set;
       Elm.Layout.text.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Fileselector.selected;
-      Elm_Interface_Fileselector.folder_only;
-      Elm_Interface_Fileselector.is_save;
-      Elm_Interface_Fileselector.path;
-      Elm_Interface_Fileselector.expandable;
+      Elm.Interface_Fileselector.selected;
+      Elm.Interface_Fileselector.folder_only;
+      Elm.Interface_Fileselector.is_save;
+      Elm.Interface_Fileselector.path;
+      Elm.Interface_Fileselector.expandable;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_flipselector.eo b/legacy/elementary/src/lib/elm_flipselector.eo
index e9db5cbded..683267ad84 100644
--- a/legacy/elementary/src/lib/elm_flipselector.eo
+++ b/legacy/elementary/src/lib/elm_flipselector.eo
@@ -1,4 +1,4 @@
-class Elm.Flipselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action,
+class Elm.Flipselector (Elm.Layout, Elm.Interface_Atspi_Widget_Action,
                         Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_flipselector;
@@ -164,7 +164,7 @@ class Elm.Flipselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action,
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       underflowed;
diff --git a/legacy/elementary/src/lib/elm_gengrid.eo b/legacy/elementary/src/lib/elm_gengrid.eo
index 2ad5a94e5e..1f3e5657e6 100644
--- a/legacy/elementary/src/lib/elm_gengrid.eo
+++ b/legacy/elementary/src/lib/elm_gengrid.eo
@@ -6,9 +6,9 @@ enum Elm.Gengrid.Reorder_Type
    swap    [[ swap reorder type ]]
 }
 
-class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
-                   Evas.Clickable_Interface, Elm_Interface_Atspi_Widget_Action,
-                   Elm_Interface_Atspi_Selection)
+class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
+                   Evas.Clickable_Interface, Elm.Interface_Atspi_Widget_Action,
+                   Elm.Interface_Atspi_Selection)
 {
    eo_prefix: elm_obj_gengrid;
    methods {
@@ -556,19 +556,19 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Widget.item_loop_enabled.set;
       Elm.Widget.item_loop_enabled.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Scrollable.bounce_allow.set;
-      Elm_Interface_Scrollable.policy;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-      Elm_Interface_Atspi_Selection.selected_children_count.get;
-      Elm_Interface_Atspi_Selection.selected_child.get;
-      Elm_Interface_Atspi_Selection.selected_child_deselect;
-      Elm_Interface_Atspi_Selection.child_select;
-      Elm_Interface_Atspi_Selection.child_deselect;
-      Elm_Interface_Atspi_Selection.is_child_selected;
-      Elm_Interface_Atspi_Selection.all_children_select;
-      Elm_Interface_Atspi_Selection.clear;
+      Elm.Interface_Scrollable.bounce_allow.set;
+      Elm.Interface_Scrollable.policy;
+      Elm.Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Selection.selected_children_count.get;
+      Elm.Interface_Atspi_Selection.selected_child.get;
+      Elm.Interface_Atspi_Selection.selected_child_deselect;
+      Elm.Interface_Atspi_Selection.child_select;
+      Elm.Interface_Atspi_Selection.child_deselect;
+      Elm.Interface_Atspi_Selection.is_child_selected;
+      Elm.Interface_Atspi_Selection.all_children_select;
+      Elm.Interface_Atspi_Selection.clear;
    }
    events {
       realized;
diff --git a/legacy/elementary/src/lib/elm_gengrid_item.eo b/legacy/elementary/src/lib/elm_gengrid_item.eo
index 719d00f07e..ff370b8267 100644
--- a/legacy/elementary/src/lib/elm_gengrid_item.eo
+++ b/legacy/elementary/src/lib/elm_gengrid_item.eo
@@ -210,7 +210,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
            Elm.Widget_Item.tooltip_unset;
            Elm.Widget_Item.cursor.set;
            Elm.Widget_Item.cursor_unset;
-           Elm_Interface_Atspi_Accessible.name.get;
-           Elm_Interface_Atspi_Accessible.state_set.get;
+           Elm.Interface_Atspi_Accessible.name.get;
+           Elm.Interface_Atspi_Accessible.state_set.get;
       }
 }
diff --git a/legacy/elementary/src/lib/elm_gengrid_pan.eo b/legacy/elementary/src/lib/elm_gengrid_pan.eo
index f2e182d561..2b643c1275 100644
--- a/legacy/elementary/src/lib/elm_gengrid_pan.eo
+++ b/legacy/elementary/src/lib/elm_gengrid_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Gengrid_Pan (Elm_Pan)
+class Elm.Gengrid_Pan (Elm.Pan)
 {
    eo_prefix: elm_obj_gengrid_pan;
    implements {
@@ -7,10 +7,10 @@ class Elm.Gengrid_Pan (Elm_Pan)
       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;
-      Elm_Pan.pos_max.get;
+      Elm.Pan.content_size.get;
+      Elm.Pan.pos;
+      Elm.Pan.pos_min.get;
+      Elm.Pan.pos_max.get;
    }
    events {
    }
diff --git a/legacy/elementary/src/lib/elm_genlist.eo b/legacy/elementary/src/lib/elm_genlist.eo
index d15a05c920..c695b719b7 100644
--- a/legacy/elementary/src/lib/elm_genlist.eo
+++ b/legacy/elementary/src/lib/elm_genlist.eo
@@ -1,7 +1,7 @@
 import elm_general;
 
-class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
-                   Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection,
+class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
+                   Elm.Interface_Atspi_Widget_Action, Elm.Interface_Atspi_Selection,
                    Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_genlist;
@@ -533,19 +533,19 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
       Elm.Widget.item_loop_enabled.get;
       Elm.Layout.sub_object_add_enable;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Scrollable.bounce_allow;
-      Elm_Interface_Scrollable.policy;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-      Elm_Interface_Atspi_Selection.selected_children_count.get;
-      Elm_Interface_Atspi_Selection.selected_child.get;
-      Elm_Interface_Atspi_Selection.selected_child_deselect;
-      Elm_Interface_Atspi_Selection.child_select;
-      Elm_Interface_Atspi_Selection.child_deselect;
-      Elm_Interface_Atspi_Selection.is_child_selected;
-      Elm_Interface_Atspi_Selection.all_children_select;
-      Elm_Interface_Atspi_Selection.clear;
+      Elm.Interface_Scrollable.bounce_allow;
+      Elm.Interface_Scrollable.policy;
+      Elm.Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Selection.selected_children_count.get;
+      Elm.Interface_Atspi_Selection.selected_child.get;
+      Elm.Interface_Atspi_Selection.selected_child_deselect;
+      Elm.Interface_Atspi_Selection.child_select;
+      Elm.Interface_Atspi_Selection.child_deselect;
+      Elm.Interface_Atspi_Selection.is_child_selected;
+      Elm.Interface_Atspi_Selection.all_children_select;
+      Elm.Interface_Atspi_Selection.clear;
    }
    events {
       item,focused;
diff --git a/legacy/elementary/src/lib/elm_genlist_item.eo b/legacy/elementary/src/lib/elm_genlist_item.eo
index 695296ee95..4773a16963 100644
--- a/legacy/elementary/src/lib/elm_genlist_item.eo
+++ b/legacy/elementary/src/lib/elm_genlist_item.eo
@@ -435,7 +435,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
            Elm.Widget_Item.tooltip_unset;
            Elm.Widget_Item.cursor.set;
            Elm.Widget_Item.cursor_unset;
-           Elm_Interface_Atspi_Accessible.name.get;
-           Elm_Interface_Atspi_Accessible.state_set.get;
+           Elm.Interface_Atspi_Accessible.name.get;
+           Elm.Interface_Atspi_Accessible.state_set.get;
       }
 }
diff --git a/legacy/elementary/src/lib/elm_genlist_pan.eo b/legacy/elementary/src/lib/elm_genlist_pan.eo
index e280ce42c8..926b0ccaf0 100644
--- a/legacy/elementary/src/lib/elm_genlist_pan.eo
+++ b/legacy/elementary/src/lib/elm_genlist_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Genlist_Pan (Elm_Pan)
+class Elm.Genlist_Pan (Elm.Pan)
 {
    eo_prefix: elm_obj_genlist_pan;
    implements {
@@ -8,10 +8,10 @@ class Elm.Genlist_Pan (Elm_Pan)
       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;
-      Elm_Pan.pos_max.get;
+      Elm.Pan.content_size.get;
+      Elm.Pan.pos;
+      Elm.Pan.pos_min.get;
+      Elm.Pan.pos_max.get;
    }
    events {
       item,focused;
diff --git a/legacy/elementary/src/lib/elm_hover.eo b/legacy/elementary/src/lib/elm_hover.eo
index 65a32384c7..f5b05bce5e 100644
--- a/legacy/elementary/src/lib/elm_hover.eo
+++ b/legacy/elementary/src/lib/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
    both [[ELM_HOVER_AXIS_BOTH -- both.]]
 }
 
-class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm_Interface_Atspi_Widget_Action)
+class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_hover;
    methods {
@@ -75,7 +75,7 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm_Interface_Atspi_Widge
       Elm.Container.content_unset;
       Elm.Layout.sizing_eval;
       Elm.Layout.content_aliases.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       smart,changed;
diff --git a/legacy/elementary/src/lib/elm_hoversel.eo b/legacy/elementary/src/lib/elm_hoversel.eo
index 86ed7cb680..cf2d1a2c78 100644
--- a/legacy/elementary/src/lib/elm_hoversel.eo
+++ b/legacy/elementary/src/lib/elm_hoversel.eo
@@ -1,6 +1,6 @@
 class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
                     Evas.Clickable_Interface,
-                    Elm_Interface_Atspi_Widget_Action)
+                    Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_hoversel;
    methods {
@@ -98,7 +98,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
       Elm.Widget.translate;
       Elm.Widget.event;
       Elm.Button.admits_autorepeat.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       dismissed;
diff --git a/legacy/elementary/src/lib/elm_image.eo b/legacy/elementary/src/lib/elm_image.eo
index 0040e2fb9f..6ffffdcef4 100644
--- a/legacy/elementary/src/lib/elm_image.eo
+++ b/legacy/elementary/src/lib/elm_image.eo
@@ -1,6 +1,6 @@
 class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
                  Edje.Object,
-                 Elm_Interface_Atspi_Image, Elm_Interface_Atspi_Widget_Action,
+                 Elm.Interface_Atspi_Image, Elm.Interface_Atspi_Widget_Action,
                  Efl.Player)
 {
    eo_prefix: elm_obj_image;
@@ -298,8 +298,8 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
       Evas.Object_Smart.resize;
       Elm.Widget.theme_apply;
       Elm.Widget.event;
-      Elm_Interface_Atspi_Image.extents.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Image.extents.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       drop;
diff --git a/legacy/elementary/src/lib/elm_index.eo b/legacy/elementary/src/lib/elm_index.eo
index a11545b1d9..c9315bc471 100644
--- a/legacy/elementary/src/lib/elm_index.eo
+++ b/legacy/elementary/src/lib/elm_index.eo
@@ -243,7 +243,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, Evas.Selectable_Interface
       Elm.Widget.access;
       Elm.Widget.focus_next;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.children.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_index_item.eo b/legacy/elementary/src/lib/elm_index_item.eo
index c9f7a7a37f..6b888f2263 100644
--- a/legacy/elementary/src/lib/elm_index_item.eo
+++ b/legacy/elementary/src/lib/elm_index_item.eo
@@ -1,4 +1,4 @@
-class Elm.Index_Item(Elm.Widget_Item, Elm_Interface_Atspi_Widget_Action)
+class Elm.Index_Item(Elm.Widget_Item, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_index_item;
    methods {
@@ -42,7 +42,7 @@ class Elm.Index_Item(Elm.Widget_Item, Elm_Interface_Atspi_Widget_Action)
         Eo.Base.constructor;
         Eo.Base.destructor;
         Elm.Widget_Item.access_register;
-        Elm_Interface_Atspi_Accessible.name.get;
-        Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+        Elm.Interface_Atspi_Accessible.name.get;
+        Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo b/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo
index 378674ee85..759b561167 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo
@@ -6,7 +6,7 @@ enum Elm.Atspi.Type
    skipped [[skip object in accessibility hierarchy]]
 }
 
-mixin Elm_Interface_Atspi_Accessible ()
+mixin Elm.Interface_Atspi_Accessible ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_accessible;
@@ -53,7 +53,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             [[Gets widget's accessible children.]]
          }
          values {
-            children: free(own(list<Elm_Interface_Atspi_Accessible *> *), eina_list_free);
+            children: free(own(list<Elm.Interface_Atspi_Accessible *> *), eina_list_free);
          }
       }
       @property role_name @protected {
@@ -99,7 +99,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             [[Sets widget accessible parent.]]
          }
          values {
-            parent: Elm_Interface_Atspi_Accessible *;
+            parent: Elm.Interface_Atspi_Accessible *;
          }
       }
       @property state_set @protected {
@@ -126,7 +126,7 @@ mixin Elm_Interface_Atspi_Accessible ()
       }
       event_emit @class @protected {
          params {
-            @in accessible: Elm_Interface_Atspi_Accessible *; [[Accessibility object.]]
+            @in accessible: Elm.Interface_Atspi_Accessible *; [[Accessibility object.]]
             @in event: const(Eo_Event_Description)*; [[Accessibility event type.]]
             @in event_info: void*; [[Accessibility event details.]]
          }
@@ -185,7 +185,7 @@ mixin Elm_Interface_Atspi_Accessible ()
          return: bool;
          params {
             @in type: Elm_Atspi_Relation_Type;
-            @in relation_object: const(Elm_Interface_Atspi_Accessible)*;
+            @in relation_object: const(Elm.Interface_Atspi_Accessible)*;
          }
       }
       relationship_remove {
@@ -196,7 +196,7 @@ mixin Elm_Interface_Atspi_Accessible ()
          ]]
          params {
             @in type: Elm_Atspi_Relation_Type;
-            @in relation_object: const(Elm_Interface_Atspi_Accessible)*;
+            @in relation_object: const(Elm.Interface_Atspi_Accessible)*;
          }
       }
       relationships_clear {
@@ -206,7 +206,7 @@ mixin Elm_Interface_Atspi_Accessible ()
          get {
             [[Get root object of accessible object hierarchy]]
             values {
-               ret: Eo*;
+               ret: Eo.Base*;
             }
          }
       }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_action.eo b/legacy/elementary/src/lib/elm_interface_atspi_action.eo
index 79f25b6de3..cf282d9c3b 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_action.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_action.eo
@@ -1,4 +1,4 @@
-mixin Elm_Interface_Atspi_Action ()
+mixin Elm.Interface_Atspi_Action ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_action;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.eo b/legacy/elementary/src/lib/elm_interface_atspi_component.eo
index 089b2f9b4a..c3d9c95e3d 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_component.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_component.eo
@@ -1,4 +1,4 @@
-mixin Elm_Interface_Atspi_Component ()
+mixin Elm.Interface_Atspi_Component ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_component;
@@ -96,7 +96,7 @@ mixin Elm_Interface_Atspi_Component ()
             @in x: int;
             @in y: int;
          }
-         return: Eo*;
+         return: Eo.Base*;
       }
    }
 }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo b/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo
index b920c26c33..43a9c827e4 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo
@@ -1,4 +1,4 @@
-interface Elm_Interface_Atspi_Editable_Text ()
+interface Elm.Interface_Atspi_Editable_Text ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_editable_text;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_image.eo b/legacy/elementary/src/lib/elm_interface_atspi_image.eo
index 3345e246b8..b897ff998d 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_image.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_image.eo
@@ -1,4 +1,4 @@
-mixin Elm_Interface_Atspi_Image ()
+mixin Elm.Interface_Atspi_Image ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_image;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_selection.eo b/legacy/elementary/src/lib/elm_interface_atspi_selection.eo
index 490757c4c7..f45b0bce8e 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_selection.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_selection.eo
@@ -1,4 +1,4 @@
-interface Elm_Interface_Atspi_Selection ()
+interface Elm.Interface_Atspi_Selection ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_selection;
@@ -12,7 +12,7 @@ interface Elm_Interface_Atspi_Selection ()
       @property selected_child @protected {
          [[Gets child for given child index]]
          get {
-            return: Eo *;
+            return: Eo.Base *;
          }
          keys {
             selected_child_index: int; [[index of selected child]]
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.eo b/legacy/elementary/src/lib/elm_interface_atspi_text.eo
index f5a7e589ff..eb358a5fe7 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_text.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_text.eo
@@ -1,4 +1,4 @@
-interface Elm_Interface_Atspi_Text ()
+interface Elm.Interface_Atspi_Text ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_text;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_value.eo b/legacy/elementary/src/lib/elm_interface_atspi_value.eo
index 2b4432a13c..b1ebf2749a 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_value.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_value.eo
@@ -1,4 +1,4 @@
-interface Elm_Interface_Atspi_Value ()
+interface Elm.Interface_Atspi_Value ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_value;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo
index 8f2b3650a9..7b258de01b 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo
@@ -1,4 +1,4 @@
-mixin Elm_Interface_Atspi_Widget_Action (Elm_Interface_Atspi_Action)
+mixin Elm.Interface_Atspi_Widget_Action (Elm.Interface_Atspi_Action)
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_widget_action;
@@ -13,12 +13,12 @@ mixin Elm_Interface_Atspi_Widget_Action (Elm_Interface_Atspi_Action)
       }
    }
    implements {
-      Elm_Interface_Atspi_Action.action_do;
-      Elm_Interface_Atspi_Action.keybinding_get;
-      Elm_Interface_Atspi_Action.name.get;
-      Elm_Interface_Atspi_Action.description.set;
-      Elm_Interface_Atspi_Action.description.get;
-      Elm_Interface_Atspi_Action.actions.get;
+      Elm.Interface_Atspi_Action.action_do;
+      Elm.Interface_Atspi_Action.keybinding_get;
+      Elm.Interface_Atspi_Action.name.get;
+      Elm.Interface_Atspi_Action.description.set;
+      Elm.Interface_Atspi_Action.description.get;
+      Elm.Interface_Atspi_Action.actions.get;
       @virtual .elm_actions.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_window.eo b/legacy/elementary/src/lib/elm_interface_atspi_window.eo
index 2925d9740d..f99c1571b7 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_window.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_window.eo
@@ -1,4 +1,4 @@
-interface Elm_Interface_Atspi_Window ()
+interface Elm.Interface_Atspi_Window ()
 {
    events {
       window,created; [[Called when new window has been created.]]
diff --git a/legacy/elementary/src/lib/elm_interface_fileselector.eo b/legacy/elementary/src/lib/elm_interface_fileselector.eo
index 4fb69fe0ee..b90fe9b588 100644
--- a/legacy/elementary/src/lib/elm_interface_fileselector.eo
+++ b/legacy/elementary/src/lib/elm_interface_fileselector.eo
@@ -22,7 +22,7 @@ enum Elm.Fileselector.Sort
    last [[Sentinel (helper) value, not used.]]
 }
 
-interface Elm_Interface_Fileselector ()
+interface Elm.Interface_Fileselector ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_fileselector;
diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.eo b/legacy/elementary/src/lib/elm_interface_scrollable.eo
index ed00a7aa1c..8b7cb0735d 100644
--- a/legacy/elementary/src/lib/elm_interface_scrollable.eo
+++ b/legacy/elementary/src/lib/elm_interface_scrollable.eo
@@ -1,4 +1,4 @@
-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;
diff --git a/legacy/elementary/src/lib/elm_list.eo b/legacy/elementary/src/lib/elm_list.eo
index dea166cef8..d421341c47 100644
--- a/legacy/elementary/src/lib/elm_list.eo
+++ b/legacy/elementary/src/lib/elm_list.eo
@@ -36,8 +36,8 @@ enum Elm.List.Mode
    last [[Indicates error if returned by elm_list_mode_get().]]
 }
 
-class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
-                Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection,
+class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
+                Elm.Interface_Atspi_Widget_Action, Elm.Interface_Atspi_Selection,
                 Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_list;
@@ -447,17 +447,17 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Widget.item_loop_enabled.set;
       Elm.Widget.item_loop_enabled.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Scrollable.policy.set;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Selection.selected_children_count.get;
-      Elm_Interface_Atspi_Selection.selected_child.get;
-      Elm_Interface_Atspi_Selection.selected_child_deselect;
-      Elm_Interface_Atspi_Selection.child_select;
-      Elm_Interface_Atspi_Selection.child_deselect;
-      Elm_Interface_Atspi_Selection.is_child_selected;
-      Elm_Interface_Atspi_Selection.all_children_select;
-      Elm_Interface_Atspi_Selection.clear;
+      Elm.Interface_Scrollable.policy.set;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Selection.selected_children_count.get;
+      Elm.Interface_Atspi_Selection.selected_child.get;
+      Elm.Interface_Atspi_Selection.selected_child_deselect;
+      Elm.Interface_Atspi_Selection.child_select;
+      Elm.Interface_Atspi_Selection.child_deselect;
+      Elm.Interface_Atspi_Selection.is_child_selected;
+      Elm.Interface_Atspi_Selection.all_children_select;
+      Elm.Interface_Atspi_Selection.clear;
    }
    events {
       activated;
diff --git a/legacy/elementary/src/lib/elm_list_item.eo b/legacy/elementary/src/lib/elm_list_item.eo
index cd57846f0f..cf59a27081 100644
--- a/legacy/elementary/src/lib/elm_list_item.eo
+++ b/legacy/elementary/src/lib/elm_list_item.eo
@@ -116,8 +116,8 @@ class Elm.List_Item(Elm.Widget_Item)
            Elm.Widget_Item.part_content.get;
            Elm.Widget_Item.part_content.set;
            Elm.Widget_Item.part_content_unset;
-           Elm_Interface_Atspi_Accessible.name.get;
-           Elm_Interface_Atspi_Accessible.state_set.get;
+           Elm.Interface_Atspi_Accessible.name.get;
+           Elm.Interface_Atspi_Accessible.state_set.get;
       }
 }
 
diff --git a/legacy/elementary/src/lib/elm_map.eo b/legacy/elementary/src/lib/elm_map.eo
index ec1ba93003..e98ce82436 100644
--- a/legacy/elementary/src/lib/elm_map.eo
+++ b/legacy/elementary/src/lib/elm_map.eo
@@ -1,5 +1,5 @@
-class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
-               Elm_Interface_Atspi_Widget_Action,
+class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
+               Elm.Interface_Atspi_Widget_Action,
                Evas.Clickable_Interface)
 {
    eo_prefix: elm_obj_map;
@@ -561,7 +561,7 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
       Elm.Widget.event;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       press;
diff --git a/legacy/elementary/src/lib/elm_map_pan.eo b/legacy/elementary/src/lib/elm_map_pan.eo
index 54cb6a18a0..8520de6850 100644
--- a/legacy/elementary/src/lib/elm_map_pan.eo
+++ b/legacy/elementary/src/lib/elm_map_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Map_Pan (Elm_Pan)
+class Elm.Map_Pan (Elm.Pan)
 {
    eo_prefix: elm_obj_map_pan;
    implements {
@@ -7,10 +7,10 @@ class Elm.Map_Pan (Elm_Pan)
       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;
-      Elm_Pan.pos_max.get;
+      Elm.Pan.content_size.get;
+      Elm.Pan.pos;
+      Elm.Pan.pos_min.get;
+      Elm.Pan.pos_max.get;
    }
    events {
       loaded;
diff --git a/legacy/elementary/src/lib/elm_menu.eo b/legacy/elementary/src/lib/elm_menu.eo
index 334163b9c3..c77c1ca08b 100644
--- a/legacy/elementary/src/lib/elm_menu.eo
+++ b/legacy/elementary/src/lib/elm_menu.eo
@@ -1,4 +1,4 @@
-class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm_Interface_Atspi_Selection)
+class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm.Interface_Atspi_Selection)
 {
    eo_prefix: elm_obj_menu;
    methods {
@@ -76,9 +76,9 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm_Interface_Atspi_Select
       Elm.Widget.parent;
       Elm.Widget.theme_apply;
       Elm.Widget.translate;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Selection.selected_children_count.get;
-      Elm_Interface_Atspi_Selection.selected_child.get;
+      Elm.Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Selection.selected_children_count.get;
+      Elm.Interface_Atspi_Selection.selected_child.get;
    }
    events {
       dismissed;
diff --git a/legacy/elementary/src/lib/elm_menu_item.eo b/legacy/elementary/src/lib/elm_menu_item.eo
index 543de9d8b0..59f3831ac3 100644
--- a/legacy/elementary/src/lib/elm_menu_item.eo
+++ b/legacy/elementary/src/lib/elm_menu_item.eo
@@ -1,4 +1,4 @@
-class Elm.Menu_Item(Elm.Widget_Item, Elm_Interface_Atspi_Selection)
+class Elm.Menu_Item(Elm.Widget_Item, Elm.Interface_Atspi_Selection)
 {
    eo_prefix: elm_obj_menu_item;
    methods {
@@ -81,12 +81,12 @@ class Elm.Menu_Item(Elm.Widget_Item, Elm_Interface_Atspi_Selection)
         Elm.Widget_Item.part_text.set;
         Elm.Widget_Item.part_content.get;
         Elm.Widget_Item.part_content.set;
-        Elm_Interface_Atspi_Accessible.children.get;
-        Elm_Interface_Atspi_Accessible.parent.get;
-        Elm_Interface_Atspi_Accessible.role.get;
-        Elm_Interface_Atspi_Accessible.name.get;
-        Elm_Interface_Atspi_Accessible.state_set.get;
-        Elm_Interface_Atspi_Selection.selected_children_count.get;
-        Elm_Interface_Atspi_Selection.selected_child.get;
+        Elm.Interface_Atspi_Accessible.children.get;
+        Elm.Interface_Atspi_Accessible.parent.get;
+        Elm.Interface_Atspi_Accessible.role.get;
+        Elm.Interface_Atspi_Accessible.name.get;
+        Elm.Interface_Atspi_Accessible.state_set.get;
+        Elm.Interface_Atspi_Selection.selected_children_count.get;
+        Elm.Interface_Atspi_Selection.selected_child.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_multibuttonentry.eo b/legacy/elementary/src/lib/elm_multibuttonentry.eo
index 2d266fd1bb..08b2113deb 100644
--- a/legacy/elementary/src/lib/elm_multibuttonentry.eo
+++ b/legacy/elementary/src/lib/elm_multibuttonentry.eo
@@ -184,7 +184,7 @@ class Elm.Multibuttonentry (Elm.Layout)
       Elm.Layout.text.set;
       Elm.Layout.text.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.children.get;
    }
    events {
       item,selected;
diff --git a/legacy/elementary/src/lib/elm_multibuttonentry_item.eo b/legacy/elementary/src/lib/elm_multibuttonentry_item.eo
index 74066312f2..5a49ee6f66 100644
--- a/legacy/elementary/src/lib/elm_multibuttonentry_item.eo
+++ b/legacy/elementary/src/lib/elm_multibuttonentry_item.eo
@@ -1,5 +1,5 @@
 class Elm.Multibuttonentry_Item(Elm.Widget_Item,
-                                Elm_Interface_Atspi_Widget_Action)
+                                Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_multibuttonentry_item;
    methods {
@@ -29,7 +29,7 @@ class Elm.Multibuttonentry_Item(Elm.Widget_Item,
         Elm.Widget_Item.part_text.get;
         Elm.Widget_Item.part_text.set;
         Elm.Widget_Item.disable;
-        Elm_Interface_Atspi_Accessible.name.get;
-        Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+        Elm.Interface_Atspi_Accessible.name.get;
+        Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_naviframe.eo b/legacy/elementary/src/lib/elm_naviframe.eo
index 83f224caf3..84d3dcc275 100644
--- a/legacy/elementary/src/lib/elm_naviframe.eo
+++ b/legacy/elementary/src/lib/elm_naviframe.eo
@@ -1,4 +1,4 @@
-class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Naviframe (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_naviframe;
    methods {
@@ -158,7 +158,7 @@ class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Layout.text.get;
       Elm.Layout.signal_emit;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       transition,finished;
diff --git a/legacy/elementary/src/lib/elm_pan.eo b/legacy/elementary/src/lib/elm_pan.eo
index 84368d51a1..bf5bab1823 100644
--- a/legacy/elementary/src/lib/elm_pan.eo
+++ b/legacy/elementary/src/lib/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/legacy/elementary/src/lib/elm_panel.eo b/legacy/elementary/src/lib/elm_panel.eo
index 667834c7a9..e6c64a2a65 100644
--- a/legacy/elementary/src/lib/elm_panel.eo
+++ b/legacy/elementary/src/lib/elm_panel.eo
@@ -8,8 +8,8 @@ enum Elm.Panel.Orient
    right [[Panel (dis)appears from the right]]
 }
 
-class Elm.Panel (Elm.Layout, Elm_Interface_Scrollable,
-                 Elm_Interface_Atspi_Widget_Action)
+class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
+                 Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_panel;
    methods {
@@ -83,6 +83,6 @@ class Elm.Panel (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Container.content_unset;
       Elm.Container.content_set;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_photocam.eo b/legacy/elementary/src/lib/elm_photocam.eo
index acfb87a6ba..d540dab9ff 100644
--- a/legacy/elementary/src/lib/elm_photocam.eo
+++ b/legacy/elementary/src/lib/elm_photocam.eo
@@ -1,5 +1,5 @@
-class Elm.Photocam (Elm.Widget, Elm_Interface_Scrollable,
-                    Elm_Interface_Atspi_Widget_Action, Efl.File,
+class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
+                    Elm.Interface_Atspi_Widget_Action, Efl.File,
                     Evas.Clickable_Interface, Evas.Scrollable_Interface,
                     Evas.Zoomable_Interface)
 {
@@ -183,8 +183,8 @@ class Elm.Photocam (Elm.Widget, Elm_Interface_Scrollable,
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
       Elm.Widget.event;
-      Elm_Interface_Scrollable.region_bring_in;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Scrollable.region_bring_in;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
       Efl.File.file.set;
       Efl.File.file.get;
    }
diff --git a/legacy/elementary/src/lib/elm_photocam_pan.eo b/legacy/elementary/src/lib/elm_photocam_pan.eo
index 5b56f21938..8831f6aa33 100644
--- a/legacy/elementary/src/lib/elm_photocam_pan.eo
+++ b/legacy/elementary/src/lib/elm_photocam_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Photocam_Pan (Elm_Pan)
+class Elm.Photocam_Pan (Elm.Pan)
 {
    eo_prefix: elm_obj_photocam_pan;
    implements {
@@ -7,10 +7,10 @@ class Elm.Photocam_Pan (Elm_Pan)
       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;
-      Elm_Pan.pos_max.get;
+      Elm.Pan.content_size.get;
+      Elm.Pan.pos;
+      Elm.Pan.pos_min.get;
+      Elm.Pan.pos_max.get;
    }
    events {
       load;
diff --git a/legacy/elementary/src/lib/elm_player.eo b/legacy/elementary/src/lib/elm_player.eo
index 8c94386bc2..be14828737 100644
--- a/legacy/elementary/src/lib/elm_player.eo
+++ b/legacy/elementary/src/lib/elm_player.eo
@@ -1,4 +1,4 @@
-class Elm.Player (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Player (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_player;
    implements {
@@ -10,7 +10,7 @@ class Elm.Player (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Widget.event;
       Elm.Container.content_set;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       forward,clicked;
diff --git a/legacy/elementary/src/lib/elm_popup.eo b/legacy/elementary/src/lib/elm_popup.eo
index 8160094c56..ec89df8cad 100644
--- a/legacy/elementary/src/lib/elm_popup.eo
+++ b/legacy/elementary/src/lib/elm_popup.eo
@@ -23,7 +23,7 @@ enum Elm.Popup.Orient
 }
 
 
-class Elm.Popup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Popup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_popup;
    methods {
@@ -183,8 +183,8 @@ class Elm.Popup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Layout.text.set;
       Elm.Layout.text.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
    }
    events {
       block,clicked;
diff --git a/legacy/elementary/src/lib/elm_radio.eo b/legacy/elementary/src/lib/elm_radio.eo
index 56c3b7dcb1..fe43968094 100644
--- a/legacy/elementary/src/lib/elm_radio.eo
+++ b/legacy/elementary/src/lib/elm_radio.eo
@@ -1,4 +1,4 @@
-class Elm.Radio (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Radio (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_radio;
    methods {
@@ -88,8 +88,8 @@ class Elm.Radio (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Layout.text_aliases.get;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_scroller.eo b/legacy/elementary/src/lib/elm_scroller.eo
index 3dfacc6eb7..fc53ddee23 100644
--- a/legacy/elementary/src/lib/elm_scroller.eo
+++ b/legacy/elementary/src/lib/elm_scroller.eo
@@ -2,7 +2,7 @@ enum Elm.Scroller.Policy
 {
    [[Type that controls when scrollbars should appear.
 
-     See also @Elm_Interface_Scrollable.policy.set.
+     See also @Elm.Interface_Scrollable.policy.set.
    ]]
    auto = 0, [[Show scrollbars as needed]]
    on, [[Always show scrollbars]]
@@ -14,7 +14,7 @@ enum Elm.Scroller.Single_Direction
 {
    [[Type that controls how the content is scrolled.
 
-     See also @Elm_Interface_Scrollable.single_direction.set.
+     See also @Elm.Interface_Scrollable.single_direction.set.
    ]]
    none = 0, [[Scroll every direction]]
    soft, [[Scroll single direction if the direction is certain]]
@@ -34,8 +34,8 @@ enum Elm.Scroller.Movement_Block
    block_horizontal = 1 << 2 [[Block horizontal movements]]
 }
 
-class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
-                    Elm_Interface_Atspi_Widget_Action,
+class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
+                    Elm.Interface_Atspi_Widget_Action,
                     Evas.Scrollable_Interface)
 {
    eo_prefix: elm_obj_scroller;
@@ -110,10 +110,10 @@ class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Container.content_set;
       Elm.Container.content_unset;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Scrollable.page_size.set;
-      Elm_Interface_Scrollable.policy.set;
-      Elm_Interface_Scrollable.single_direction;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Scrollable.page_size.set;
+      Elm.Interface_Scrollable.policy.set;
+      Elm.Interface_Scrollable.single_direction;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       scroll,page,changed;
diff --git a/legacy/elementary/src/lib/elm_slider.eo b/legacy/elementary/src/lib/elm_slider.eo
index 7298e89ad0..5fc16960d6 100644
--- a/legacy/elementary/src/lib/elm_slider.eo
+++ b/legacy/elementary/src/lib/elm_slider.eo
@@ -1,5 +1,5 @@
-class Elm.Slider (Elm.Layout, Elm_Interface_Atspi_Value,
-                  Elm_Interface_Atspi_Widget_Action)
+class Elm.Slider (Elm.Layout, Elm.Interface_Atspi_Value,
+                  Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_slider;
    methods {
@@ -279,11 +279,11 @@ class Elm.Slider (Elm.Layout, Elm_Interface_Atspi_Value,
       Elm.Layout.text_aliases.get;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Value.value_and_text.get;
-      Elm_Interface_Atspi_Value.value_and_text.set;
-      Elm_Interface_Atspi_Value.range.get;
-      Elm_Interface_Atspi_Value.increment.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Value.value_and_text.get;
+      Elm.Interface_Atspi_Value.value_and_text.set;
+      Elm.Interface_Atspi_Value.range.get;
+      Elm.Interface_Atspi_Value.increment.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_slideshow.eo b/legacy/elementary/src/lib/elm_slideshow.eo
index 498c62d118..295ee93fa3 100644
--- a/legacy/elementary/src/lib/elm_slideshow.eo
+++ b/legacy/elementary/src/lib/elm_slideshow.eo
@@ -1,4 +1,4 @@
-class Elm.Slideshow (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
+class Elm.Slideshow (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_slideshow;
    methods {
@@ -306,7 +306,7 @@ class Elm.Slideshow (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_spinner.eo b/legacy/elementary/src/lib/elm_spinner.eo
index 9e7a83a3f1..ae39f55813 100644
--- a/legacy/elementary/src/lib/elm_spinner.eo
+++ b/legacy/elementary/src/lib/elm_spinner.eo
@@ -1,4 +1,4 @@
-class Elm.Spinner (Elm.Layout, Elm_Interface_Atspi_Value, Elm_Interface_Atspi_Widget_Action)
+class Elm.Spinner (Elm.Layout, Elm.Interface_Atspi_Value, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_spinner;
    methods {
@@ -232,12 +232,12 @@ class Elm.Spinner (Elm.Layout, Elm_Interface_Atspi_Value, Elm_Interface_Atspi_Wi
       Elm.Widget.on_focus;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Accessible.name.get;
-      Elm_Interface_Atspi_Value.value_and_text.get;
-      Elm_Interface_Atspi_Value.value_and_text.set;
-      Elm_Interface_Atspi_Value.range.get;
-      Elm_Interface_Atspi_Value.increment.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.name.get;
+      Elm.Interface_Atspi_Value.value_and_text.get;
+      Elm.Interface_Atspi_Value.value_and_text.set;
+      Elm.Interface_Atspi_Value.range.get;
+      Elm.Interface_Atspi_Value.increment.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
       changed;
diff --git a/legacy/elementary/src/lib/elm_toolbar.eo b/legacy/elementary/src/lib/elm_toolbar.eo
index e2b77af32d..1af9546b94 100644
--- a/legacy/elementary/src/lib/elm_toolbar.eo
+++ b/legacy/elementary/src/lib/elm_toolbar.eo
@@ -23,8 +23,8 @@ enum Elm.Toolbar.Shrink_Mode
    last [[Indicates error if returned by elm_toolbar_shrink_mode_get()]]
 }
 
-class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
-                   Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection,
+class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable,
+                   Elm.Interface_Atspi_Widget_Action, Elm.Interface_Atspi_Selection,
                    Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_toolbar;
@@ -382,17 +382,17 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
       Elm.Widget.event;
       Elm.Widget.focus_highlight_geometry_get;
       Elm.Widget.focused_item.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Selection.selected_children_count.get;
-      Elm_Interface_Atspi_Selection.selected_child.get;
-      Elm_Interface_Atspi_Selection.selected_child_deselect;
-      Elm_Interface_Atspi_Selection.child_select;
-      Elm_Interface_Atspi_Selection.child_deselect;
-      Elm_Interface_Atspi_Selection.is_child_selected;
-      Elm_Interface_Atspi_Selection.all_children_select;
-      Elm_Interface_Atspi_Selection.clear;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Selection.selected_children_count.get;
+      Elm.Interface_Atspi_Selection.selected_child.get;
+      Elm.Interface_Atspi_Selection.selected_child_deselect;
+      Elm.Interface_Atspi_Selection.child_select;
+      Elm.Interface_Atspi_Selection.child_deselect;
+      Elm.Interface_Atspi_Selection.is_child_selected;
+      Elm.Interface_Atspi_Selection.all_children_select;
+      Elm.Interface_Atspi_Selection.clear;
    }
    events {
       item,focused;
diff --git a/legacy/elementary/src/lib/elm_toolbar_item.eo b/legacy/elementary/src/lib/elm_toolbar_item.eo
index 461552d0f3..23c752a19f 100644
--- a/legacy/elementary/src/lib/elm_toolbar_item.eo
+++ b/legacy/elementary/src/lib/elm_toolbar_item.eo
@@ -304,7 +304,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
            Elm.Widget_Item.part_content.get;
            Elm.Widget_Item.part_content.set;
            Elm.Widget_Item.part_content_unset;
-           Elm_Interface_Atspi_Accessible.name.get;
-           Elm_Interface_Atspi_Accessible.state_set.get;
+           Elm.Interface_Atspi_Accessible.name.get;
+           Elm.Interface_Atspi_Accessible.state_set.get;
       }
 }
diff --git a/legacy/elementary/src/lib/elm_video.eo b/legacy/elementary/src/lib/elm_video.eo
index 6198161aed..4bb4637cb6 100644
--- a/legacy/elementary/src/lib/elm_video.eo
+++ b/legacy/elementary/src/lib/elm_video.eo
@@ -1,4 +1,4 @@
-class Elm.Video (Elm.Layout, Efl.File, Elm_Interface_Atspi_Widget_Action)
+class Elm.Video (Elm.Layout, Efl.File, Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_video;
    methods {
@@ -117,6 +117,6 @@ class Elm.Video (Elm.Layout, Efl.File, Elm_Interface_Atspi_Widget_Action)
       Elm.Widget.focus_direction_manager_is;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
 }
diff --git a/legacy/elementary/src/lib/elm_view_form.eo b/legacy/elementary/src/lib/elm_view_form.eo
index 2bda65dbbe..f9c47b40a6 100644
--- a/legacy/elementary/src/lib/elm_view_form.eo
+++ b/legacy/elementary/src/lib/elm_view_form.eo
@@ -1,4 +1,4 @@
-class Elm_View_Form (Eo.Base)
+class Elm.View_Form (Eo.Base)
 {
     legacy_prefix: null;
     methods {
diff --git a/legacy/elementary/src/lib/elm_view_list.eo b/legacy/elementary/src/lib/elm_view_list.eo
index f3274f2582..a5806efe5d 100644
--- a/legacy/elementary/src/lib/elm_view_list.eo
+++ b/legacy/elementary/src/lib/elm_view_list.eo
@@ -1,4 +1,4 @@
-class Elm_View_List (Eo.Base)
+class Elm.View_List (Eo.Base)
 {
     legacy_prefix: null;
     methods {
@@ -53,7 +53,7 @@ class Elm_View_List (Eo.Base)
                @since 1.11
              ]]
              params {
-                 @out model: Eo *; [[Returned Emodel]]
+                 @out model: Efl.Model.Base *; [[Returned Emodel]]
              }
         }
     }
diff --git a/legacy/elementary/src/lib/elm_widget.eo b/legacy/elementary/src/lib/elm_widget.eo
index 35bed55f1d..7981beb601 100644
--- a/legacy/elementary/src/lib/elm_widget.eo
+++ b/legacy/elementary/src/lib/elm_widget.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-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;
@@ -766,12 +766,12 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       @virtual .focus_direction;
       @virtual .focus_next;
       @virtual .parent_widget.get;
-      Elm_Interface_Atspi_Accessible.name.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Accessible.parent.get;
-      Elm_Interface_Atspi_Accessible.attributes.get;
-      Elm_Interface_Atspi_Component.focus_grab;
+      Elm.Interface_Atspi_Accessible.name.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Accessible.children.get;
+      Elm.Interface_Atspi_Accessible.parent.get;
+      Elm.Interface_Atspi_Accessible.attributes.get;
+      Elm.Interface_Atspi_Component.focus_grab;
    }
    events {
       moved;
diff --git a/legacy/elementary/src/lib/elm_widget_item.eo b/legacy/elementary/src/lib/elm_widget_item.eo
index a937b4ec42..f25ed1a1aa 100644
--- a/legacy/elementary/src/lib/elm_widget_item.eo
+++ b/legacy/elementary/src/lib/elm_widget_item.eo
@@ -1,5 +1,5 @@
-class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
-                      Elm_Interface_Atspi_Component)
+class Elm.Widget_Item(Eo.Base, Elm.Interface_Atspi_Accessible,
+                      Elm.Interface_Atspi_Component)
 {
       eo_prefix: elm_wdg_item;
       legacy_prefix: elm_object_item;
@@ -529,11 +529,11 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
       implements {
            Eo.Base.constructor;
            Eo.Base.destructor;
-           Elm_Interface_Atspi_Accessible.state_set.get;
-           Elm_Interface_Atspi_Component.extents.get;
-           Elm_Interface_Atspi_Component.extents.set;
-           Elm_Interface_Atspi_Component.alpha.get;
-           Elm_Interface_Atspi_Component.layer.get;
-           Elm_Interface_Atspi_Component.focus_grab;
+           Elm.Interface_Atspi_Accessible.state_set.get;
+           Elm.Interface_Atspi_Component.extents.get;
+           Elm.Interface_Atspi_Component.extents.set;
+           Elm.Interface_Atspi_Component.alpha.get;
+           Elm.Interface_Atspi_Component.layer.get;
+           Elm.Interface_Atspi_Component.focus_grab;
       }
 }
diff --git a/legacy/elementary/src/lib/elm_win.eo b/legacy/elementary/src/lib/elm_win.eo
index c59abfeb21..8dacecec07 100644
--- a/legacy/elementary/src/lib/elm_win.eo
+++ b/legacy/elementary/src/lib/elm_win.eo
@@ -154,8 +154,8 @@ enum Elm.Illume_Command
    close [[Closes the currently active window]]
 }
 
-class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
-               Elm_Interface_Atspi_Widget_Action)
+class Elm.Win (Elm.Widget, Elm.Interface_Atspi_Window,
+               Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_win;
    methods {
@@ -1283,10 +1283,10 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus;
       Elm.Widget.event;
-      Elm_Interface_Atspi_Accessible.parent.get;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Accessible.name.get;
-      Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface_Atspi_Accessible.parent.get;
+      Elm.Interface_Atspi_Accessible.state_set.get;
+      Elm.Interface_Atspi_Accessible.name.get;
+      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
    constructors {
       .name;