diff --git a/src/lib/elementary/efl_selection.eo b/src/lib/elementary/efl_selection.eo
index 8dda11cb08..9db0de597b 100644
--- a/src/lib/elementary/efl_selection.eo
+++ b/src/lib/elementary/efl_selection.eo
@@ -7,8 +7,8 @@ mixin Efl.Selection {
       selection_set {
          [[Set the selection data to the object]]
          params {
-            @in type: Efl.Selection.Type; [[Selection Type]]
-            @in format: Efl.Selection.Format; [[Selection Format]]
+            @in type: Efl.Selection_Type; [[Selection Type]]
+            @in format: Efl.Selection_Format; [[Selection Format]]
             @in data: Eina.Slice;
             @in seat: uint;[[Specified seat for multiple seats case.]]
          }
@@ -17,29 +17,29 @@ mixin Efl.Selection {
       selection_get {
          [[Get the data from the object that has selection]]
          params {
-            @in type: Efl.Selection.Type; [[Selection Type]]
-            @in format: Efl.Selection.Format; [[Selection Format]]
-            @in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]]
+            @in type: Efl.Selection_Type; [[Selection Type]]
+            @in format: Efl.Selection_Format; [[Selection Format]]
+            @in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
             @in seat: uint;[[Specified seat for multiple seats case.]]
          }
       }
       selection_clear {
          [[Clear the selection data from the object]]
          params {
-            @in type: Efl.Selection.Type; [[Selection Type]]
+            @in type: Efl.Selection_Type; [[Selection Type]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
       }
       has_owner {
          [[Determine whether the selection data has owner]]
          params {
-            @in type: Efl.Selection.Type; [[Selection type]]
+            @in type: Efl.Selection_Type; [[Selection type]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
          return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]]
       }
    }
    events {
-      selection,changed: Efl.Selection.Changed; [[Called when display server's selection has changed]]
+      selection,changed: Efl.Selection_Changed; [[Called when display server's selection has changed]]
    }
 }
diff --git a/src/lib/elementary/efl_selection_manager.eo b/src/lib/elementary/efl_selection_manager.eo
index 8556d063b1..00914e53ba 100644
--- a/src/lib/elementary/efl_selection_manager.eo
+++ b/src/lib/elementary/efl_selection_manager.eo
@@ -6,8 +6,8 @@ class Efl.Selection_Manager (Efl.Object) {
          [[Set selection]]
          params {
             @in owner: Efl.Object; [[Seleciton owner]]
-            @in type: Efl.Selection.Type; [[Selection type]]
-            @in format: Efl.Selection.Format; [[Selection format]]
+            @in type: Efl.Selection_Type; [[Selection type]]
+            @in format: Efl.Selection_Format; [[Selection format]]
             @in data: Eina.Slice; [[Selection data]]
             @in seat: uint @optional;[[Specified seat for multiple seats case.]]
          }
@@ -17,16 +17,16 @@ class Efl.Selection_Manager (Efl.Object) {
          [[Get selection]]
          params {
             @in request: const(Efl.Object); [[Seleciton owner]]
-            @in type: Efl.Selection.Type; [[Selection type]]
-            @in format: Efl.Selection.Format; [[Selection Format]]
-            @in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]]
+            @in type: Efl.Selection_Type; [[Selection type]]
+            @in format: Efl.Selection_Format; [[Selection Format]]
+            @in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
             @in seat: uint @optional;[[Specified seat for multiple seats case.]]
          }
       }
       selection_clear @beta {
          params {
             @in owner: Efl.Object; [[Seleciton owner]]
-            @in type: Efl.Selection.Type; [[Selection type]]
+            @in type: Efl.Selection_Type; [[Selection type]]
             @in seat: uint @optional; [[Specified seat for multiple seats case.]]
          }
       }
@@ -34,7 +34,7 @@ class Efl.Selection_Manager (Efl.Object) {
          [[Check if the request object has selection or not]]
          params {
             @in request: Efl.Object; [[Request object]]
-            @in type: Efl.Selection.Type; [[Selection type]]
+            @in type: Efl.Selection_Type; [[Selection type]]
             @in seat: uint @optional; [[Specified seat for multiple seats case.]]
          }
          return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]]
@@ -48,9 +48,9 @@ class Efl.Selection_Manager (Efl.Object) {
           ]]
          params {
             @in drag_obj: Efl.Object; [[Drag object]]
-            @in format: Efl.Selection.Format; [[Data format]]
+            @in format: Efl.Selection_Format; [[Data format]]
             @in data: Eina.Slice; [[Data to transfer]]
-            @in action: Efl.Selection.Action; [[Action when data is transferred]]
+            @in action: Efl.Selection_Action; [[Action when data is transferred]]
             @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
@@ -59,7 +59,7 @@ class Efl.Selection_Manager (Efl.Object) {
          [[This sets the action for the drag]]
          params {
             @in drag_obj: Efl.Object; [[Drag object]]
-            @in action: Efl.Selection.Action; [[Drag action]]
+            @in action: Efl.Selection_Action; [[Drag action]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
       }
@@ -102,7 +102,7 @@ class Efl.Selection_Manager (Efl.Object) {
               - EFL_UI_DND_DROP_DRAG_DROP.]]
          params {
             @in target_obj: Efl.Object; [[Drop target]]
-            @in format: Efl.Selection.Format; [[Accepted data format]]
+            @in format: Efl.Selection_Format; [[Accepted data format]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
          return: bool; [[$true on success, $false otherwise]]
@@ -111,7 +111,7 @@ class Efl.Selection_Manager (Efl.Object) {
          [[Remove a dropable target]]
          params {
             @in target_obj: Efl.Object; [[Drop target]]
-            @in format: Efl.Selection.Format; [[Accepted data format]]
+            @in format: Efl.Selection_Format; [[Accepted data format]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
       }
@@ -119,7 +119,7 @@ class Efl.Selection_Manager (Efl.Object) {
          [[Add dropable target for a container in which items can drop to it]]
          params {
             @in cont: Efl.Object; [[Container object]]
-            @in format: Efl.Selection.Format; [[Accepted data formats]]
+            @in format: Efl.Selection_Format; [[Accepted data formats]]
             @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
diff --git a/src/lib/elementary/efl_selection_types.eot b/src/lib/elementary/efl_selection_types.eot
index 93838453c7..e5849597fd 100644
--- a/src/lib/elementary/efl_selection_types.eot
+++ b/src/lib/elementary/efl_selection_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Selection.Type
+enum Efl.Selection_Type
 {
    [[Selection type]]
    primary, [[Primary text selection (highlighted or selected text)]]
@@ -7,7 +7,7 @@ enum Efl.Selection.Type
    clipboard [[Clipboard selection (ctrl+C)]]
 }
 
-enum Efl.Selection.Format
+enum Efl.Selection_Format
 {
    [[Selection format]]
    targets = -1, [[For matching every possible atom]]
@@ -19,7 +19,7 @@ enum Efl.Selection.Format
    html = 0x10 [[Raw HTML-like data (eg. webkit)]]
 }
 
-enum Efl.Selection.Action
+enum Efl.Selection_Action
 {
    [[Defines the kind of action associated with the drop data]]
    unknown, [[Action type is unknown]]
@@ -32,27 +32,27 @@ enum Efl.Selection.Action
    description [[Describe the data]]
 }
 
-struct Efl.Selection.Data
+struct Efl.Selection_Data
 {
    [[Structure holding the info about selected data]]
    pos: Eina.Position2D; [[Coordinates of the drop (DND operations only)]]
-   format: Efl.Selection.Format; [[Format of the selection]]
+   format: Efl.Selection_Format; [[Format of the selection]]
    content: Eina.Slice; [[Selection data]]
-   action: Efl.Selection.Action; [[Action to perform with the data]]
+   action: Efl.Selection_Action; [[Action to perform with the data]]
    item: Efl.Object; [[Item under the drag position. It is only available for container]]
 }
 
-function Efl.Selection.Data_Ready {
+function Efl.Selection_Data_Ready {
    [[Function pointer for getting selection]]
    params {
       @in obj: Efl.Object; [[Object which requested for the selection]]
-      @in seldata: ptr(Efl.Selection.Data); [[Selection data]]
+      @in seldata: ptr(Efl.Selection_Data); [[Selection data]]
    }
 };
 
-struct Efl.Selection.Changed
+struct Efl.Selection_Changed
 {
-   type: Efl.Selection.Type; [[Selection type]]
+   type: Efl.Selection_Type; [[Selection type]]
    seat: int; [[The seat on which the selection changed, or NULL for "default"]]
    display: void_ptr; [[The display connection object, NULL under X11]]
    exist: bool; [[EINA_TRUE if the selection has an owner]]
diff --git a/src/lib/elementary/efl_ui_dnd.eo b/src/lib/elementary/efl_ui_dnd.eo
index a8d5563600..7c903c88cb 100644
--- a/src/lib/elementary/efl_ui_dnd.eo
+++ b/src/lib/elementary/efl_ui_dnd.eo
@@ -11,9 +11,9 @@ mixin Efl.Ui.Dnd {
               - EFL_UI_DND_EVENT_DRAG_DONE
          ]]
          params {
-            @in format: Efl.Selection.Format; [[The data format]]
+            @in format: Efl.Selection_Format; [[The data format]]
             @in data: Eina.Slice; [[The drag data]]
-            @in action: Efl.Selection.Action; [[Action when data is transferred]]
+            @in action: Efl.Selection_Action; [[Action when data is transferred]]
             @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
@@ -21,7 +21,7 @@ mixin Efl.Ui.Dnd {
       drag_action_set {
          [[Set the action for the drag]]
          params {
-            @in action: Efl.Selection.Action; [[Drag action]]
+            @in action: Efl.Selection_Action; [[Drag action]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
       }
@@ -39,14 +39,14 @@ mixin Efl.Ui.Dnd {
             - EFL_UI_DND_EVENT_DRAG_POS
             - EFL_UI_DND_EVENT_DRAG_DROP.]]
          params {
-            @in format: Efl.Selection.Format; [[Accepted data format]]
+            @in format: Efl.Selection_Format; [[Accepted data format]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
       }
       drop_target_del {
          [[Delete the dropable status from object]]
          params {
-            @in format: Efl.Selection.Format; [[Accepted data format]]
+            @in format: Efl.Selection_Format; [[Accepted data format]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
       }
@@ -58,6 +58,6 @@ mixin Efl.Ui.Dnd {
       drag,enter: void; [[called when the drag object enters this object]]
       drag,leave: void; [[called when the drag object leaves this object]]
       drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]]
-      drag,drop: Efl.Selection.Data; [[called when the drag object dropped on this object]]
+      drag,drop: Efl.Selection_Data; [[called when the drag object dropped on this object]]
    }
 }
diff --git a/src/lib/elementary/efl_ui_dnd_container.eo b/src/lib/elementary/efl_ui_dnd_container.eo
index f437080c6e..6334ea5ff5 100644
--- a/src/lib/elementary/efl_ui_dnd_container.eo
+++ b/src/lib/elementary/efl_ui_dnd_container.eo
@@ -34,7 +34,7 @@ mixin Efl.Ui.Dnd_Container {
       }
       drop_item_add {
          params {
-            @in format: Efl.Selection.Format; [[Accepted data formats]]
+            @in format: Efl.Selection_Format; [[Accepted data formats]]
             @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
             @in seat: uint; [[Specified seat for multiple seats case.]]
          }
diff --git a/src/lib/elementary/efl_ui_dnd_types.eot b/src/lib/elementary/efl_ui_dnd_types.eot
index 01fec18e3f..4e125c417a 100644
--- a/src/lib/elementary/efl_ui_dnd_types.eot
+++ b/src/lib/elementary/efl_ui_dnd_types.eot
@@ -14,9 +14,9 @@ function Efl.Dnd.Drag_Data_Get {
    [[Function pointer for getting data and format at the drag side.]]
    params {
       @in obj: Efl.Canvas.Object; [[The container object]]
-      @out format: Efl.Selection.Format; [[Data format]]
+      @out format: Efl.Selection_Format; [[Data format]]
       @out drag_data: Eina.Rw_Slice; [[Data]]
-      @out action: Efl.Selection.Action; [[The drag action]]
+      @out action: Efl.Selection_Action; [[The drag action]]
    }
 };
 
@@ -46,13 +46,13 @@ struct Efl.Dnd.Drag_Accept {
 
 struct Efl.Dnd.Drag_Pos {
    pos: Eina.Position2D; [[Evas Coordinate]]
-   action: Efl.Selection.Action; [[The drag action]]
-   format: Efl.Selection.Format; [[The drag format]]
+   action: Efl.Selection_Action; [[The drag action]]
+   format: Efl.Selection_Format; [[The drag format]]
    item: Efl.Canvas.Object; [[The item object. It is only available for container object.]]
 }
 
 struct Efl.Dnd.Drag_Item_Container_Drop {
    item: Efl.Canvas.Object; [[The item object]]
-   data: Efl.Selection.Data; [[The selection data]]
+   data: Efl.Selection_Data; [[The selection data]]
    pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]]
 }
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 398b8041b1..aaf34cce4d 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -59,7 +59,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
          }
       }
       @property cnp_mode {
-         /* FIXME: Efl.Selection.Format does not allow markup without images! */
+         /* FIXME: Efl.Selection_Format does not allow markup without images! */
          set {
             [[Control pasting of text and images for the widget.
 
@@ -78,7 +78,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
             ]]
          }
          values {
-            format: Efl.Selection.Format; [[Format for copy & paste.]]
+            format: Efl.Selection_Format; [[Format for copy & paste.]]
          }
       }
       @property input_panel_language {