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 235b75ee7b56db0c29164171da4af9a73d122791..ed88165fd688ce37ffd87de73227999f231fc930 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/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 697644cbc257b55c061e493671afd557336b486e..a31af8e4a962d30c05567be74edcba1199052693 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -92,7 +92,7 @@
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
<entityName>Org_entity</entityName>
- <fieldName>OrgAddresses</fieldName>
+ <fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index cf3f1fc5a868fdb5faeddd06d0909ed54e29a0d6..0813acbf9da0f2aa54980647e10cc8528f843d82 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -76,7 +76,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
<entityName>Org_entity</entityName>
- <fieldName>Comms</fieldName>
+ <fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -102,7 +102,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
<entityName>Org_entity</entityName>
- <fieldName>PhoneComms</fieldName>
+ <fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -115,7 +115,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
<entityName>Org_entity</entityName>
- <fieldName>EmailComms</fieldName>
+ <fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 8e5155a650d53efa9146cbca82491e8f0f343121..06291da1dd1f1c16f4c4cec5caeb20e1ecfb8b3e 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 8052eead090b21731354adae72f09026b5e5ef7b..57cbc4a8d68e396f2be3824d011baeea41a88d32 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/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 8d0a43ad97b39016c5cc512838c024d17bc4b351..b507bc9d65d9af05629af77af9c8508533a6a14d 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -193,7 +193,7 @@
</dependencies>
</entityProvider>
<entityConsumer>
- <name>OrgAddresses</name>
+ <name>Addresses</name>
<title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -204,17 +204,17 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/addresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddresses/children/defaultaddressid_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddresses/children/relationtype_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -222,13 +222,13 @@
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
- <consumer>OrgAddresses</consumer>
+ <consumer>Addresses</consumer>
<searchable v="false" />
<state>AUTO</state>
<displayValueProcess>%aditoprj%/entity/Org_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
- <name>Comms</name>
+ <name>Communications</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -239,7 +239,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/comms/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -390,7 +390,7 @@
<entityField>
<name>STANDARD_EMAIL_COMM</name>
<title>standard email</title>
- <consumer>EmailComms</consumer>
+ <consumer>EmailCommunications</consumer>
<onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
@@ -401,11 +401,11 @@
<entityField>
<name>STANDARD_PHONE_COMM</name>
<title>standard phone</title>
- <consumer>PhoneComms</consumer>
+ <consumer>PhoneCommunications</consumer>
<onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
- <name>PhoneComms</name>
+ <name>PhoneCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -415,16 +415,16 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/phonecomms/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/phonecomms/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>EmailComms</name>
+ <name>EmailCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -434,11 +434,11 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/emailcomms/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/emailcomms/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Org_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Org_entity/entityfields/orgaddresses/children/defaultaddressid_param/code.js b/entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgaddresses/children/defaultaddressid_param/code.js
rename to entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgaddresses/children/relationtype_param/code.js b/entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgaddresses/children/relationtype_param/code.js
rename to entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js
diff --git a/entity/Org_entity/entityfields/comms/children/relid_param/code.js b/entity/Org_entity/entityfields/addresses/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/comms/children/relid_param/code.js
rename to entity/Org_entity/entityfields/addresses/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/emailcomms/children/relid_param/code.js b/entity/Org_entity/entityfields/communications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/emailcomms/children/relid_param/code.js
rename to entity/Org_entity/entityfields/communications/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/emailcomms/children/commcategory_param/code.js b/entity/Org_entity/entityfields/emailcommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/emailcomms/children/commcategory_param/code.js
rename to entity/Org_entity/entityfields/emailcommunications/children/commcategory_param/code.js
diff --git a/entity/Org_entity/entityfields/orgaddresses/children/relid_param/code.js b/entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgaddresses/children/relid_param/code.js
rename to entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/phonecomms/children/commcategory_param/code.js b/entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/phonecomms/children/commcategory_param/code.js
rename to entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js
diff --git a/entity/Org_entity/entityfields/phonecomms/children/relid_param/code.js b/entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/phonecomms/children/relid_param/code.js
rename to entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js
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>
diff --git a/neonView/OrgEdit_view/OrgEdit_view.aod b/neonView/OrgEdit_view/OrgEdit_view.aod
index 62e329c673155f593055f224b6aa2563eb66e96a..896e02c61a2d9fbfcc7223ecdb77a90a9cc058d7 100644
--- a/neonView/OrgEdit_view/OrgEdit_view.aod
+++ b/neonView/OrgEdit_view/OrgEdit_view.aod
@@ -44,12 +44,12 @@
</genericViewTemplate>
<neonViewReference>
<name>148e3a6c-d30b-470c-84e5-273293348611</name>
- <entityField>OrgAddresses</entityField>
+ <entityField>Addresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>6355808f-ee94-4caf-95b1-3848e81c75b7</name>
- <entityField>Comms</entityField>
+ <entityField>Communications</entityField>
<view>CommMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
diff --git a/neonView/OrgPreview_view/OrgPreview_view.aod b/neonView/OrgPreview_view/OrgPreview_view.aod
index f1ac3baa88c65a1bbdc80a626277b4faa17b6ca0..97a387bc2eac8df3e4471c50425c2d0b1ed9be3c 100644
--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrgPreview_view/OrgPreview_view.aod
@@ -17,12 +17,12 @@
</cardViewTemplate>
<neonViewReference>
<name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
- <entityField>Comms</entityField>
+ <entityField>Communications</entityField>
<view>CommList_view</view>
</neonViewReference>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
- <entityField>OrgAddresses</entityField>
+ <entityField>Addresses</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>