diff --git a/src/lib/elementary/efl_ui_view_list.eo b/src/lib/elementary/efl_ui_view_list.eo
index 09f82dc313..e64bcbd713 100644
--- a/src/lib/elementary/efl_ui_view_list.eo
+++ b/src/lib/elementary/efl_ui_view_list.eo
@@ -1,19 +1,19 @@
 import elm_general;
 
-struct Efl.Ui.View.List.Item_Event
+struct Efl.Ui.View_List_Item_Event
 {
    layout: Efl.Ui.Layout.Object;
    child: Efl.Model;
    index: int;
 }
-class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
+class Efl.Ui.View_List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
                 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
-                Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.View.List.Model)
+                Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.View_List_Model)
 {
    methods {
       @property relayout {
          values {
-            object: Efl.Ui.View.List.Relayout;
+            object: Efl.Ui.View_List_Relayout;
          }
       }
       @property homogeneous {
@@ -50,14 +50,14 @@ class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Int
       }
    }
    events {
-      item,realized : Efl.Ui.View.List.Item_Event;
-      item,unrealized : Efl.Ui.View.List.Item_Event;
-      item,focused : Efl.Ui.View.List.Item_Event;
-      item,unfocused : Efl.Ui.View.List.Item_Event;
-      item,highlighted : Efl.Ui.View.List.Item_Event;
-      item,unhighlighted : Efl.Ui.View.List.Item_Event;
-      item,selected : Efl.Ui.View.List.Item_Event;
-      item,unselected : Efl.Ui.View.List.Item_Event;
+      item,realized : Efl.Ui.View_List_Item_Event;
+      item,unrealized : Efl.Ui.View_List_Item_Event;
+      item,focused : Efl.Ui.View_List_Item_Event;
+      item,unfocused : Efl.Ui.View_List_Item_Event;
+      item,highlighted : Efl.Ui.View_List_Item_Event;
+      item,unhighlighted : Efl.Ui.View_List_Item_Event;
+      item,selected : Efl.Ui.View_List_Item_Event;
+      item,unselected : Efl.Ui.View_List_Item_Event;
    }
 
    implements {
@@ -70,11 +70,11 @@ class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Int
       Efl.Canvas.Group.group_member_add;
       Efl.Canvas.Group.group_calculate;
 
-      Efl.Ui.View.List.Model.load_range { set;}
-      Efl.Ui.View.List.Model.realize;
-      Efl.Ui.View.List.Model.unrealize;
-      Efl.Ui.View.List.Model.model_size { get; }
-      Efl.Ui.View.List.Model.min_size { get; set; }
+      Efl.Ui.View_List_Model.load_range { set;}
+      Efl.Ui.View_List_Model.realize;
+      Efl.Ui.View_List_Model.unrealize;
+      Efl.Ui.View_List_Model.model_size { get; }
+      Efl.Ui.View_List_Model.min_size { get; set; }
 
       // Widget
       Efl.Ui.Widget.focus_manager_create;
diff --git a/src/lib/elementary/efl_ui_view_list_model.eo b/src/lib/elementary/efl_ui_view_list_model.eo
index 9f03f05072..bbcdef2ef1 100644
--- a/src/lib/elementary/efl_ui_view_list_model.eo
+++ b/src/lib/elementary/efl_ui_view_list_model.eo
@@ -1,6 +1,6 @@
 import efl_ui_view_list_types;
 
-interface Efl.Ui.View.List.Model (Efl.Interface)
+interface Efl.Ui.View_List_Model (Efl.Interface)
 {
    methods {
       @property load_range {
diff --git a/src/lib/elementary/efl_ui_view_list_pan.eo b/src/lib/elementary/efl_ui_view_list_pan.eo
index a94d40ec27..b6b275f204 100644
--- a/src/lib/elementary/efl_ui_view_list_pan.eo
+++ b/src/lib/elementary/efl_ui_view_list_pan.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.View.List.Pan (Efl.Ui.Pan)
+class Efl.Ui.View_List_Pan (Efl.Ui.Pan)
 {
    [[Elementary Efl_Ui_View_List pan class]]
    implements {
diff --git a/src/lib/elementary/efl_ui_view_list_precise_layouter.eo b/src/lib/elementary/efl_ui_view_list_precise_layouter.eo
index 6f8077e6c8..690f927fb5 100644
--- a/src/lib/elementary/efl_ui_view_list_precise_layouter.eo
+++ b/src/lib/elementary/efl_ui_view_list_precise_layouter.eo
@@ -1,9 +1,9 @@
-class Efl.Ui.View.List.Precise_Layouter (Efl.Object, Efl.Ui.View.List.Relayout)
+class Efl.Ui.View_List_Precise_Layouter (Efl.Object, Efl.Ui.View_List_Relayout)
 {
    implements {
       Efl.Object.constructor;
-      Efl.Ui.View.List.Relayout.layout_do;
-      Efl.Ui.View.List.Relayout.model { set; }
-      Efl.Ui.View.List.Relayout.elements { get; }
+      Efl.Ui.View_List_Relayout.layout_do;
+      Efl.Ui.View_List_Relayout.model { set; }
+      Efl.Ui.View_List_Relayout.elements { get; }
    }
 }
diff --git a/src/lib/elementary/efl_ui_view_list_relayout.eo b/src/lib/elementary/efl_ui_view_list_relayout.eo
index d48c47f558..8a442ced42 100644
--- a/src/lib/elementary/efl_ui_view_list_relayout.eo
+++ b/src/lib/elementary/efl_ui_view_list_relayout.eo
@@ -1,13 +1,13 @@
 import efl_ui_view_list_types;
 
-interface Efl.Ui.View.List.Relayout (Efl.Interface)
+interface Efl.Ui.View_List_Relayout (Efl.Interface)
 {
    methods {
       layout_do {
          params {
-            modeler: Efl.Ui.View.List.Model;
+            modeler: Efl.Ui.View_List_Model;
             first: int;
-            children: Efl.Ui.View.List.SegArray;
+            children: Efl.Ui.View_List_SegArray;
          }
       }
       @property model {
diff --git a/src/lib/elementary/efl_ui_view_list_segarray.eo b/src/lib/elementary/efl_ui_view_list_segarray.eo
index f656959306..cc5deb5bca 100644
--- a/src/lib/elementary/efl_ui_view_list_segarray.eo
+++ b/src/lib/elementary/efl_ui_view_list_segarray.eo
@@ -1,7 +1,7 @@
 import elm_general;
 import efl_ui_view_list_types;
 
-class Efl.Ui.View.List.SegArray (Efl.Object)
+class Efl.Ui.View_List_SegArray (Efl.Object)
 {
    methods {
       @property accessor {