diff --git a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
index dbb50a2c7e82b3a4502739261b0063347836bdd6..fab71b99e173ede1cf321ce98e204c664d326451 100644
--- a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
+++ b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericMultipleViewTemplate>
-      <name>GenericMultiple</name>
+      <name>MultipleEdit</name>
       <entityField>#ENTITY</entityField>
       <title></title>
       <columns>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index b08bd63a17172ab61584ea63a6547f286f1e91ca..617858db80891671276f960511b634c5558fc71b 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -10,7 +10,7 @@
   </layout>
   <children>
     <genericMultipleViewTemplate>
-      <name>GenericMultiple</name>
+      <name>MultipleEdit</name>
       <autoNewRow v="true" />
       <entityField>#ENTITY</entityField>
       <columns>
diff --git a/neonView/ContactEdit_view/ContactEdit_view.aod b/neonView/ContactEdit_view/ContactEdit_view.aod
index 861b5da3b0759316b1599cc08905dcd7cf205ee7..7e82ca816b891919c2950d31c1a5ba4e24480d73 100644
--- a/neonView/ContactEdit_view/ContactEdit_view.aod
+++ b/neonView/ContactEdit_view/ContactEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>data</name>
+      <name>Edit</name>
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/ContactList_view/ContactList_view.aod b/neonView/ContactList_view/ContactList_view.aod
index c52c92ef4741d91032467412dfa1469157f82f3a..f950d771e5d8211a6471d32ae89639f7e954edf6 100644
--- a/neonView/ContactList_view/ContactList_view.aod
+++ b/neonView/ContactList_view/ContactList_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <tableViewTemplate>
-      <name>main</name>
+      <name>Contacts</name>
       <hideContentSearch v="true" />
       <isEditable v="false" />
       <entityField>#ENTITY</entityField>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 47464d32f38fa46162c2a201c54c8955058c50de..8af0f327beedd58192253d3a037bc651bdc95f32 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -10,7 +10,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>OrderDetail_template</name>
+      <name>Details</name>
       <showDrawer v="true" />
       <drawerCaption>Detail</drawerCaption>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
index e1258b43a52bae03fc2ade6bda6bfda3d03269e0..9b2cb02c7a09f21a2b096bbd60404deb67971bd0 100644
--- a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
+++ b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>linkData</name>
+      <name>Edit</name>
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/StockCount_view/StockCount_view.aod b/neonView/StockCount_view/StockCount_view.aod
index e5107840018f92d1debbb8cccd4e1735e40c891b..8e8ede676aed30d4071e15d40f1a9047fe97dcc7 100644
--- a/neonView/StockCount_view/StockCount_view.aod
+++ b/neonView/StockCount_view/StockCount_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Generic</name>
+      <name>Stocks</name>
       <showDrawer v="true" />
       <drawerCaption>Stock</drawerCaption>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/StockEdit_view/StockEdit_view.aod b/neonView/StockEdit_view/StockEdit_view.aod
index 51a44973a299e354851866f91d7accff4661b432..ea63dc4bbf98903eb999a062337965f7959e38ea 100644
--- a/neonView/StockEdit_view/StockEdit_view.aod
+++ b/neonView/StockEdit_view/StockEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Generic_template</name>
+      <name>Edit</name>
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
index 50d23d9240555ebaf4ce5bca87f68c127640a377..b715a7f6186055abb99750d11d723ced654d2a16 100644
--- a/neonView/StockFilter_view/StockFilter_view.aod
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -10,7 +10,7 @@
   </layout>
   <children>
     <tableViewTemplate>
-      <name>Table_template</name>
+      <name>Stocks</name>
       <autoNewRow v="true" />
       <entityField>#ENTITY</entityField>
       <columns>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 1d122a0c8cc59e662ced8398417c467216d7f0cc..f43c9f7a1c7dc48fd6766376df5447b74cfe89a1 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>main</name>
+      <name>Edit</name>
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 76dbda0d0642303ff9e62416707592d8563f6fe3..558120366953c001d13c2d2dbde7d588f3ec0b0e 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -27,7 +27,7 @@
   </layout>
   <children>
     <timelineViewTemplate>
-      <name>mainTimeline</name>
+      <name>TasksTimeline</name>
       <dateField>START_DATE</dateField>
       <titleField>SUBJECT</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
@@ -35,7 +35,7 @@
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
     <tableViewTemplate>
-      <name>mainTable</name>
+      <name>TasksTable</name>
       <entityField>#ENTITY</entityField>
       <title></title>
       <columns>
@@ -63,7 +63,7 @@
       </columns>
     </tableViewTemplate>
     <treetableViewTemplate>
-      <name>mainTreetable</name>
+      <name>TasksTreetable</name>
       <titleField>SUBJECT</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
       <iconField>#ICON</iconField>
diff --git a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
index 17d77bee5033e72939c23224c989baeb3781f52a..d947ac5f4a1c1b4afb865476bd8415677fbe9839 100644
--- a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
+++ b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <tableViewTemplate>
-      <name>Table</name>
+      <name>TaskLinks</name>
       <autoNewRow v="true" />
       <entityField>#ENTITY</entityField>
       <columns>
diff --git a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
index 5a43d5672c07c5262158438add274ca92ae9215a..564a98f8e832c7a1c28554c28e7fb02a45ddcd68 100644
--- a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
+++ b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericMultipleViewTemplate>
-      <name>GenericMultiple</name>
+      <name>MultipleEdit</name>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
index 04901356207c43d3494152cf0fd797412d6a9a20..1ab3daed2f48ef4d4de53ea3a758be715f598b6b 100644
--- a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
+++ b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Generic</name>
+      <name>Info</name>
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index b90cedaa55f0de2ea004104758fd8ad3facbf0bf..21a1ad13fa5ab1c75199e0122fffaec3dd27c8d1 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <cardViewTemplate>
-      <name>head</name>
+      <name>Header</name>
       <iconField>#ICON</iconField>
       <titleField>SUBJECT</titleField>
       <descriptionField>STATUS</descriptionField>
@@ -17,7 +17,7 @@
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
     <genericViewTemplate>
-      <name>extendedData</name>
+      <name>Info</name>
       <showDrawer v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 02f4fbcea5b422a6209fd224f8d1bb19f3fcbd52..4bc4885aac97d5b531360e35f880137b605e3b20 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <cardViewTemplate>
-      <name>head</name>
+      <name>Header</name>
       <iconField>#ICON</iconField>
       <titleField>SUBJECT</titleField>
       <descriptionField>STATUS</descriptionField>
@@ -17,7 +17,7 @@
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
     <genericViewTemplate>
-      <name>extendedData</name>
+      <name>Info</name>
       <showDrawer v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
index ae77a626db4aeb207c78d4f8c80e2877610b4223..7f4c05f9fc8514c2485931547bf18cad61fd2717 100644
--- a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
+++ b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>TimetrackingEdit_template</name>
+      <name>Edit</name>
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 141e746d2c5260f0bb3f9e00201104fa9bb36325..e923bf38eab937f2ad84016a6aa801ab7d35973d 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -10,7 +10,7 @@
   </layout>
   <children>
     <tableViewTemplate>
-      <name>TimetrackingFilter_template</name>
+      <name>Timetrackings</name>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>