diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 116d2a7d35..85e08bd708 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-enum Elm.Toolbar.Shrink_Mode
+enum Elm.Toolbar_Shrink_Mode
 {
    [[Set toolbar's items display behavior, it can be scrollable,
      show a menu with exceeding items, or simply hide them.
@@ -148,7 +148,7 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
          get {
          }
          values {
-            shrink_mode: Elm.Toolbar.Shrink_Mode; [[Toolbar's items display behavior]]
+            shrink_mode: Elm.Toolbar_Shrink_Mode; [[Toolbar's items display behavior]]
          }
       }
       @property menu_parent {
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index abfc9deeb2..ab48bf51df 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_ptr); [[Item data]]
 }
 
-class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
+class Elm.Toolbar_Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
 {
       [[Elementary toolbar item class]]
       legacy_prefix: elm_toolbar_item;
@@ -183,7 +183,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
                      return: bool; [[$true on success, $false otherwise]]
                 }
                 values {
-                     state: ptr(Elm.Toolbar.Item.State) @nullable; [[Item state]]
+                     state: ptr(Elm.Toolbar_Item_State) @nullable; [[Item state]]
                 }
            }
            /*      init { FIXME
@@ -235,12 +235,12 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
                      @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]]
                      @in data: const(void_ptr) @optional; [[The data to associate with the state.]]
                 }
-                return: ptr(Elm.Toolbar.Item.State); [[The toolbar item state, or $null upon failure.]]
+                return: ptr(Elm.Toolbar_Item_State); [[The toolbar item state, or $null upon failure.]]
            }
            state_del {
                 [[Delete a previously added state to $item.]]
                 params {
-                     @in state: ptr(Elm.Toolbar.Item.State); [[The state to be deleted.]]
+                     @in state: ptr(Elm.Toolbar_Item_State); [[The state to be deleted.]]
                 }
                 return: bool; [[$true on success or $false on failure.]]
            }
@@ -250,7 +250,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
                   If last state is selected, this function will return first
                   state.
                 ]]
-                return: ptr(Elm.Toolbar.Item.State); [[The state after current state, or $null on failure.]]
+                return: ptr(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.
@@ -258,7 +258,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
                   If first state is selected, this function will return last
                   state.
                 ]]
-                return: ptr(Elm.Toolbar.Item.State); [[The state before current state, or $null on failure.]]
+                return: ptr(Elm.Toolbar_Item_State); [[The state before current state, or $null on failure.]]
            }
            show {
                 [[Show a specific item, when the toolbar can be scrolled.
@@ -266,7 +266,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
                   @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 {
@@ -276,7 +276,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
                   @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 {