diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo
index c3658aafe6..c2618d5f66 100644
--- a/src/lib/elementary/elm_atspi_app_object.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index 7c5265be07..07417b7b10 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/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)
 {
    [[Push-button widget
 
@@ -85,6 +85,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/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 750f4dc3b0..6f3ad59f65 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -72,7 +72,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)
 {
    [[Calendar widget
 
@@ -391,7 +391,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; [[Emitted when the date in the calendar is changed]]
diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo
index aba2dc082b..c2ab375d66 100644
--- a/src/lib/elementary/elm_check.eo
+++ b/src/lib/elementary/elm_check.eo
@@ -1,4 +1,4 @@
-class Elm.Check (Efl.Ui.Nstate, Elm.Interface_Atspi_Widget_Action)
+class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
 {
    [[Check widget
 
@@ -31,8 +31,8 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface_Atspi_Widget_Action)
       Elm.Layout.text_aliases.get;
       Efl.Ui.Nstate.count.set;
       Efl.Ui.Nstate.value.set;
-      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; [[This is called whenever the user changes the state of the check
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index f22cdb99dd..5aab88a998 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index 039b0a0890..63946548b5 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/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, Elm.Multibuttonentry)
 {
    eo_prefix: elm_obj_combobox;
@@ -65,7 +65,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/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 710fd617d7..4249129c9f 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/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, Efl.Orientation)
+class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientation)
 {
    eo_prefix: elm_obj_ctxpopup;
    methods {
@@ -217,8 +217,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action, Efl.Orientati
       Efl.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;
       Efl.Orientation.orientation;
    }
    events {
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 5d2d4467f5..848491a45d 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -1,5 +1,5 @@
 class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
-                        Elm.Interface_Atspi_Widget_Action,
+                        Elm.Interface.Atspi_Widget_Action,
                         Evas.Clickable_Interface, Evas.Scrollable_Interface,
                         Evas.Selectable_Interface)
 {
@@ -209,7 +209,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
       Elm.Widget.sub_object_del;
       Elm.Widget.event;
       Elm.Interface_Scrollable.policy;
-      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface.Atspi_Widget_Action.elm_actions.get;
    }
    events {
    }
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 824744a951..10c3bc4a01 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -115,7 +115,7 @@ enum Elm.Cnp_Mode
 }
 
 class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
-                 Elm.Interface_Atspi_Text, Elm.Interface_Atspi_Editable_Text, Efl.File,
+                 Elm.Interface.Atspi.Text, Elm.Interface.Atspi_Editable_Text, Efl.File,
                  Evas.Selectable_Interface, Evas.Scrollable_Interface)
 {
    eo_prefix: elm_obj_entry;
@@ -960,32 +960,32 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
       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.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/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index d6f7fd4003..7f275bf10f 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,5 +1,5 @@
 class Elm.Fileselector (Elm.Layout, Elm.Interface_Fileselector,
-                        Elm.Interface_Atspi_Widget_Action,
+                        Elm.Interface.Atspi_Widget_Action,
                         Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_fileselector;
@@ -56,7 +56,7 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface_Fileselector,
       Elm.Interface_Fileselector.folder_only;
       Elm.Interface_Fileselector.mode;
       Elm.Interface_Fileselector.current_name;
-      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface.Atspi_Widget_Action.elm_actions.get;
    }
    events {
       done;
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 20be74c785..274097d84b 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,5 +1,5 @@
 class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
-                        Elm.Interface_Atspi_Widget_Action,
+                        Elm.Interface.Atspi_Widget_Action,
                         Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_flipselector;
@@ -135,7 +135,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
       Efl.Ui.Spin.step;
       Efl.Ui.Spin.value;
       Efl.Ui.Spin.interval;
-      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface.Atspi_Widget_Action.elm_actions.get;
    }
    events {
       underflowed;
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 090c280478..1732fe1e0d 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -8,8 +8,8 @@ enum Elm.Gengrid.Reorder_Type
 }
 
 class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
-                   Evas.Clickable_Interface, Elm.Interface_Atspi_Widget_Action,
-                   Elm.Interface_Atspi_Selection)
+                   Evas.Clickable_Interface, Elm.Interface.Atspi_Widget_Action,
+                   Elm.Interface.Atspi.Selection)
 {
    eo_prefix: elm_obj_gengrid;
    methods {
@@ -559,17 +559,17 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
       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.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/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index 5dca3993c5..c81c34852f 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -222,7 +222,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/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 99b195c588..2c126441e6 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -3,7 +3,7 @@ import elm_list;
 import elm_genlist_item;
 
 class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
-                   Elm.Interface_Atspi_Widget_Action, Elm.Interface_Atspi_Selection,
+                   Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
                    Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_genlist;
@@ -546,17 +546,17 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
       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.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/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo
index f4c49ea2eb..5098a5af2c 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -437,7 +437,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/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 411cce81da..42072b7cac 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/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
       Efl.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/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 78c6db0ae9..5070aa482a 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,7 +1,7 @@
 import elm_icon;
 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 {
@@ -99,7 +99,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/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo
index 41fc327192..38b9548733 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/elm_image.eo
@@ -43,7 +43,7 @@ struct Elm.Image.Error
 
 class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
                  Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, Efl.Player,
-                 Elm.Interface_Atspi_Image, Elm.Interface_Atspi_Widget_Action,
+                 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
                  Edje.Object, Efl.Orientation, Efl.Flipable)
 {
    eo_prefix: elm_obj_image;
@@ -153,8 +153,8 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
       Evas.Draggable_Interface.drag_target.get;
       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/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 2b4771c90a..1cad0fcc77 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo
index 8243f12b15..fce375ba59 100644
--- a/src/lib/elementary/elm_index_item.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo
index 9c83eef920..1454fedafa 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.eo
+++ b/src/lib/elementary/elm_interface_atspi_accessible.eo
@@ -222,7 +222,7 @@ struct Elm.Atspi.Relation
 
 type Elm.Atspi.Relation_Set: list<Elm.Atspi.Relation *> *;
 
-mixin Elm.Interface_Atspi_Accessible ()
+mixin Elm.Interface.Atspi_Accessible ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_accessible;
@@ -269,7 +269,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 {
@@ -315,7 +315,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 {
@@ -342,7 +342,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.]]
          }
@@ -401,7 +401,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 {
@@ -412,7 +412,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 {
diff --git a/src/lib/elementary/elm_interface_atspi_action.eo b/src/lib/elementary/elm_interface_atspi_action.eo
index cf282d9c3b..558b4a131a 100644
--- a/src/lib/elementary/elm_interface_atspi_action.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_interface_atspi_component.eo b/src/lib/elementary/elm_interface_atspi_component.eo
index c3d9c95e3d..e08c3c2cd1 100644
--- a/src/lib/elementary/elm_interface_atspi_component.eo
+++ b/src/lib/elementary/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;
diff --git a/src/lib/elementary/elm_interface_atspi_editable_text.eo b/src/lib/elementary/elm_interface_atspi_editable_text.eo
index 43a9c827e4..c06e59751e 100644
--- a/src/lib/elementary/elm_interface_atspi_editable_text.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_interface_atspi_image.eo b/src/lib/elementary/elm_interface_atspi_image.eo
index b897ff998d..ed7ce9b612 100644
--- a/src/lib/elementary/elm_interface_atspi_image.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_interface_atspi_selection.eo b/src/lib/elementary/elm_interface_atspi_selection.eo
index f45b0bce8e..5144a23164 100644
--- a/src/lib/elementary/elm_interface_atspi_selection.eo
+++ b/src/lib/elementary/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;
diff --git a/src/lib/elementary/elm_interface_atspi_text.eo b/src/lib/elementary/elm_interface_atspi_text.eo
index f058273311..152c383d11 100644
--- a/src/lib/elementary/elm_interface_atspi_text.eo
+++ b/src/lib/elementary/elm_interface_atspi_text.eo
@@ -39,7 +39,7 @@ struct Elm.Atspi_Text.Change_Info
    len: size;
 }
 
-interface Elm.Interface_Atspi_Text ()
+interface Elm.Interface.Atspi.Text ()
 {
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_text;
diff --git a/src/lib/elementary/elm_interface_atspi_value.eo b/src/lib/elementary/elm_interface_atspi_value.eo
index b1ebf2749a..c0ae236447 100644
--- a/src/lib/elementary/elm_interface_atspi_value.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo
index d31115fdcf..e93a422aa9 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.eo
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo
@@ -1,6 +1,6 @@
 type Elm_Atspi_Action: __undefined_type;
 
-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;
@@ -15,12 +15,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/src/lib/elementary/elm_interface_atspi_window.eo b/src/lib/elementary/elm_interface_atspi_window.eo
index f99c1571b7..f43a77f5ab 100644
--- a/src/lib/elementary/elm_interface_atspi_window.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 4ece744958..feb62e707c 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -37,7 +37,7 @@ enum Elm.List.Mode
 }
 
 class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
-                Elm.Interface_Atspi_Widget_Action, Elm.Interface_Atspi_Selection,
+                Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
                 Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_list;
@@ -448,16 +448,16 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
       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.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/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo
index 81c217da8f..ece25d2e82 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index ffcda15bf5..295438b361 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -70,7 +70,7 @@ enum Elm.Map.Route_Method
 
 
 class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
-               Elm.Interface_Atspi_Widget_Action,
+               Elm.Interface.Atspi_Widget_Action,
                Evas.Clickable_Interface)
 {
    eo_prefix: elm_obj_map;
@@ -632,7 +632,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/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 75078609c4..f411eb29e8 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/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.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/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo
index 9a715178ec..614e10c999 100644
--- a/src/lib/elementary/elm_menu_item.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 307eae5259..0b76cacf15 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -187,7 +187,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/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo
index 55cbf76684..7ecfcd805e 100644
--- a/src/lib/elementary/elm_multibuttonentry_item.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 8768bb549f..50c22f4c13 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index ca2ac7e25c..4eec9cd88c 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -9,7 +9,7 @@ enum Elm.Panel.Orient
 }
 
 class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
-                 Elm.Interface_Atspi_Widget_Action)
+                 Elm.Interface.Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_panel;
    methods {
@@ -83,6 +83,6 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
       Efl.Container.content_unset;
       Efl.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/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index 471261ee89..2c06a01d3d 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -11,7 +11,7 @@ enum Elm.Photocam.Zoom_Mode
 }
 
 class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
-                    Elm.Interface_Atspi_Widget_Action, Efl.File,
+                    Elm.Interface.Atspi_Widget_Action, Efl.File,
                     Evas.Clickable_Interface, Evas.Scrollable_Interface,
                     Evas.Zoomable_Interface)
 {
@@ -196,7 +196,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
       Elm.Widget.on_focus;
       Elm.Widget.event;
       Elm.Interface_Scrollable.region_bring_in;
-      Elm.Interface_Atspi_Widget_Action.elm_actions.get;
+      Elm.Interface.Atspi_Widget_Action.elm_actions.get;
       Efl.File.file.set;
       Efl.File.file.get;
    }
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index d7d1cef469..823545a0d0 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/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;
       Efl.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/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index fa34273f83..e50337322d 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/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 {
@@ -184,8 +184,8 @@ class Elm.Popup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
       Elm.Layout.text.get;
       Elm.Layout.sizing_eval;
       Elm.Layout.signal_emit;
-      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/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 95dd95c69e..cc1d9ccd25 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -1,4 +1,4 @@
-class Elm.Radio (Elm.Check, Elm.Interface_Atspi_Widget_Action)
+class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_radio;
    methods {
@@ -82,8 +82,8 @@ class Elm.Radio (Elm.Check, Elm.Interface_Atspi_Widget_Action)
       Elm.Widget.activate;
       Elm.Widget.event;
       Elm.Layout.text_aliases.get;
-      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/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 9292f7d8fe..abf9a9197e 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -1,5 +1,5 @@
 class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
-                    Elm.Interface_Atspi_Widget_Action,
+                    Elm.Interface.Atspi_Widget_Action,
                     Evas.Scrollable_Interface)
 {
    eo_prefix: elm_obj_scroller;
@@ -77,7 +77,7 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
       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.Atspi_Widget_Action.elm_actions.get;
    }
    events {
       scroll,page,changed;
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 7afcbe2237..f3098763ff 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -3,8 +3,8 @@ type slider_freefunc_type: __undefined_type;
 
 class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
                   Efl.Orientation,
-                  Elm.Interface_Atspi_Value,
-                  Elm.Interface_Atspi_Widget_Action)
+                  Elm.Interface.Atspi.Value,
+                  Elm.Interface.Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_slider;
    methods {
@@ -185,11 +185,11 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
       Efl.Ui.Progress.progress_value;
       Efl.Ui.Progress.unit_format;
       Efl.Orientation.orientation;
-      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/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index 076c7cfd06..7a9f1af697 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,6 +1,6 @@
 type Elm_Slideshow_Item_Class: __undefined_type;
 
-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 {
@@ -308,7 +308,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/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index eb4bf996ef..9dd5901fd5 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,5 +1,5 @@
 class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
-                   Elm.Interface_Atspi_Value, Elm.Interface_Atspi_Widget_Action)
+                   Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_spinner;
    methods {
@@ -158,12 +158,12 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
       Efl.Ui.Spin.step;
       Efl.Ui.Spin.value;
       Efl.Ui.Spin.interval;
-      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/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 2038890afc..a187e4be2f 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -25,7 +25,7 @@ enum Elm.Toolbar.Shrink_Mode
 }
 
 class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
-                   Elm.Interface_Atspi_Widget_Action, Elm.Interface_Atspi_Selection,
+                   Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
                    Evas.Clickable_Interface, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_toolbar;
@@ -359,17 +359,17 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
       Elm.Widget.focus_highlight_geometry_get;
       Elm.Widget.focused_item.get;
       Efl.Orientation.orientation;
-      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/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index 98db0b6973..6851d6c81d 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -317,7 +317,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/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo
index 160e79bf18..750ab33dfd 100644
--- a/src/lib/elementary/elm_video.eo
+++ b/src/lib/elementary/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/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 4bdc6e30b5..2b8e727e3b 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;
@@ -863,12 +863,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/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index a997e0c018..4111bee901 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -1,7 +1,7 @@
 import elm_general;
 
-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;
@@ -531,11 +531,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/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo
index 4b67ee9f5b..79ac8a968f 100644
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/elm_win.eo
@@ -161,8 +161,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, Efl.Pack)
+class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
+               Elm.Interface.Atspi_Widget_Action, Efl.Pack)
 {
    eo_prefix: elm_obj_win;
    methods {
@@ -1169,10 +1169,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;
       Efl.Container.content_remove;
       Efl.Container.content_iterate;
       Efl.Container.content_count;