diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 76a9af5c2f59dffc408efd3fbc808efb73453e0a..fd37b7073fdeee0daa4d1c821831ca5999f1ce6e 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/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index b8870370eda1223045a147912c290ca80d15c99b..0790df5c1cd61029070a40ad4b3e4a61949e0820 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -234,7 +234,7 @@
       <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>
@@ -245,7 +245,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>
@@ -388,7 +388,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>
@@ -399,11 +399,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>
@@ -413,16 +413,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>
@@ -432,11 +432,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/comms/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/comms/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/emailcomms/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/emailcomms/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/OrgEdit_view/OrgEdit_view.aod b/neonView/OrgEdit_view/OrgEdit_view.aod
index 62e329c673155f593055f224b6aa2563eb66e96a..47acd02a87cd654e366cd04a1b07a3cbb8f36c27 100644
--- a/neonView/OrgEdit_view/OrgEdit_view.aod
+++ b/neonView/OrgEdit_view/OrgEdit_view.aod
@@ -49,7 +49,7 @@
     </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..37eb2fa7e3f0753d51d9353d5e7a74843217359e 100644
--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrgPreview_view/OrgPreview_view.aod
@@ -17,7 +17,7 @@
     </cardViewTemplate>
     <neonViewReference>
       <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
-      <entityField>Comms</entityField>
+      <entityField>Communications</entityField>
       <view>CommList_view</view>
     </neonViewReference>
     <neonViewReference>