diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot
index 885798ac41..e2b07c5ae3 100644
--- a/src/lib/edje/edje_types.eot
+++ b/src/lib/edje/edje_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Canvas.Layout.Part_Type
+enum Efl.Canvas.Layout_Part_Type
 {
    [[Type of a part in an Efl.Canvas.Layout object (edje object).]]
    none      = 0,  [[None type value, indicates invalid parts.]]
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index b66ff3a994..2610ab21f0 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -118,7 +118,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.File.load_error { get; }
       Efl.File.mmap { get; set; }
       Efl.Container.content_remove;
-      Efl.Part.part; [[Returns @Efl.Canvas.Layout.Part.]]
+      Efl.Part.part; [[Returns @Efl.Canvas.Layout_Part]]
       Efl.Observer.update;
       Efl.Player.playable { get; }
       Efl.Player.play { get; set; }
diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo
index dff1bfe95f..c96e9a7788 100644
--- a/src/lib/edje/efl_canvas_layout_part.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,6 +1,6 @@
 import edje_types;
 
-class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
+class Efl.Canvas.Layout_Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
 {
    [[Common class for part proxy objects for @Efl.Canvas.Layout.
 
@@ -32,7 +32,7 @@ class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
             [[Returns the type of the part.]]
          }
          values {
-            type: Efl.Canvas.Layout.Part_Type(Efl.Canvas.Layout.Part_Type.none);
+            type: Efl.Canvas.Layout_Part_Type(Efl.Canvas.Layout_Part_Type.none);
                [[One of the types or $none if not an existing part.]]
          }
       }
diff --git a/src/lib/edje/efl_canvas_layout_part_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo
index 7a189ae5a3..879a655b14 100644
--- a/src/lib/edje/efl_canvas_layout_part_box.eo
+++ b/src/lib/edje/efl_canvas_layout_part_box.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout.Part_Box (Efl.Canvas.Layout.Part, Efl.Pack.Linear,
+class Efl.Canvas.Layout_Part_Box (Efl.Canvas.Layout_Part, Efl.Pack.Linear,
                                   Efl.Ui.Direction)
 {
    [[Represents a Box created as part of a layout.
diff --git a/src/lib/edje/efl_canvas_layout_part_external.eo b/src/lib/edje/efl_canvas_layout_part_external.eo
index cb485e41db..8c81d62a86 100644
--- a/src/lib/edje/efl_canvas_layout_part_external.eo
+++ b/src/lib/edje/efl_canvas_layout_part_external.eo
@@ -1,6 +1,6 @@
 import edje_types;
 
-class Efl.Canvas.Layout.Part_External (Efl.Canvas.Layout.Part, Efl.Content,
+class Efl.Canvas.Layout_Part_External (Efl.Canvas.Layout_Part, Efl.Content,
                                        Efl.Canvas.Object)
 {
    [[Class representing an external part in Edje layouts.
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index e0a7ec571e..494dd9a8cd 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -1,6 +1,6 @@
 import edje_types;
 
-class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
+class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content,
                                       Efl.Pack.Linear, Efl.Ui.Direction,
                                       Efl.Pack.Table, Efl.Text,
                                       Efl.Text.Markup, Efl.Text.Cursor)
@@ -17,8 +17,8 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
    data: null;
    implements {
       // Efl.Canvas.Layout.Part
-      Efl.Canvas.Layout.Part.state { get; }
-      Efl.Canvas.Layout.Part.part_type { get; }
+      Efl.Canvas.Layout_Part.state { get; }
+      Efl.Canvas.Layout_Part.part_type { get; }
       Efl.Gfx.Entity.geometry { get; }
       Efl.Ui.Drag.drag_value { set; get; }
       Efl.Ui.Drag.drag_size { set; get; }
@@ -27,10 +27,10 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
       Efl.Ui.Drag.drag_step_move;
       Efl.Ui.Drag.drag_page { set; get; }
       Efl.Ui.Drag.drag_page_move;
-      // Efl.Canvas.Layout.Part_Swallow & External
+      // Efl.Canvas.Layout_Part_Swallow & External
       Efl.Content.content { get; set; }
       Efl.Content.content_unset;
-      // Efl.Canvas.Layout.Part_Text
+      // Efl.Canvas.Layout_Part_Text
       Efl.Text.text { set; get; }
       Efl.Text.Markup.markup { get; set; }
       Efl.Text.Cursor.text_cursor { get; }
@@ -47,7 +47,7 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
       Efl.Text.Cursor.cursor_content { get; }
       Efl.Text.Cursor.cursor_geometry { get; }
       Efl.Text.Markup.cursor_markup_insert;
-      // Efl.Canvas.Layout.Part_Box
+      // Efl.Canvas.Layout_Part_Box
       Efl.Container.content_iterate;
       Efl.Container.content_count;
       Efl.Container.content_remove;
@@ -64,7 +64,7 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
       Efl.Pack.Linear.pack_unpack_at;
       Efl.Pack.Linear.pack_index_get;
       Efl.Ui.Direction.direction { get; [[Returns $default if unknown.]] }
-      // Efl.Canvas.Layout.Part_Table
+      // Efl.Canvas.Layout_Part_Table
       Efl.Pack.Table.pack_table;
       Efl.Pack.Table.table_content_get;
       Efl.Pack.Table.table_contents_get;
diff --git a/src/lib/edje/efl_canvas_layout_part_swallow.eo b/src/lib/edje/efl_canvas_layout_part_swallow.eo
index 93e997243c..32634e8137 100644
--- a/src/lib/edje/efl_canvas_layout_part_swallow.eo
+++ b/src/lib/edje/efl_canvas_layout_part_swallow.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout.Part_Swallow (Efl.Canvas.Layout.Part, Efl.Content)
+class Efl.Canvas.Layout_Part_Swallow (Efl.Canvas.Layout_Part, Efl.Content)
 {
    [[Represents a SWALLOW part of an Edje object.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo
index 67fd559938..e3d8a56661 100644
--- a/src/lib/edje/efl_canvas_layout_part_table.eo
+++ b/src/lib/edje/efl_canvas_layout_part_table.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout.Part_Table (Efl.Canvas.Layout.Part, Efl.Pack.Table)
+class Efl.Canvas.Layout_Part_Table (Efl.Canvas.Layout_Part, Efl.Pack.Table)
 {
    [[Represents a Table created as part of a layout.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index edcfcaea11..088cba84bd 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout.Part_Text (Efl.Canvas.Layout.Part, Efl.Text,
+class Efl.Canvas.Layout_Part_Text (Efl.Canvas.Layout_Part, Efl.Text,
 Efl.Text.Markup, Efl.Text.Cursor)
 {
    [[Represents a TEXT part of a layout
diff --git a/src/lib/edje/efl_layout_group.eo b/src/lib/edje/efl_layout_group.eo
index bb85af9740..a3334cc7c1 100644
--- a/src/lib/edje/efl_layout_group.eo
+++ b/src/lib/edje/efl_layout_group.eo
@@ -1,4 +1,5 @@
 import eina_types;
+import edje_types;
 
 interface Efl.Layout.Group
 {
@@ -110,7 +111,7 @@ interface Efl.Layout.Group
            does not exist, and this will return $true if the part is of type
            $SPACER in the EDC file ($SPACER parts have type $NONE).
 
-           See also @Efl.Canvas.Layout.Part.part_type.
+           See also @Efl.Canvas.Layout_Part.part_type.
          ]]
          get { [[Returns $true if the part exists in the EDC group.]] }
          keys {