relation -> contact

entity/Communication_entity/Communication_entity.aod

@@ -47,8 +47,8 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       <recordContainer>db</recordContainer>
     </entityProvider>
     <entityParameter>
-      <name>RelationsMainCountry_param</name>
-      <code>%aditoprj%/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js</code>
+      <name>ContactsMainCountry_param</name>
+      <code>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js</code>
       <mandatory v="false" />
       <description>PARAMETER</description>
     </entityParameter>

entity/Communication_entity/entityfields/addr/onValidation.js

@@ -16,7 +16,7 @@ var fn = CommValidationUtil.makeValidationFn(commCategory);
 if (fn != null){
     var commAddr = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ADDR"));
     var additional = CommValidationUtil.getExtensionsBlueprint();
-    additional.countryCode = vars.get("$param.RelationsMainCountry_param");//TODO: try to use users language first and then the companies
+    additional.countryCode = vars.get("$param.ContactsMainCountry_param");//TODO: try to use users language first and then the companies
     var res = fn.call(null, commAddr, additional);
     if (res != null)
         result.string(res);

entity/Keyword_entity/Keyword_entity.aod

@@ -73,7 +73,7 @@
         <entityDependency>
           <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
           <entityName>Organisation_entity</entityName>
-          <fieldName>KeywordRelationStates</fieldName>
+          <fieldName>KeywordContactStates</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>

entity/Organisation_entity/Organisation_entity.aod

@@ -48,7 +48,7 @@
     <entityField>
       <name>STATUS</name>
       <title>Status</title>
-      <consumer>KeywordRelationStates</consumer>
+      <consumer>KeywordContactStates</consumer>
       <searchable v="false" />
     </entityField>
     <entityField>
@@ -426,7 +426,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>KeywordRelationStates</name>
+      <name>KeywordContactStates</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -436,7 +436,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       <children>
         <entityParameter>
           <name>containerName_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js</code>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>