diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 280145ea2ff4c718bf074865a013f6ecb00c25bf..ab6387e257882a62cb5bbf18ba4d042b921690ba 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -58,7 +58,7 @@
         <entityDependency>
           <name>73dec28e-1c16-4b09-a665-8db44201d317</name>
           <entityName>Activity_entity</entityName>
-          <fieldName>ActivityLink_dfo</fieldName>
+          <fieldName>Links</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 8c51fc3a3e500a41e91a8212f92d1ce2ca38c2fc..b9502f38c6b5535091ad7bd1fbf45240560871b1 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -156,7 +156,7 @@
       <documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
     </entityParameter>
     <entityConsumer>
-      <name>ActivityDocument_dfo</name>
+      <name>AllDocuments</name>
       <title>Documents</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -167,20 +167,20 @@
       <children>
         <entityParameter>
           <name>AssignmentName_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentRowId_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentTable_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>ActivityMainDocument_dfo</name>
+      <name>MainDocuments</name>
       <title>Maindocuments</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -191,19 +191,19 @@
       <children>
         <entityParameter>
           <name>Keyword_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentTable_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentRowId_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentName_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -225,7 +225,7 @@
       <description>PARAMETER</description>
     </entityParameter>
     <entityConsumer>
-      <name>ActivityObjectRelation_dfo</name>
+      <name>ObjectRelations</name>
       <title>Relations</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -236,16 +236,16 @@
       <children>
         <entityParameter>
           <name>Object1Rowid_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>Object1Type_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>ActivityLink_dfo</name>
+      <name>Links</name>
       <title>Beziehungen</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -256,11 +256,11 @@
       <children>
         <entityParameter>
           <name>ObjectRowid_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>ObjectType_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js b/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js
rename to entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js b/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js
rename to entity/Activity_entity/entityfields/links/children/objecttype_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js b/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
rename to entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js b/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
rename to entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index eb561e9ebce7777f581f7992e5fa3fc6bc4fb226..9c3c619993ffa1bbdb8acdbb377d18f6b98de16b 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -249,7 +249,7 @@
         <entityDependency>
           <name>d57c0122-3227-4f98-b6a5-2ae45a0c5571</name>
           <entityName>Activity_entity</entityName>
-          <fieldName>ActivityDocument_dfo</fieldName>
+          <fieldName>AllDocuments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
@@ -262,7 +262,7 @@
         <entityDependency>
           <name>056d9a73-c9cd-44f2-828b-e9742b66fa37</name>
           <entityName>Activity_entity</entityName>
-          <fieldName>ActivityMainDocument_dfo</fieldName>
+          <fieldName>MainDocuments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 3316abde9417f0d701523f48ce6b216db0be07d7..7c79cd0732278da4ba55299de82ded9bd0532b87 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -66,7 +66,7 @@
         <entityDependency>
           <name>8eb3187c-07cb-4b51-8b7e-d63e83959bdb</name>
           <entityName>Activity_entity</entityName>
-          <fieldName>ActivityObjectRelation_dfo</fieldName>
+          <fieldName>ObjectRelations</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 0eebb1a184ac48208842bcb0955e2e101744d28f..d997d0fdf650fd034ddff7f502709edb3e7d5b44 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -21,12 +21,12 @@
     </neonViewReference>
     <neonViewReference>
       <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
-      <entityField>ActivityDocument_dfo</entityField>
+      <entityField>AllDocuments</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>6066d539-d392-4688-931a-409c10fa1fbe</name>
-      <entityField>ActivityLink_dfo</entityField>
+      <entityField>Links</entityField>
       <view>ActivityLinkFilter_view</view>
     </neonViewReference>
   </children>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index eaa45e929fc6184e171a216cc0ad63b6ed15cace..305b2238fe3da9600e215a63384e90fa0d550fea 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -36,7 +36,7 @@
     </genericViewTemplate>
     <neonViewReference>
       <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
-      <entityField>ActivityMainDocument_dfo</entityField>
+      <entityField>MainDocuments</entityField>
       <view>DocumentList_view</view>
     </neonViewReference>
   </children>