tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ef6c88435bab007c94d451375f39f015a6592541

commit ef6c88435bab007c94d451375f39f015a6592541
Author: Tom Hacohen <t...@stosb.com>
Date:   Thu May 12 11:21:36 2016 +0100

    Elm items: Fix namespacing to use . and not _.
---
 src/lib/elementary/elm_color_item.eo            |  6 ++--
 src/lib/elementary/elm_colorselector.eo         |  6 ++--
 src/lib/elementary/elm_ctxpopup.eo              | 10 +++---
 src/lib/elementary/elm_ctxpopup_item.eo         | 22 ++++++------
 src/lib/elementary/elm_dayselector_item.eo      |  2 +-
 src/lib/elementary/elm_diskselector.eo          | 10 +++---
 src/lib/elementary/elm_diskselector_item.eo     | 14 ++++----
 src/lib/elementary/elm_flipselector.eo          | 12 +++----
 src/lib/elementary/elm_flipselector_item.eo     | 12 +++----
 src/lib/elementary/elm_gengrid.eo               | 28 +++++++--------
 src/lib/elementary/elm_gengrid_item.eo          | 38 ++++++++++----------
 src/lib/elementary/elm_genlist.eo               | 40 ++++++++++-----------
 src/lib/elementary/elm_genlist_item.eo          | 46 ++++++++++++-------------
 src/lib/elementary/elm_hoversel.eo              |  6 ++--
 src/lib/elementary/elm_hoversel_item.eo         | 18 +++++-----
 src/lib/elementary/elm_index.eo                 | 18 +++++-----
 src/lib/elementary/elm_index_item.eo            |  4 +--
 src/lib/elementary/elm_list.eo                  | 28 +++++++--------
 src/lib/elementary/elm_list_item.eo             | 26 +++++++-------
 src/lib/elementary/elm_menu.eo                  | 16 ++++-----
 src/lib/elementary/elm_menu_item.eo             | 20 +++++------
 src/lib/elementary/elm_multibuttonentry.eo      | 28 +++++++--------
 src/lib/elementary/elm_multibuttonentry_item.eo | 14 ++++----
 src/lib/elementary/elm_naviframe.eo             | 16 ++++-----
 src/lib/elementary/elm_naviframe_item.eo        | 14 ++++----
 src/lib/elementary/elm_popup.eo                 |  2 +-
 src/lib/elementary/elm_popup_item.eo            | 16 ++++-----
 src/lib/elementary/elm_segment_control.eo       |  8 ++---
 src/lib/elementary/elm_segment_control_item.eo  | 12 +++----
 src/lib/elementary/elm_slideshow.eo             | 12 +++----
 src/lib/elementary/elm_slideshow_item.eo        |  2 +-
 src/lib/elementary/elm_toolbar.eo               | 22 ++++++------
 src/lib/elementary/elm_toolbar_item.eo          | 42 +++++++++++-----------
 src/lib/elementary/elm_widget.eo                | 22 ++++++------
 src/lib/elementary/elm_widget_item.eo           |  6 ++--
 35 files changed, 299 insertions(+), 299 deletions(-)

diff --git a/src/lib/elementary/elm_color_item.eo 
b/src/lib/elementary/elm_color_item.eo
index b918c49..0cb7b34 100644
--- a/src/lib/elementary/elm_color_item.eo
+++ b/src/lib/elementary/elm_color_item.eo
@@ -1,4 +1,4 @@
-class Elm.Color_Item(Elm.Widget_Item)
+class Elm.Color.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_color_item;
    methods {
@@ -37,7 +37,7 @@ class Elm.Color_Item(Elm.Widget_Item)
    implements {
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Elm.Widget_Item.access_register;
-      Elm.Widget_Item.signal_emit;
+      Elm.Widget.Item.access_register;
+      Elm.Widget.Item.signal_emit;
    }
 }
diff --git a/src/lib/elementary/elm_colorselector.eo 
b/src/lib/elementary/elm_colorselector.eo
index 87093f1..f22cdb9 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -75,7 +75,7 @@ class Elm.Colorselector (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action,
 
               @since 1.9
             ]]
-            return: const(list<Elm.Widget_Item*>)*;[[The list of color palette 
items.]]
+            return: const(list<Elm.Widget.Item*>)*;[[The list of color palette 
items.]]
          }
       }
       @property palette_selected_item {
@@ -84,14 +84,14 @@ class Elm.Colorselector (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action,
 
               @since 1.9]]
 
-            return: Elm.Widget_Item *;[[The selected item, or $null if none
+            return: Elm.Widget.Item *;[[The selected item, or $null if none
 selected.]]
          }
       }
       palette_color_add {
          [[Add a new color item to palette.]]
 
-         return: Elm.Widget_Item *;[[A new color palette Item.]]
+         return: Elm.Widget.Item *;[[A new color palette Item.]]
          params {
             @in r: int; [[r-value of color]]
             @in g: int; [[g-value of color]]
diff --git a/src/lib/elementary/elm_ctxpopup.eo 
b/src/lib/elementary/elm_ctxpopup.eo
index f957698..710fd61 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -114,7 +114,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action, Efl.Orientati
 
               @since 1.11
             ]]
-            return: const(list<Elm.Widget_Item*>)*; [[The list of items or
+            return: const(list<Elm.Widget.Item*>)*; [[The list of items or
             $null on errors.]]
 
          }
@@ -129,7 +129,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action, Efl.Orientati
 
               @since 1.11
             ]]
-            return: Elm.Widget_Item *; [[The first item or $null, if it has no 
items (and on
+            return: Elm.Widget.Item *; [[The first item or $null, if it has no 
items (and on
               errors).]]
 
          }
@@ -144,7 +144,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action, Efl.Orientati
 
               @since 1.1
             ]]
-            return: Elm.Widget_Item *; [[The last item or $null, if it has no 
items (and on
+            return: Elm.Widget.Item *; [[The last item or $null, if it has no 
items (and on
               errors).]]
 
          }
@@ -169,7 +169,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action, Efl.Orientati
 
            See also \@ref elm_object_content_set.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null, on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null, on 
errors.]]
 
          params {
             @in label: const(char)*; [[The Label of the new item]]
@@ -188,7 +188,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action, Efl.Orientati
 
            @since 1.11
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null, on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null, on 
errors.]]
 
          params {
             @in label: const(char)*; [[The Label of the new item]]
diff --git a/src/lib/elementary/elm_ctxpopup_item.eo 
b/src/lib/elementary/elm_ctxpopup_item.eo
index f42979f..8423578 100644
--- a/src/lib/elementary/elm_ctxpopup_item.eo
+++ b/src/lib/elementary/elm_ctxpopup_item.eo
@@ -1,4 +1,4 @@
-class Elm.Ctxpopup_Item(Elm.Widget_Item)
+class Elm.Ctxpopup.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_ctxpopup_item;
    methods {
@@ -13,7 +13,7 @@ class Elm.Ctxpopup_Item(Elm.Widget_Item)
             ]]
          }
          values {
-              item: Elm.Widget_Item *; [[The item before the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
+              item: Elm.Widget.Item *; [[The item before the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
          }
       }
       @property next {
@@ -27,7 +27,7 @@ class Elm.Ctxpopup_Item(Elm.Widget_Item)
             ]]
          }
          values {
-              item: Elm.Widget_Item *; [[The item after the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
+              item: Elm.Widget.Item *; [[The item after the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
          }
       }
       init {
@@ -40,13 +40,13 @@ class Elm.Ctxpopup_Item(Elm.Widget_Item)
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.disable;
-        Elm.Widget_Item.signal_emit;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.part_text.set;
-        Elm.Widget_Item.part_content.get;
-        Elm.Widget_Item.part_content.set;
-        Elm.Widget_Item.focus.set;
-        Elm.Widget_Item.focus.get;
+        Elm.Widget.Item.disable;
+        Elm.Widget.Item.signal_emit;
+        Elm.Widget.Item.part_text.get;
+        Elm.Widget.Item.part_text.set;
+        Elm.Widget.Item.part_content.get;
+        Elm.Widget.Item.part_content.set;
+        Elm.Widget.Item.focus.set;
+        Elm.Widget.Item.focus.get;
    }
 }
diff --git a/src/lib/elementary/elm_dayselector_item.eo 
b/src/lib/elementary/elm_dayselector_item.eo
index 35cadea..3983078 100644
--- a/src/lib/elementary/elm_dayselector_item.eo
+++ b/src/lib/elementary/elm_dayselector_item.eo
@@ -1,4 +1,4 @@
-class Elm.Dayselector_Item(Elm.Widget_Item)
+class Elm.Dayselector.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_dayselector_item;
    implements {
diff --git a/src/lib/elementary/elm_diskselector.eo 
b/src/lib/elementary/elm_diskselector.eo
index b188d10..5d2d446 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -94,7 +94,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
               See also @.item_append,
               @.items.get.
             ]]
-            return: Elm.Widget_Item *; [[The first item, or $null if none.]]
+            return: Elm.Widget.Item *; [[The first item, or $null if none.]]
          }
       }
       @property items {
@@ -105,7 +105,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm.Interface_Scrollable,
               \@ref elm_object_item_del,
               @.clear.
             ]]
-            return: const(list<Elm.Widget_Item*>)*; [[A $list of diskselector 
items, or $ull on failure.]]
+            return: const(list<Elm.Widget.Item*>)*; [[A $list of diskselector 
items, or $ull on failure.]]
          }
       }
       @property last_item {
@@ -118,7 +118,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm.Interface_Scrollable,
               See also @.item_append,
               @.items.get.
             ]]
-            return: Elm.Widget_Item *; [[The last item, or $null if none.]]
+            return: Elm.Widget.Item *; [[The last item, or $null if none.]]
          }
       }
       @property selected_item {
@@ -135,7 +135,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm.Interface_Scrollable,
               apply on the selected item. More details on
               @.side_text_max_length.set.
             ]]
-            return: Elm.Widget_Item *; [[The selected diskselector item.]]
+            return: Elm.Widget.Item *; [[The selected diskselector item.]]
          }
       }
       item_append {
@@ -174,7 +174,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm.Interface_Scrollable,
             * elm_diskselector_item_append(disk, "label", ic, NULL, NULL);
             * @endcode
             */
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in label: const(char)*; [[The label of the diskselector item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use at 
left side of the item. An
diff --git a/src/lib/elementary/elm_diskselector_item.eo 
b/src/lib/elementary/elm_diskselector_item.eo
index c80a7d5..b49721b 100644
--- a/src/lib/elementary/elm_diskselector_item.eo
+++ b/src/lib/elementary/elm_diskselector_item.eo
@@ -1,4 +1,4 @@
-class Elm.Diskselector_Item(Elm.Widget_Item)
+class Elm.Diskselector.Item(Elm.Widget.Item)
 {
       eo_prefix: elm_obj_diskselector_item;
       methods {
@@ -17,7 +17,7 @@ class Elm.Diskselector_Item(Elm.Widget_Item)
                     ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item before $item, or 
$null if none or on failure.]]
+                     item: Elm.Widget.Item *; [[The item before $item, or 
$null if none or on failure.]]
                 }
            }
            @property next {
@@ -35,7 +35,7 @@ class Elm.Diskselector_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item after $item, or $null 
if none or on failure.]]
+                     item: Elm.Widget.Item *; [[The item after $item, or $null 
if none or on failure.]]
                 }
            }
            @property selected {
@@ -82,9 +82,9 @@ class Elm.Diskselector_Item(Elm.Widget_Item)
       implements {
            Eo.Base.constructor;
            Eo.Base.destructor;
-           Elm.Widget_Item.part_text.get;
-           Elm.Widget_Item.part_text.set;
-           Elm.Widget_Item.part_content.get;
-           Elm.Widget_Item.part_content.set;
+           Elm.Widget.Item.part_text.get;
+           Elm.Widget.Item.part_text.set;
+           Elm.Widget.Item.part_content.get;
+           Elm.Widget.Item.part_content.set;
       }
 }
diff --git a/src/lib/elementary/elm_flipselector.eo 
b/src/lib/elementary/elm_flipselector.eo
index 5dc916b..20be74c 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -20,7 +20,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
               items list is changed. It should be fetched again with another
               call to this function when changes happen.
             ]]
-            return: const(list<Elm.Widget_Item*>)*;
+            return: const(list<Elm.Widget.Item*>)*;
          }
       }
       @property first_item {
@@ -31,7 +31,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
               See also @.item_append,
               @.last_item.get.
             ]]
-            return: Elm.Widget_Item *; [[The first item or $null, if it has no 
items (and on
+            return: Elm.Widget.Item *; [[The first item or $null, if it has no 
items (and on
             errors).]]
 
          }
@@ -44,7 +44,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
               See also @.item_prepend,
               @.first_item.get.
             ]]
-            return: Elm.Widget_Item *; [[The last item or $null, if it has no 
items (and on
+            return: Elm.Widget.Item *; [[The last item or $null, if it has no 
items (and on
             errors).]]
 
          }
@@ -52,7 +52,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
       @property selected_item {
          get {
             [[Get the currently selected item in a flip selector widget.]]
-            return: Elm.Widget_Item *; [[The selected item or $null, if the 
widget has no items
+            return: Elm.Widget.Item *; [[The selected item or $null, if the 
widget has no items
               (and on errors).]]
 
          }
@@ -72,7 +72,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
            determined by the widget's theme. Strings larger than
            that value are going to be truncated.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in label: const(char)*; [[The (text) label of the new item.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience callback function 
to take place when
@@ -103,7 +103,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
            determined by the widget's theme. Strings larger than
            that value are going to be truncated.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in label: const(char)*; [[The (text) label of the new item.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience callback function 
to take place when
diff --git a/src/lib/elementary/elm_flipselector_item.eo 
b/src/lib/elementary/elm_flipselector_item.eo
index 640169d..b1b2f23 100644
--- a/src/lib/elementary/elm_flipselector_item.eo
+++ b/src/lib/elementary/elm_flipselector_item.eo
@@ -1,4 +1,4 @@
-class Elm.Flipselector_Item(Elm.Widget_Item)
+class Elm.Flipselector.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_flipselector_item;
    methods {
@@ -33,7 +33,7 @@ class Elm.Flipselector_Item(Elm.Widget_Item)
 
               See also @.next_get.
             ]]
-            return: Elm.Widget_Item *; [[The item before the $item, in its 
parent's list. If there is no previous item for $item or there's an error, 
$null is returned.]]
+            return: Elm.Widget.Item *; [[The item before the $item, in its 
parent's list. If there is no previous item for $item or there's an error, 
$null is returned.]]
         }
       next_get @const {
             [[Get the item after $item in a flip selector widget's
@@ -41,14 +41,14 @@ class Elm.Flipselector_Item(Elm.Widget_Item)
 
               See also @.prev_get.
             ]]
-             return: Elm.Widget_Item *; [[The item after the $item, in its 
parent's list. If there is no next item for $item or there's an error, $null is 
returned.]]
+             return: Elm.Widget.Item *; [[The item after the $item, in its 
parent's list. If there is no next item for $item or there's an error, $null is 
returned.]]
         }
    }
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.signal_emit;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.part_text.set;
+        Elm.Widget.Item.signal_emit;
+        Elm.Widget.Item.part_text.get;
+        Elm.Widget.Item.part_text.set;
    }
 }
diff --git a/src/lib/elementary/elm_gengrid.eo 
b/src/lib/elementary/elm_gengrid.eo
index a40beae..090c280 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -281,7 +281,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
               in the list is selected, which might not be very useful. For
               that case, see @.selected_items.get.
             ]]
-            return: Elm.Widget_Item *; [[The selected item's handle or $null
+            return: Elm.Widget.Item *; [[The selected item's handle or $null
                                          if none is selected at the moment
                                          (and on errors).]]
          }
@@ -308,7 +308,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
               This returns the first item in the $obj's internal list of
               items.
             ]]
-            return: Elm.Widget_Item *; [[
+            return: Elm.Widget.Item *; [[
                The first item's handle or $null, if there are no
                items in $obj (and on errors)
             ]]
@@ -324,7 +324,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
               by deletion). The list contains Gengrid item pointers as
               data, naturally.
             ]]
-            return: const(list<Elm.Widget_Item *>)*; [[
+            return: const(list<Elm.Widget.Item *>)*; [[
                The list of selected items or $null, if none is
                selected at the moment (and on errors).
             ]]
@@ -337,7 +337,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
               This returns the last item in the $obj's internal list of
               items.
             ]]
-            return: Elm.Widget_Item *; [[The last item's handle or $null
+            return: Elm.Widget.Item *; [[The last item's handle or $null
                                          if there are no  items in $obj
                                          (and on errors).]]
          }
@@ -369,11 +369,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
 
            This inserts an item before another in the gengrid.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
errors.]]
          params {
             @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in relative: Elm.Widget_Item *; [[The item to place this new one 
before.]]
+            @in relative: Elm.Widget.Item *; [[The item to place this new one 
before.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called
                                                  when the item is selected.]]
             @in func_data: const(void)* @optional; [[Data to be passed to 
$func.]]
@@ -395,11 +395,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
 
            This inserts an item after another in the gengrid.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
error.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
error.]]
          params {
             @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in relative: Elm.Widget_Item *; [[The item to place this new one 
after.]]
+            @in relative: Elm.Widget.Item *; [[The item to place this new one 
after.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called
                                                  when the item is selected.]]
             @in func_data: const(void)* @optional; [[Data to be passed to 
$func.]]
@@ -430,7 +430,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
            there), then posret may indicate -1 or 1 based if the coordinate
            is above or below all items respectively in the gengrid.
          ]]
-         return: Elm.Widget_Item *; [[The item at the coordinates or $null if 
none.]]
+         return: Elm.Widget.Item *; [[The item at the coordinates or $null if 
none.]]
          params {
             @in x: Evas.Coord; [[The input x coordinate.]]
             @in y: Evas.Coord; [[The input y coordinate.]]
@@ -443,7 +443,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
 
            This adds an item to the beginning of the gengrid.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
errors.]]
          params {
             @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
@@ -457,7 +457,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
 
            This adds an item to the end of the gengrid.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
errors.]]
          params {
             @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
@@ -482,7 +482,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
            comparison function. The two arguments passed to the function
            $func are gengrid item handles to compare.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
errors.]]
          params {
             @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
@@ -506,11 +506,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
 
            @since 1.11
          ]]
-         return: Elm.Widget_Item *; [[Pointer to the gengrid item which matches
+         return: Elm.Widget.Item *; [[Pointer to the gengrid item which matches
                                       search_string in case of success,
                                       otherwise $null.]]
          params {
-            @in item_to_search_from: Elm.Widget_Item * @optional; [[
+            @in item_to_search_from: Elm.Widget.Item * @optional; [[
                Pointer to item to start search from. If $null, search will
                be started from the first item of the gengrid.
             ]]
diff --git a/src/lib/elementary/elm_gengrid_item.eo 
b/src/lib/elementary/elm_gengrid_item.eo
index 8bfc4e1..5dca399 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -23,7 +23,7 @@ enum Elm.Gengrid.Item.Field_Type
 }
 
 
-class Elm.Gengrid_Item(Elm.Widget_Item)
+class Elm.Gengrid.Item(Elm.Widget.Item)
 {
       eo_prefix: elm_obj_gengrid_item;
       data: Elm_Gen_Item;
@@ -36,7 +36,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
                        gengrid.]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item before $item, or 
$NULL if there's none (and on errors)]]
+                     item: Elm.Widget.Item *; [[The item before $item, or 
$NULL if there's none (and on errors)]]
                 }
            }
            @property next {
@@ -48,7 +48,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
                        gengrid.]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item after $item, or $NULL 
if there's none (and on errors)]]
+                     item: Elm.Widget.Item *; [[The item after $item, or $NULL 
if there's none (and on errors)]]
                 }
            }
            @property selected {
@@ -206,22 +206,22 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
       }
       implements {
            Eo.Base.constructor;
-           Elm.Widget_Item.del_pre;
-           Elm.Widget_Item.disable;
-           Elm.Widget_Item.signal_emit;
-           Elm.Widget_Item.focus.set;
-           Elm.Widget_Item.focus.get;
-           Elm.Widget_Item.part_text.get;
-           Elm.Widget_Item.part_content.get;
-           Elm.Widget_Item.tooltip_text_set;
-           Elm.Widget_Item.tooltip_style.get;
-           Elm.Widget_Item.tooltip_style.set;
-           Elm.Widget_Item.tooltip_window_mode.get;
-           Elm.Widget_Item.tooltip_window_mode.set;
-           Elm.Widget_Item.tooltip_content_cb_set;
-           Elm.Widget_Item.tooltip_unset;
-           Elm.Widget_Item.cursor.set;
-           Elm.Widget_Item.cursor_unset;
+           Elm.Widget.Item.del_pre;
+           Elm.Widget.Item.disable;
+           Elm.Widget.Item.signal_emit;
+           Elm.Widget.Item.focus.set;
+           Elm.Widget.Item.focus.get;
+           Elm.Widget.Item.part_text.get;
+           Elm.Widget.Item.part_content.get;
+           Elm.Widget.Item.tooltip_text_set;
+           Elm.Widget.Item.tooltip_style.get;
+           Elm.Widget.Item.tooltip_style.set;
+           Elm.Widget.Item.tooltip_window_mode.get;
+           Elm.Widget.Item.tooltip_window_mode.set;
+           Elm.Widget.Item.tooltip_content_cb_set;
+           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;
       }
diff --git a/src/lib/elementary/elm_genlist.eo 
b/src/lib/elementary/elm_genlist.eo
index b5c4ccb..99b195c 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -262,7 +262,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
               This function returns the item that was activated with a mode,
               by the function @.decorate_mode.set.
             ]]
-            return: Elm.Widget_Item *; [[The active item for that current mode.
+            return: Elm.Widget.Item *; [[The active item for that current mode.
                                          Or $null if no item is activated with 
any mode.]]
          }
       }
@@ -277,7 +277,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
 
               If no item is selected, $null is returned.
             ]]
-            return: Elm.Widget_Item *; [[The selected item, or $null if none 
is selected.]]
+            return: Elm.Widget.Item *; [[The selected item, or $null if none 
is selected.]]
          }
       }
       @property first_item {
@@ -289,7 +289,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
               If filter is set on genlist, it returns
               the first filtered item in the list.
             ]]
-            return: Elm.Widget_Item *; [[The first item or $null.]]
+            return: Elm.Widget.Item *; [[The first item or $null.]]
          }
       }
       @property realized_items {
@@ -320,7 +320,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
               Note: If not in multi-select mode, consider using function
               @.selected_item.get instead.
             ]]
-            return: const(list<Elm.Widget_Item *>)*;
+            return: const(list<Elm.Widget.Item *>)*;
          }
       }
       @property last_item {
@@ -332,7 +332,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
               If filter is set to genlist, it returns
               last filtered item in the list.
             ]]
-            return: Elm.Widget_Item *;
+            return: Elm.Widget.Item *;
          }
       }
       item_insert_before {
@@ -341,12 +341,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
            This inserts an item before another in the list. It will be in
            the same tree level or group as the item it is inserted before.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in parent: Elm.Widget_Item * @nullable; [[The parent item, or 
$null if none.]]
-            @in before_it: Elm.Widget_Item *; [[The item to place this new one 
before.]]
+            @in parent: Elm.Widget.Item * @nullable; [[The parent item, or 
$null if none.]]
+            @in before_it: Elm.Widget.Item *; [[The item to place this new one 
before.]]
             @in type: Elm.Genlist.Item.Type; [[Item type.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called 
when the item is selected.]]
             @in func_data: const(void)* @optional; [[Data passed to $func 
above.]]
@@ -369,12 +369,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
            This inserts an item after another in the list. It will be in the
            same tree level or group as the item it is inserted after.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in parent: Elm.Widget_Item * @nullable; [[The parent item, or 
$null if none.]]
-            @in after_it: Elm.Widget_Item *; [[The item to place this new one 
after.]]
+            @in parent: Elm.Widget.Item * @nullable; [[The parent item, or 
$null if none.]]
+            @in after_it: Elm.Widget.Item *; [[The item to place this new one 
after.]]
             @in type: Elm.Genlist.Item.Type; [[Item type.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called 
when the item is selected.]]
             @in func_data: const(void)* @optional; [[Data passed to $func 
above.]]
@@ -393,7 +393,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
            1 based if the coordinate is above or below all items
            respectively in the genlist.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in x: Evas.Coord; [[The input x coordinate.]]
             @in y: Evas.Coord; [[The input y coordinate.]]
@@ -447,11 +447,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
            This adds an item to the beginning of the list or beginning of
            the children of the parent if given.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in parent: Elm.Widget_Item * @nullable; [[The parent item, or 
$null if none.]]
+            @in parent: Elm.Widget.Item * @nullable; [[The parent item, or 
$null if none.]]
             @in type: Elm.Genlist.Item.Type; [[Item type.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called 
when the item is selected.]]
             @in func_data: const(void)* @optional; [[Data passed to $func 
above.]]
@@ -469,11 +469,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
            This adds the given item to the end of the list or the end of
            the children list if the $parent is given.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in parent: Elm.Widget_Item * @nullable; [[The parent item, or 
$null if none.]]
+            @in parent: Elm.Widget.Item * @nullable; [[The parent item, or 
$null if none.]]
             @in type: Elm.Genlist.Item.Type; [[Item type.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called 
when the item is selected.]]
             @in func_data: const(void)* @optional; [[Data passed to $func 
above.]]
@@ -486,11 +486,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
            comparison function. The two arguments passed to the function
            $func are genlist item handles to compare.
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
             @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the 
item.]]
             @in data: const(void)*; [[The item data.]]
-            @in parent: Elm.Widget_Item * @nullable; [[The parent item, or 
$null if none.]]
+            @in parent: Elm.Widget.Item * @nullable; [[The parent item, or 
$null if none.]]
             @in type: Elm.Genlist.Item.Type; [[Item type.]]
             @in comp: Eina_Compare_Cb; [[The function called for the sort.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience function called 
when the item is selected.]]
@@ -509,9 +509,9 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, 
Evas.Clickable_Interfac
 
            @since 1.11
          ]]
-         return: Elm.Widget_Item *;
+         return: Elm.Widget.Item *;
          params {
-            @in item_to_search_from: Elm.Widget_Item * @optional; [[
+            @in item_to_search_from: Elm.Widget.Item * @optional; [[
                Pointer to item to start search from. If $null, search
                will be started from the first item of the genlist.
             ]]
diff --git a/src/lib/elementary/elm_genlist_item.eo 
b/src/lib/elementary/elm_genlist_item.eo
index fd06afa..f4c49ea 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -36,7 +36,7 @@ enum Elm.Genlist.Item.Scrollto_Type
    bottom = (1 << 3)   [[To the bottom of viewport.]]
 }
 
-class Elm.Genlist_Item(Elm.Widget_Item)
+class Elm.Genlist.Item(Elm.Widget.Item)
 {
       eo_prefix: elm_obj_genlist_item;
       data: Elm_Gen_Item;
@@ -54,7 +54,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item before $item, or 
$null if there's none (and on errors).]]
+                     item: Elm.Widget.Item *; [[The item before $item, or 
$null if there's none (and on errors).]]
                 }
            }
            @property next {
@@ -70,7 +70,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item after $item, or $null 
if there's none (and on errors).]]
+                     item: Elm.Widget.Item *; [[The item after $item, or $null 
if there's none (and on errors).]]
                 }
            }
            @property parent {
@@ -83,7 +83,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The parent of the item or 
$null if it has no parent.]]
+                     item: Elm.Widget.Item *; [[The parent of the item or 
$null if it has no parent.]]
                 }
            }
            @property subitems {
@@ -97,7 +97,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     subitems: const (list<Elm.Widget_Item *>) *; [[The list 
of subitems, $null on error.]]
+                     subitems: const (list<Elm.Widget.Item *>) *; [[The list 
of subitems, $null on error.]]
                 }
            }
            @property selected {
@@ -419,24 +419,24 @@ class Elm.Genlist_Item(Elm.Widget_Item)
       }
       implements {
            Eo.Base.constructor;
-           Elm.Widget_Item.del_pre;
-           Elm.Widget_Item.disable;
-           Elm.Widget_Item.signal_emit;
-           Elm.Widget_Item.style.get;
-           Elm.Widget_Item.style.set;
-           Elm.Widget_Item.focus.set;
-           Elm.Widget_Item.focus.get;
-           Elm.Widget_Item.part_text.get;
-           Elm.Widget_Item.part_content.get;
-           Elm.Widget_Item.tooltip_text_set;
-           Elm.Widget_Item.tooltip_style.set;
-           Elm.Widget_Item.tooltip_style.get;
-           Elm.Widget_Item.tooltip_window_mode.set;
-           Elm.Widget_Item.tooltip_window_mode.get;
-           Elm.Widget_Item.tooltip_content_cb_set;
-           Elm.Widget_Item.tooltip_unset;
-           Elm.Widget_Item.cursor.set;
-           Elm.Widget_Item.cursor_unset;
+           Elm.Widget.Item.del_pre;
+           Elm.Widget.Item.disable;
+           Elm.Widget.Item.signal_emit;
+           Elm.Widget.Item.style.get;
+           Elm.Widget.Item.style.set;
+           Elm.Widget.Item.focus.set;
+           Elm.Widget.Item.focus.get;
+           Elm.Widget.Item.part_text.get;
+           Elm.Widget.Item.part_content.get;
+           Elm.Widget.Item.tooltip_text_set;
+           Elm.Widget.Item.tooltip_style.set;
+           Elm.Widget.Item.tooltip_style.get;
+           Elm.Widget.Item.tooltip_window_mode.set;
+           Elm.Widget.Item.tooltip_window_mode.get;
+           Elm.Widget.Item.tooltip_content_cb_set;
+           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;
       }
diff --git a/src/lib/elementary/elm_hoversel.eo 
b/src/lib/elementary/elm_hoversel.eo
index 2e96a87..78c6db0 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -40,7 +40,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
       @property items {
          get {
             [[Get the list of items within the given hoversel.]]
-            return: const(list<Elm.Widget_Item *>)*;
+            return: const(list<Elm.Widget.Item *>)*;
          }
       }
       @property auto_update {
@@ -69,14 +69,14 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
          [[Add an item to the hoversel button
 
            This adds an item to the hoversel to show when it is clicked. Note: 
if you
-           need to use an icon from an edje file then use 
Elm.Hoversel_Item.icon.set
+           need to use an icon from an edje file then use 
Elm.Hoversel.Item.icon.set
            right after this function, and set icon_file to $null here.]]
 
            /* FIXME: Make the hoversel_item reference in the doc a real ref. */
            /* FIXME-doc
            For more information on what $icon_file and $icon_type are, see the
            @ref Icon "icon documentation". */
-         return: Elm.Widget_Item *; [[A handle to the added item.]]
+         return: Elm.Widget.Item *; [[A handle to the added item.]]
          params {
             @in label: const(char)* @optional; [[The text label to use for the 
item (NULL if not desired)]]
             @in icon_file: const(char)* @optional; [[An image file path on 
disk to use for the icon or standard icon name (NULL if not desired)]]
diff --git a/src/lib/elementary/elm_hoversel_item.eo 
b/src/lib/elementary/elm_hoversel_item.eo
index 4d9c4fa..68a72d3 100644
--- a/src/lib/elementary/elm_hoversel_item.eo
+++ b/src/lib/elementary/elm_hoversel_item.eo
@@ -1,6 +1,6 @@
 import elm_icon;
 
-class Elm.Hoversel_Item(Elm.Widget_Item)
+class Elm.Hoversel.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_hoversel_item;
    methods {
@@ -22,13 +22,13 @@ class Elm.Hoversel_Item(Elm.Widget_Item)
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.disable;
-        Elm.Widget_Item.signal_emit;
-        Elm.Widget_Item.part_text.set;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.style.get;
-        Elm.Widget_Item.style.set;
-        Elm.Widget_Item.focus.set;
-        Elm.Widget_Item.focus.get;
+        Elm.Widget.Item.disable;
+        Elm.Widget.Item.signal_emit;
+        Elm.Widget.Item.part_text.set;
+        Elm.Widget.Item.part_text.get;
+        Elm.Widget.Item.style.get;
+        Elm.Widget.Item.style.set;
+        Elm.Widget.Item.focus.set;
+        Elm.Widget.Item.focus.get;
    }
 }
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 8cac9e0..2b4771c 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -113,7 +113,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
            $item will be the pointer returned back on $"changed",
            "delay,changed" and $"selected" smart events.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or $NULL, on 
errors]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $NULL, on 
errors]]
          params {
             @in letter: const(char)*; [[Letter under which the item should be 
indexed]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is selected.]]
@@ -139,9 +139,9 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
            Note: If $relative is $NULL this function will behave as
            elm_index_item_append().]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or $NULL, on 
errors]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $NULL, on 
errors]]
          params {
-            @in after: Elm.Widget_Item *; [[The index item to insert after.]]
+            @in after: Elm.Widget.Item *; [[The index item to insert after.]]
             @in letter: const(char)*; [[Letter under which the item should be 
indexed]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is clicked.]]
             @in data: const(void)* @optional; [[The item data to set for the 
index's item]]
@@ -150,7 +150,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
       item_find {
          [[Find a given index widget's item, using item data.]]
 
-         return: Elm.Widget_Item *; [[The index item handle, if found, or 
$NULL otherwise]]
+         return: Elm.Widget.Item *; [[The index item handle, if found, or 
$NULL otherwise]]
          params {
             @in data: const(void)*; [[The item data pointed to by the desired 
index item]]
          }
@@ -168,9 +168,9 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
            Note: If $relative is $NULL this function will behave as
            elm_index_item_prepend().]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or $NULL, on 
errors]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $NULL, on 
errors]]
          params {
-            @in before: Elm.Widget_Item *; [[The index item to insert after.]]
+            @in before: Elm.Widget.Item *; [[The index item to insert after.]]
             @in letter: const(char)*; [[Letter under which the item should be 
indexed]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is clicked.]]
             @in data: const(void)* @optional; [[The item data to set for the 
index's item]]
@@ -186,7 +186,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
            $item will be the pointer returned back on $"changed",
            "delay,changed" and $"selected" smart events.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or $NULL, on 
errors]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $NULL, on 
errors]]
          params {
             @in letter: const(char)*; [[Letter under which the item should be 
indexed]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is selected.]]
@@ -196,7 +196,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
       selected_item_get @const {
          [[Returns the last selected item, for a given index widget.]]
 
-         return: Elm.Widget_Item *; [[The last item selected on $obj (or 
$NULL, on errors).]]
+         return: Elm.Widget.Item *; [[The last item selected on $obj (or 
$NULL, on errors).]]
          params {
             @in level: int; [[$0 or $1, the currently implemented levels.]]
          }
@@ -211,7 +211,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
            $item will be the pointer returned back on $"changed",
            "delay,changed" and $"selected" smart events.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or $NULL, on 
errors]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $NULL, on 
errors]]
          params {
             @in letter: const(char)*; [[Letter under which the item should be 
indexed]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is clicked.]]
diff --git a/src/lib/elementary/elm_index_item.eo 
b/src/lib/elementary/elm_index_item.eo
index 6b888f2..8243f12 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 {
@@ -41,7 +41,7 @@ class Elm.Index_Item(Elm.Widget_Item, 
Elm.Interface_Atspi_Widget_Action)
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.access_register;
+        Elm.Widget.Item.access_register;
         Elm.Interface_Atspi_Accessible.name.get;
         Elm.Interface_Atspi_Widget_Action.elm_actions.get;
    }
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index d6a1d7b..4ece744 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -162,14 +162,14 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
 
              The selected item always will be highlighted on list.]]
 
-            return: Elm.Widget_Item *; [[The selected list item.]]
+            return: Elm.Widget.Item *; [[The selected list item.]]
          }
       }
       @property items {
          get {
             [[Get a list of all the list items.]]
 
-            return: const(list<Elm.Widget_Item *>)*; [[A $list of list items, 
#Elm.Widget_Item, or $NULL on failure.]]
+            return: const(list<Elm.Widget.Item *>)*; [[A $list of list items, 
#Elm.Widget.Item, or $NULL on failure.]]
          }
       }
       @property first_item {
@@ -178,7 +178,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
 
               This returns the first item in the list.]]
 
-            return: Elm.Widget_Item *; [[The first item, or NULL if none]]
+            return: Elm.Widget.Item *; [[The first item, or NULL if none]]
          }
       }
       @property selected_items {
@@ -188,7 +188,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
               Multiple items can be selected if multi select is enabled. It 
can be
               done with elm_list_multi_select_set().]]
 
-            return: const(list<Elm.Widget_Item *>)*; [[An $list of list items, 
#Elm.Widget_Item, or $NULL on failure.]]
+            return: const(list<Elm.Widget.Item *>)*; [[An $list of list items, 
#Elm.Widget.Item, or $NULL on failure.]]
          }
       }
       @property last_item {
@@ -197,7 +197,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
 
               This returns the last item in the list.]]
 
-            return: Elm.Widget_Item *; [[The last item, or NULL if none]]
+            return: Elm.Widget.Item *; [[The last item, or NULL if none]]
          }
       }
       item_insert_before {
@@ -222,9 +222,9 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            application dynamically allocated the label, the application should 
free the
            label after this call.]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
-            @in before: Elm.Widget_Item *; [[The list item to insert before.]]
+            @in before: Elm.Widget.Item *; [[The list item to insert before.]]
             @in label: const(char)*; [[The label of the list item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
             @in end: Evas.Object * @optional; [[The icon object to use for the 
right side of the item. An icon can be any Evas object.]]
@@ -269,9 +269,9 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            application dynamically allocated the label, the application should 
free the
            label after this call.]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
-            @in after: Elm.Widget_Item *; [[The list item to insert after.]]
+            @in after: Elm.Widget.Item *; [[The list item to insert after.]]
             @in label: const(char)*; [[The label of the list item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
             @in end: Evas.Object * @optional; [[The icon object to use for the 
right side of the item. An icon can be any Evas object.]]
@@ -292,7 +292,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            based if the coordinate is above or below all items respectively in
            the list.]]
 
-         return: Elm.Widget_Item *; [[The item at the coordinates or NULL if 
none]]
+         return: Elm.Widget.Item *; [[The item at the coordinates or NULL if 
none]]
          params {
             @in x: Evas.Coord; [[The input x coordinate]]
             @in y: Evas.Coord; [[The input y coordinate]]
@@ -340,7 +340,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
          @see elm_icon_add()
          */
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in label: const(char)*; [[The label of the list item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
@@ -371,7 +371,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            application dynamically allocated the label, the application should 
free the
            label after this call.]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in label: const(char)*; [[The label of the list item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
@@ -409,7 +409,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            application dynamically allocated the label, the application should 
free the
            label after this call.]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in label: const(char)*; [[The label of the list item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
@@ -417,7 +417,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is clicked.]]
             @in data: const(void)* @optional; [[The data to associate with the 
item for related callbacks.]]
             @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used 
to sort list
-                                             items by #Elm.Widget_Item item 
handles. This function will
+                                             items by #Elm.Widget.Item item 
handles. This function will
                                              receive two items and compare 
them, returning a non-negative integer
                                              if the second item should be 
place after the first, or negative value
                                              if should be placed before.]]
diff --git a/src/lib/elementary/elm_list_item.eo 
b/src/lib/elementary/elm_list_item.eo
index cf59a27..81c217d 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/elm_list_item.eo
@@ -1,4 +1,4 @@
-class Elm.List_Item(Elm.Widget_Item)
+class Elm.List.Item(Elm.Widget.Item)
 {
       eo_prefix: elm_obj_list_item;
       methods {
@@ -64,7 +64,7 @@ class Elm.List_Item(Elm.Widget_Item)
                      legacy: elm_list_item_prev;
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item before or $null.]]
+                     item: Elm.Widget.Item *; [[The item before or $null.]]
                 }
            }
            @property next {
@@ -76,7 +76,7 @@ class Elm.List_Item(Elm.Widget_Item)
                      legacy: elm_list_item_next;
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item after or $null.]]
+                     item: Elm.Widget.Item *; [[The item after or $null.]]
                 }
            }
            /*      init { FIXME
@@ -106,16 +106,16 @@ class Elm.List_Item(Elm.Widget_Item)
       }
       implements {
            Eo.Base.constructor;
-           Elm.Widget_Item.disable;
-           Elm.Widget_Item.del_pre;
-           Elm.Widget_Item.signal_emit;
-           Elm.Widget_Item.focus.set;
-           Elm.Widget_Item.focus.get;
-           Elm.Widget_Item.part_text.get;
-           Elm.Widget_Item.part_text.set;
-           Elm.Widget_Item.part_content.get;
-           Elm.Widget_Item.part_content.set;
-           Elm.Widget_Item.part_content_unset;
+           Elm.Widget.Item.disable;
+           Elm.Widget.Item.del_pre;
+           Elm.Widget.Item.signal_emit;
+           Elm.Widget.Item.focus.set;
+           Elm.Widget.Item.focus.get;
+           Elm.Widget.Item.part_text.get;
+           Elm.Widget.Item.part_text.set;
+           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;
       }
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 6c8ea47..7507860 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -5,25 +5,25 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, 
Elm.Interface_Atspi_Select
       @property selected_item {
          get {
             [[Get the selected item in the menu.]]
-            return: Elm.Widget_Item *; [[The selected item or $null.]]
+            return: Elm.Widget.Item *; [[The selected item or $null.]]
          }
       }
       @property items {
          get {
             [[Returns a list of the item's items.]]
-            return: const(list<Elm.Widget_Item *>)*;
+            return: const(list<Elm.Widget.Item *>)*;
          }
       }
       @property first_item {
          get {
             [[Get the first item in the menu.]]
-            return: Elm.Widget_Item *;
+            return: Elm.Widget.Item *;
          }
       }
       @property last_item {
          get {
             [[Get the last item in the menu.]]
-            return: Elm.Widget_Item *;
+            return: Elm.Widget.Item *;
          }
       }
       move {
@@ -43,9 +43,9 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, 
Elm.Interface_Atspi_Select
 
            Note: This function does not accept relative icon path.
          ]]
-         return: Elm.Widget_Item *; [[The new menu item.]]
+         return: Elm.Widget.Item *; [[The new menu item.]]
          params {
-            @in parent: Elm.Widget_Item * @optional; [[The parent menu item 
(optional).]]
+            @in parent: Elm.Widget.Item * @optional; [[The parent menu item 
(optional).]]
             @in icon: const(char)* @optional; [[An icon display on the item. 
The icon will be destroyed by the menu.]]
             @in label: const(char)*; [[The label of the item.]]
             @in func: Evas_Smart_Cb @optional; [[Function called when the user 
select the item.]]
@@ -60,9 +60,9 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, 
Elm.Interface_Atspi_Select
       }
       item_separator_add {
          [[Add a separator item to menu $obj under $parent.]]
-         return: Elm.Widget_Item *; [[The created item or $null.]]
+         return: Elm.Widget.Item *; [[The created item or $null.]]
          params {
-            @in parent: Elm.Widget_Item *; [[The item to add the separator 
under.]]
+            @in parent: Elm.Widget.Item *; [[The item to add the separator 
under.]]
          }
       }
    }
diff --git a/src/lib/elementary/elm_menu_item.eo 
b/src/lib/elementary/elm_menu_item.eo
index 59f3831..9a71517 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 {
@@ -35,11 +35,11 @@ class Elm.Menu_Item(Elm.Widget_Item, 
Elm.Interface_Atspi_Selection)
         }
       prev_get @const {
             [[Get the previous item in the menu.]]
-            return: Elm.Widget_Item*;
+            return: Elm.Widget.Item*;
         }
       next_get @const {
              [[Get the next item in the menu.]]
-             return: Elm.Widget_Item*;
+             return: Elm.Widget.Item*;
         }
       index_get @const {
              [[Get the next item in the menu.]]
@@ -56,7 +56,7 @@ class Elm.Menu_Item(Elm.Widget_Item, 
Elm.Interface_Atspi_Selection)
         }
      subitems_get @const {
              [[Returns a list of $item's subitems.]]
-             return: const (list<Elm.Widget_Item *>) *; [[a list of $item's 
subitems]]
+             return: const (list<Elm.Widget.Item *>) *; [[a list of $item's 
subitems]]
         }
      is_separator @const {
              [[Returns whether $item is a separator.]]
@@ -75,12 +75,12 @@ class Elm.Menu_Item(Elm.Widget_Item, 
Elm.Interface_Atspi_Selection)
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.disable;
-        Elm.Widget_Item.signal_emit;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.part_text.set;
-        Elm.Widget_Item.part_content.get;
-        Elm.Widget_Item.part_content.set;
+        Elm.Widget.Item.disable;
+        Elm.Widget.Item.signal_emit;
+        Elm.Widget.Item.part_text.get;
+        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;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo 
b/src/lib/elementary/elm_multibuttonentry.eo
index 73e61cd..307eae5 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -48,21 +48,21 @@ class Elm.Multibuttonentry (Elm.Layout)
          get {
             [[Get a list of items in the multibuttonentry]]
 
-            return: const(list<Elm.Widget_Item *>)*; [[The list of items, or 
NULL if none]]
+            return: const(list<Elm.Widget.Item *>)*; [[The list of items, or 
NULL if none]]
          }
       }
       @property first_item {
          get {
             [[Get the first item in the multibuttonentry]]
 
-            return: Elm.Widget_Item *; [[The first item, or NULL if none]]
+            return: Elm.Widget.Item *; [[The first item, or NULL if none]]
          }
       }
       @property last_item {
          get {
             [[Get the last item in the multibuttonentry]]
 
-            return: Elm.Widget_Item *; [[The last item, or NULL if none]]
+            return: Elm.Widget.Item *; [[The last item, or NULL if none]]
          }
       }
       @property entry {
@@ -76,15 +76,15 @@ class Elm.Multibuttonentry (Elm.Layout)
          get {
             [[Get the selected item in the multibuttonentry]]
 
-            return: Elm.Widget_Item *; [[The selected item, or NULL if none]]
+            return: Elm.Widget.Item *; [[The selected item, or NULL if none]]
          }
       }
       item_prepend {
          [[Prepend a new item to the multibuttonentry
 
-           See @Elm.Widget_Item.del to delete the item.]]
+           See @Elm.Widget.Item.del to delete the item.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or NULL if 
not possible]]
+         return: Elm.Widget.Item *; [[A handle to the item added or NULL if 
not possible]]
          params {
             @in label: const(char)*; [[The label of new item]]
             @in func: Evas_Smart_Cb @optional; [[The callback function to be 
invoked when this item is pressed.]]
@@ -109,11 +109,11 @@ class Elm.Multibuttonentry (Elm.Layout)
       item_insert_before {
          [[Add a new item to the multibuttonentry before the indicated object 
reference.
 
-           See @Elm.Widget_Item.del to delete the item.]]
+           See @Elm.Widget.Item.del to delete the item.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or NULL if 
not possible]]
+         return: Elm.Widget.Item *; [[A handle to the item added or NULL if 
not possible]]
          params {
-            @in before: Elm.Widget_Item *; [[The item before which to add it]]
+            @in before: Elm.Widget.Item *; [[The item before which to add it]]
             @in label: const(char)*; [[The label of new item]]
             @in func: Evas_Smart_Cb @optional; [[The callback function to be 
invoked when this item is pressed.]]
             @in data: void * @optional; [[The pointer to the data to be 
attached]]
@@ -122,9 +122,9 @@ class Elm.Multibuttonentry (Elm.Layout)
       item_append {
          [[Append a new item to the multibuttonentry
 
-           See @Elm.Widget_Item.del to delete the item.]]
+           See @Elm.Widget.Item.del to delete the item.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or NULL if 
not possible]]
+         return: Elm.Widget.Item *; [[A handle to the item added or NULL if 
not possible]]
          params {
             @in label: const(char)*; [[The label of new item]]
             @in func: Evas_Smart_Cb @optional; [[The callback function to be 
invoked when this item is pressed.]]
@@ -160,11 +160,11 @@ class Elm.Multibuttonentry (Elm.Layout)
       item_insert_after {
          [[Add a new item to the multibuttonentry after the indicated object
 
-           See @Elm.Widget_Item.del to delete the item.]]
+           See @Elm.Widget.Item.del to delete the item.]]
 
-         return: Elm.Widget_Item *; [[A handle to the item added or NULL if 
not possible]]
+         return: Elm.Widget.Item *; [[A handle to the item added or NULL if 
not possible]]
          params {
-            @in after: Elm.Widget_Item *; [[The item after which to add it]]
+            @in after: Elm.Widget.Item *; [[The item after which to add it]]
             @in label: const(char)*; [[The label of new item]]
             @in func: Evas_Smart_Cb @optional; [[The callback function to be 
invoked when this item is pressed.]]
             @in data: void * @optional; [[The pointer to the data to be 
attached]]
diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo 
b/src/lib/elementary/elm_multibuttonentry_item.eo
index 5a49ee6..55cbf76 100644
--- a/src/lib/elementary/elm_multibuttonentry_item.eo
+++ b/src/lib/elementary/elm_multibuttonentry_item.eo
@@ -1,4 +1,4 @@
-class Elm.Multibuttonentry_Item(Elm.Widget_Item,
+class Elm.Multibuttonentry.Item(Elm.Widget.Item,
                                 Elm.Interface_Atspi_Widget_Action)
 {
    eo_prefix: elm_obj_multibuttonentry_item;
@@ -15,20 +15,20 @@ class Elm.Multibuttonentry_Item(Elm.Widget_Item,
         }
         prev_get @const {
              [[Get the previous item in the multibuttonentry]]
-             return: Elm.Widget_Item *; [[The item before the item]]
+             return: Elm.Widget.Item *; [[The item before the item]]
         }
         next_get @const {
              [[Get the next item in the multibuttonentry]]
-             return: Elm.Widget_Item *; [[The item after the item]]
+             return: Elm.Widget.Item *; [[The item after the item]]
         }
    }
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.signal_emit;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.part_text.set;
-        Elm.Widget_Item.disable;
+        Elm.Widget.Item.signal_emit;
+        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;
    }
diff --git a/src/lib/elementary/elm_naviframe.eo 
b/src/lib/elementary/elm_naviframe.eo
index d666d6e..8768bb5 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -43,21 +43,21 @@ class Elm.Naviframe (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
          get {
             [[Get a list of all the naviframe items.]]
 
-            return: free(own(list<Elm.Widget_Item *> *), eina_list_free) 
@warn_unused; [[A list of naviframe items, @Elm.Widget_Item, or $NULL on 
failure. Note: The returned list MUST be freed.]]
+            return: free(own(list<Elm.Widget.Item *> *), eina_list_free) 
@warn_unused; [[A list of naviframe items, @Elm.Widget.Item, or $NULL on 
failure. Note: The returned list MUST be freed.]]
          }
       }
       @property top_item {
          get {
             [[Get a top item on the naviframe stack]]
 
-            return: Elm.Widget_Item *; [[The top item on the naviframe stack 
or $NULL, if the stack is empty]]
+            return: Elm.Widget.Item *; [[The top item on the naviframe stack 
or $NULL, if the stack is empty]]
          }
       }
       @property bottom_item {
          get {
             [[Get a bottom item on the naviframe stack]]
 
-            return: Elm.Widget_Item *; [[The bottom item on the naviframe 
stack or $NULL, if the stack is empty]]
+            return: Elm.Widget.Item *; [[The bottom item on the naviframe 
stack or $NULL, if the stack is empty]]
          }
       }
       item_pop {
@@ -79,9 +79,9 @@ class Elm.Naviframe (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
            The item is inserted into the naviframe straight away without any
            transition operations. This item will be deleted when it is 
popped.]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
-            @in before: Elm.Widget_Item *; [[The naviframe item to insert 
before.]]
+            @in before: Elm.Widget.Item *; [[The naviframe item to insert 
before.]]
             @in title_label: const(char)* @optional; [[The label in the title 
area. The name of the title label part is "elm.text.title"]]
             @in prev_btn: Evas.Object * @nullable; [[The button to go to the 
previous item. If it is NULL, then naviframe will create a back button 
automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
             @in next_btn: Evas.Object * @nullable; [[The button to go to the 
next item. Or It could be just an extra function button. The name of the 
next_btn part is "elm.swallow.next_btn"]]
@@ -101,7 +101,7 @@ class Elm.Naviframe (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
            The following styles are available for this item:
            "default"]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in title_label: const(char)* @optional; [[The label in the title 
area. The name of the title label part is "elm.text.title"]]
             @in prev_btn: Evas.Object * @nullable; [[The button to go to the 
previous item. If it is NULL, then naviframe will create a back button 
automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
@@ -126,9 +126,9 @@ class Elm.Naviframe (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
            The following styles are available for this item:
            "default"]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
-            @in after: Elm.Widget_Item *; [[The naviframe item to insert 
after.]]
+            @in after: Elm.Widget.Item *; [[The naviframe item to insert 
after.]]
             @in title_label: const(char)* @optional; [[The label in the title 
area. The name of the title label part is "elm.text.title"]]
             @in prev_btn: Evas.Object * @nullable; [[The button to go to the 
previous item. If it is NULL, then naviframe will create a back button 
automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
             @in next_btn: Evas.Object * @nullable; [[The button to go to the 
next item. Or It could be just an extra function button. The name of the 
next_btn part is "elm.swallow.next_btn"]]
diff --git a/src/lib/elementary/elm_naviframe_item.eo 
b/src/lib/elementary/elm_naviframe_item.eo
index 003f695..c38d952 100644
--- a/src/lib/elementary/elm_naviframe_item.eo
+++ b/src/lib/elementary/elm_naviframe_item.eo
@@ -1,6 +1,6 @@
 type Elm_Naviframe_Item_Pop_Cb: __undefined_type;
 
-class Elm.Naviframe_Item(Elm.Widget_Item)
+class Elm.Naviframe.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_naviframe_item;
    methods {
@@ -76,11 +76,11 @@ class Elm.Naviframe_Item(Elm.Widget_Item)
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.signal_emit;
-        Elm.Widget_Item.part_text.set;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.part_content.get;
-        Elm.Widget_Item.part_content.set;
-        Elm.Widget_Item.part_content_unset;
+        Elm.Widget.Item.signal_emit;
+        Elm.Widget.Item.part_text.set;
+        Elm.Widget.Item.part_text.get;
+        Elm.Widget.Item.part_content.get;
+        Elm.Widget.Item.part_content.set;
+        Elm.Widget.Item.part_content_unset;
    }
 }
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index f8bbbcc..fa34273 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -148,7 +148,7 @@ class Elm.Popup (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
            only one of content, content-text and item(s) can be there
            in a popup content area.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
errors.]]
          params {
             @in label: const(char)*; [[The Label of the new item.]]
             @in icon: Evas.Object * @optional; [[Icon to be set on new item.]]
diff --git a/src/lib/elementary/elm_popup_item.eo 
b/src/lib/elementary/elm_popup_item.eo
index b9b608a..7db8e19 100644
--- a/src/lib/elementary/elm_popup_item.eo
+++ b/src/lib/elementary/elm_popup_item.eo
@@ -1,15 +1,15 @@
-class Elm.Popup_Item(Elm.Widget_Item)
+class Elm.Popup.Item(Elm.Widget.Item)
 {
       eo_prefix: elm_obj_popup_item;
       implements {
            Eo.Base.constructor;
            Eo.Base.destructor;
-           Elm.Widget_Item.disable;
-           Elm.Widget_Item.signal_emit;
-           Elm.Widget_Item.part_text.get;
-           Elm.Widget_Item.part_text.set;
-           Elm.Widget_Item.part_content.get;
-           Elm.Widget_Item.part_content.set;
-           Elm.Widget_Item.part_content_unset;
+           Elm.Widget.Item.disable;
+           Elm.Widget.Item.signal_emit;
+           Elm.Widget.Item.part_text.get;
+           Elm.Widget.Item.part_text.set;
+           Elm.Widget.Item.part_content.get;
+           Elm.Widget.Item.part_content.set;
+           Elm.Widget.Item.part_content_unset;
       }
 }
diff --git a/src/lib/elementary/elm_segment_control.eo 
b/src/lib/elementary/elm_segment_control.eo
index 53f40c7..c32a808 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -19,7 +19,7 @@ class Elm.Segment_Control (Elm.Layout)
 
               The selected item always will be highlighted on segment 
control.]]
 
-            return: Elm.Widget_Item *; [[The selected item or $NULL if none of 
segment items is selected.]]
+            return: Elm.Widget.Item *; [[The selected item or $NULL if none of 
segment items is selected.]]
 
          }
       }
@@ -53,7 +53,7 @@ class Elm.Segment_Control (Elm.Layout)
            icon and label, even that an empty string, icon will be smaller and
            positioned at left.]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
             @in label: const(char)* @optional; [[The label of the item.]]
@@ -68,7 +68,7 @@ class Elm.Segment_Control (Elm.Layout)
            Count is the number of items, that can be get with
            elm_segment_control_item_count_get().]]
 
-         return: Elm.Widget_Item *; [[The segment control item or $NULL on 
failure.]]
+         return: Elm.Widget.Item *; [[The segment control item or $NULL on 
failure.]]
          params {
             @in idx: int; [[The index of the segment item.]]
          }
@@ -111,7 +111,7 @@ class Elm.Segment_Control (Elm.Layout)
          evas_object_show(sc);
          @endcode */
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in icon: Evas.Object * @optional; [[The icon object to use for 
the left side of the item. An icon can be any Evas object, but usually it is an 
icon created with elm_icon_add().]]
             @in label: const(char)* @optional; [[The label of the item.  Note 
that, NULL is different from empty string "".]]
diff --git a/src/lib/elementary/elm_segment_control_item.eo 
b/src/lib/elementary/elm_segment_control_item.eo
index 16c5ac6..760807e 100644
--- a/src/lib/elementary/elm_segment_control_item.eo
+++ b/src/lib/elementary/elm_segment_control_item.eo
@@ -1,4 +1,4 @@
-class Elm.Segment_Control_Item(Elm.Widget_Item)
+class Elm.Segment_Control_Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_segment_control_item;
    methods {
@@ -36,10 +36,10 @@ class Elm.Segment_Control_Item(Elm.Widget_Item)
    implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
-        Elm.Widget_Item.access_register;
-        Elm.Widget_Item.part_text.get;
-        Elm.Widget_Item.part_text.set;
-        Elm.Widget_Item.part_content.get;
-        Elm.Widget_Item.part_content.set;
+        Elm.Widget.Item.access_register;
+        Elm.Widget.Item.part_text.get;
+        Elm.Widget.Item.part_text.set;
+        Elm.Widget.Item.part_content.get;
+        Elm.Widget.Item.part_content.set;
    }
 }
diff --git a/src/lib/elementary/elm_slideshow.eo 
b/src/lib/elementary/elm_slideshow.eo
index b6abc09..076c7cf 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -135,8 +135,8 @@ class Elm.Slideshow (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
               items list is changed. It should be fetched again with another
               call to this function when changes happen.
             ]]
-            return: const(list<Elm.Widget_Item *>)*; [[
-               The list of items (#Elm.Widget_Item as data) or $null on
+            return: const(list<Elm.Widget.Item *>)*; [[
+               The list of items (#Elm.Widget.Item as data) or $null on
                errors.
             ]]
          }
@@ -187,7 +187,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
       @property item_current {
          get {
             [[Returns the currently displayed item, in a given slideshow 
widget.]]
-            return: Elm.Widget_Item *; [[A handle to the item being displayed
+            return: Elm.Widget.Item *; [[A handle to the item being displayed
                                          in $obj or $null, if none is (and
                                          on errors)]]
          }
@@ -238,7 +238,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
          [[Get the the item, in a given slideshow widget, placed at
            position $nth, in its internal items list.
          ]]
-         return: Elm.Widget_Item *; [[The item stored in $obj at position
+         return: Elm.Widget.Item *; [[The item stored in $obj at position
                                       $nth or $null if there's no item with
                                       that index (and on errors).]]
          params {
@@ -272,7 +272,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
            parameter is going to be passed to both class functions of the
            item.
          ]]
-         return: Elm.Widget_Item *; [[A handle to the item added or $null on 
errors.]]
+         return: Elm.Widget.Item *; [[A handle to the item added or $null on 
errors.]]
          params {
             @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for 
the item.]]
             @in data: const(void)*; [[The item's data.]]
@@ -289,7 +289,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm.Interface_Atspi_Widget_Action)
            Elementary photo, for example. The $data parameter is going to
            be passed to both class functions of the item.
          ]]
-         return: Elm.Widget_Item *; [[Returns The slideshow item handle,
+         return: Elm.Widget.Item *; [[Returns The slideshow item handle,
                                       on success, or $null on errors.]]
          params {
             @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for 
the item.]]
diff --git a/src/lib/elementary/elm_slideshow_item.eo 
b/src/lib/elementary/elm_slideshow_item.eo
index b065fc1..ed4f264 100644
--- a/src/lib/elementary/elm_slideshow_item.eo
+++ b/src/lib/elementary/elm_slideshow_item.eo
@@ -1,4 +1,4 @@
-class Elm.Slideshow_Item(Elm.Widget_Item)
+class Elm.Slideshow.Item(Elm.Widget.Item)
 {
    eo_prefix: elm_obj_slideshow_item;
    methods {
diff --git a/src/lib/elementary/elm_toolbar.eo 
b/src/lib/elementary/elm_toolbar.eo
index 2f8ebeb..2038890 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -161,7 +161,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
 
               The selected item always will be highlighted on toolbar.]]
 
-            return: Elm.Widget_Item *; [[The selected toolbar item.]]
+            return: Elm.Widget.Item *; [[The selected toolbar item.]]
          }
       }
       @property first_item {
@@ -170,7 +170,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
 
               See: @.item_append and @.last_item]]
 
-            return: Elm.Widget_Item *; [[The first item or $NULL, if it has no 
items (and on errors)]]
+            return: Elm.Widget.Item *; [[The first item or $NULL, if it has no 
items (and on errors)]]
          }
       }
       @property more_item {
@@ -182,7 +182,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
               The more item can be manipulated by elm_object_item_text_set() 
and
               elm_object_item_content_set.]]
 
-            return: Elm.Widget_Item *; [[The toolbar more item.]]
+            return: Elm.Widget.Item *; [[The toolbar more item.]]
          }
       }
       @property last_item {
@@ -190,7 +190,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
             [[Get the last item in the given toolbar widget's list of items.
 
               See: @.item_prepend and @.first_item]]
-            return: Elm.Widget_Item *; [[The last item or $NULL, if it has no 
items (and on errors)]]
+            return: Elm.Widget.Item *; [[The last item or $NULL, if it has no 
items (and on errors)]]
          }
       }
       item_insert_before {
@@ -218,9 +218,9 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
 
            See: elm_toolbar_item_icon_set()]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
-            @in before: Elm.Widget_Item *; [[The toolbar item to insert 
before.]]
+            @in before: Elm.Widget.Item *; [[The toolbar item to insert 
before.]]
             @in icon: const(char)* @optional; [[A string with icon name or the 
absolute path of an image file.]]
             @in label: const(char)*; [[The label of the item.]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is clicked.]]
@@ -252,9 +252,9 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
 
            See: elm_toolbar_item_icon_set()]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
-            @in after: Elm.Widget_Item *; [[The toolbar item to insert after.]]
+            @in after: Elm.Widget.Item *; [[The toolbar item to insert after.]]
             @in icon: const(char)* @optional; [[A string with icon name or the 
absolute path of an image file.]]
             @in label: const(char)*; [[The label of the item.]]
             @in func: Evas_Smart_Cb @optional; [[The function to call when the 
item is clicked.]]
@@ -286,7 +286,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
 
            See: elm_toolbar_item_icon_set()]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in icon: const(char)* @optional; [[A string with icon name or the 
absolute path of an image file.]]
             @in label: const(char)*; [[The label of the item.]]
@@ -323,7 +323,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
 
            See: elm_toolbar_item_icon_set()]]
 
-         return: Elm.Widget_Item *; [[The created item or $NULL upon failure.]]
+         return: Elm.Widget.Item *; [[The created item or $NULL upon failure.]]
          params {
             @in icon: const(char)* @optional; [[A string with icon name or the 
absolute path of an image file.]]
             @in label: const(char)*; [[The label of the item.]]
@@ -334,7 +334,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, 
Efl.Orientation,
       item_find_by_label @const {
          [[Returns a pointer to a toolbar item by its label.]]
 
-         return: Elm.Widget_Item *; [[The pointer to the toolbar item matching 
$label or $NULL on failure.]]
+         return: Elm.Widget.Item *; [[The pointer to the toolbar item matching 
$label or $NULL on failure.]]
          params {
             @in label: const(char)*; [[The label of the item to find.]]
          }
diff --git a/src/lib/elementary/elm_toolbar_item.eo 
b/src/lib/elementary/elm_toolbar_item.eo
index bfb290b..98db0b6 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -1,4 +1,4 @@
-enum Elm.Toolbar_Item.Scrollto_Type
+enum Elm.Toolbar.Item.Scrollto_Type
 {
    [[Defines where to position the item in the toolbar.]]
    legacy: elm_toolbar_item_scrollto;
@@ -10,7 +10,7 @@ enum Elm.Toolbar_Item.Scrollto_Type
    last = (1 << 3) [[to the last of viewport]]
 }
 
-struct Elm.Toolbar_Item.State
+struct Elm.Toolbar.Item.State
 {
    [[
      State of a Elm_Toolbar_Item.
@@ -23,7 +23,7 @@ struct Elm.Toolbar_Item.State
    data: const(void)*;
 }
 
-class Elm.Toolbar_Item(Elm.Widget_Item)
+class Elm.Toolbar.Item(Elm.Widget.Item)
 {
       eo_prefix: elm_obj_toolbar_item;
       methods {
@@ -35,7 +35,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item before $item, or $null
+                     item: Elm.Widget.Item *; [[The item before $item, or $null
                                                 if none or on failure.]]
                 }
            }
@@ -47,7 +47,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm.Widget_Item *; [[The item after $item, or $null
+                     item: Elm.Widget.Item *; [[The item after $item, or $null
                                                 if none or on failure.]]
                 }
            }
@@ -178,7 +178,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                      return: bool;
                 }
                 values {
-                     state: Elm.Toolbar_Item.State * @nullable;
+                     state: Elm.Toolbar.Item.State * @nullable;
                 }
            }
            /*      init { FIXME
@@ -230,12 +230,12 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                      @in func: Evas_Smart_Cb @optional; [[The function to call 
when the item is clicked when this state is selected.]]
                      @in data: const (void) * @optional; [[The data to 
associate with the state.]]
                 }
-                return: Elm.Toolbar_Item.State *; [[The toolbar item state, or 
$null upon failure.]]
+                return: Elm.Toolbar.Item.State *; [[The toolbar item state, or 
$null upon failure.]]
            }
            state_del {
                 [[Delete a previously added state to $item.]]
                 params {
-                     @in state: Elm.Toolbar_Item.State *; [[The state to be 
deleted.]]
+                     @in state: Elm.Toolbar.Item.State *; [[The state to be 
deleted.]]
                 }
                 return: bool; [[$true on success or $false on failure.]]
            }
@@ -245,7 +245,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                   If last state is selected, this function will return first
                   state.
                 ]]
-                return: Elm.Toolbar_Item.State *; [[The state after current 
state, or $null on failure.]]
+                return: Elm.Toolbar.Item.State *; [[The state after current 
state, or $null on failure.]]
            }
            state_prev {
                 [[Get the state before selected state in toolbar's $item.
@@ -253,7 +253,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                   If first state is selected, this function will return last
                   state.
                 ]]
-                return: Elm.Toolbar_Item.State *; [[The state before current 
state, or $null on failure.]]
+                return: Elm.Toolbar.Item.State *; [[The state before current 
state, or $null on failure.]]
            }
            show {
                 [[Show a specific item, when the toolbar can be scrolled.
@@ -261,7 +261,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                   @since 1.8
                 ]]
                 params {
-                     @in scrollto: Elm.Toolbar_Item.Scrollto_Type; [[The 
position the item should appear at.]]
+                     @in scrollto: Elm.Toolbar.Item.Scrollto_Type; [[The 
position the item should appear at.]]
                 }
            }
            bring_in {
@@ -271,7 +271,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                   @since 1.8
                 ]]
                 params {
-                     @in scrollto: Elm.Toolbar_Item.Scrollto_Type; [[The 
position the item should appear at.]]
+                     @in scrollto: Elm.Toolbar.Item.Scrollto_Type; [[The 
position the item should appear at.]]
                 }
            }
            menu_set {
@@ -308,15 +308,15 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
       implements {
            Eo.Base.constructor;
            Eo.Base.destructor;
-           Elm.Widget_Item.disable;
-           Elm.Widget_Item.focus.set;
-           Elm.Widget_Item.focus.get;
-           Elm.Widget_Item.signal_emit;
-           Elm.Widget_Item.part_text.get;
-           Elm.Widget_Item.part_text.set;
-           Elm.Widget_Item.part_content.get;
-           Elm.Widget_Item.part_content.set;
-           Elm.Widget_Item.part_content_unset;
+           Elm.Widget.Item.disable;
+           Elm.Widget.Item.focus.set;
+           Elm.Widget.Item.focus.get;
+           Elm.Widget.Item.signal_emit;
+           Elm.Widget.Item.part_text.get;
+           Elm.Widget.Item.part_text.set;
+           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;
       }
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 34ea4ac..4bdc6e3 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -405,7 +405,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
       @property focused_item {
          get {
             [[Get the focused widget item.]]
-            return: Elm.Widget_Item *;
+            return: Elm.Widget.Item *;
          }
       }
       @property parents_bounce {
@@ -491,7 +491,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
 
            @since 1.16]]
          params {
-            @in next_item: Elm.Widget_Item * @nullable; [[Focus next object 
item]]
+            @in next_item: Elm.Widget.Item * @nullable; [[Focus next object 
item]]
             @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
       }
@@ -499,7 +499,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
          [[Get the next object item with specific focus direction.
 
            @since 1.16]]
-         return: Elm.Widget_Item *; [[Focus next object item]]
+         return: Elm.Widget.Item *; [[Focus next object item]]
          params {
             @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
@@ -591,7 +591,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
       on_focus {
          [['Virtual' function handling focus in/out events on the widget.  
return true if this widget can handle focus, false otherwise]]
          params {
-            @in item: Elm.Widget_Item * @nullable;
+            @in item: Elm.Widget.Item * @nullable;
          }
          return: bool;
       }
@@ -618,7 +618,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
             @in base: const(Evas.Object)*;
             @in degree: double;
             @out direction: Evas.Object *;
-            @out direction_item: Elm.Widget_Item *;
+            @out direction_item: Elm.Widget.Item *;
             @out weight: double;
          }
          return: bool;
@@ -658,7 +658,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
             @in list_data_get: list_data_get_func_type;
             @in degree: double;
             @out direction: Evas.Object *;
-            @out direction_item: Elm.Widget_Item *;
+            @out direction_item: Elm.Widget.Item *;
             @out weight: double;
          }
       }
@@ -699,7 +699,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
          params {
             @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
-            @out next_item: Elm.Widget_Item *;
+            @out next_item: Elm.Widget.Item *;
          }
       }
       translatable_part_text_get @const {
@@ -731,7 +731,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
       }
       focus_steal {
          params {
-            @in item: Elm.Widget_Item * @nullable;
+            @in item: Elm.Widget.Item * @nullable;
          }
       }
       focus_hide_handle {
@@ -741,7 +741,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
          params {
             @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
-            @out next_item: Elm.Widget_Item *;
+            @out next_item: Elm.Widget.Item *;
          }
          return: bool;
       }
@@ -752,7 +752,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
             @in list_data_get: list_data_get_func_type;
             @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
-            @out next_item: Elm.Widget_Item *;
+            @out next_item: Elm.Widget.Item *;
          }
       }
       focus_mouse_up_handle {
@@ -768,7 +768,7 @@ abstract Elm.Widget (Evas.Object.Smart, 
Elm.Interface_Atspi_Accessible, Elm.Inte
             @in base: const(Evas.Object)*;
             @in degree: double;
             @out direction: Evas.Object *;
-            @out direction_item: Elm.Widget_Item *;
+            @out direction_item: Elm.Widget.Item *;
             @out weight: double;
          }
       }
diff --git a/src/lib/elementary/elm_widget_item.eo 
b/src/lib/elementary/elm_widget_item.eo
index 3351086..a997e0c 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Widget_Item(Eo.Base, Elm.Interface_Atspi_Accessible,
+class Elm.Widget.Item(Eo.Base, Elm.Interface_Atspi_Accessible,
                       Elm.Interface_Atspi_Component)
 {
       eo_prefix: elm_wdg_item;
@@ -516,14 +516,14 @@ class Elm.Widget_Item(Eo.Base, 
Elm.Interface_Atspi_Accessible,
                 params {
                      dir: Elm.Focus_Direction; [[Focus direction]]
                 }
-                return: Elm.Widget_Item *; [[Focus next object item]]
+                return: Elm.Widget.Item *; [[Focus next object item]]
            }
            focus_next_item_set {
                 [[Set the next object item with specific focus direction.
 
                   @since 1.16]]
                 params {
-                     next_item: Elm.Widget_Item * @nullable; [[Focus next 
object item]]
+                     next_item: Elm.Widget.Item * @nullable; [[Focus next 
object item]]
                      dir: Elm.Focus_Direction; [[Focus direction]]
                 }
            }

-- 


Reply via email to