refactor Keyword entity

entity/Activity_entity/Activity_entity.aod

@@ -11,7 +11,7 @@
     <entityField>
       <name>DIRECTION</name>
       <title>Direction</title>
-      <consumer>Directions</consumer>
+      <consumer>KeywordDirections</consumer>
       <groupable v="true" />
     </entityField>
     <entityField>
@@ -213,7 +213,7 @@
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>Directions</name>
+      <name>KeywordDirections</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -223,7 +223,7 @@
       <children>
         <entityParameter>
           <name>containerName_param</name>
-          <code>%aditoprj%/entity/Activity_entity/entityfields/directions/children/containername_param/code.js</code>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>

entity/Keyword_entity/Keyword_entity.aod

@@ -73,13 +73,13 @@
         <entityDependency>
           <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
           <entityName>Organisation_entity</entityName>
-          <fieldName>RelationStates</fieldName>
+          <fieldName>KeywordRelationStates</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
           <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
           <entityName>Activity_entity</entityName>
-          <fieldName>Directions</fieldName>
+          <fieldName>KeywordDirections</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>

entity/Organisation_entity/Organisation_entity.aod

@@ -92,7 +92,7 @@
     <entityField>
       <name>STATUS</name>
       <title>Status</title>
-      <consumer>RelationStates</consumer>
+      <consumer>KeywordRelationStates</consumer>
       <contentType>TEXT</contentType>
       <searchable v="false" />
     </entityField>
@@ -507,7 +507,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>RelationStates</name>
+      <name>KeywordRelationStates</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -517,7 +517,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
       <children>
         <entityParameter>
           <name>containerName_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/relationstates/children/containername_param/code.js</code>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>