diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index aec18dc8411f79531fb688eb177365074ebf16b3..74732716d5e430f8c74b65ff3a4cc7c19547b7fa 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4919,7 +4919,7 @@
       <descriptionColumn>DESCCOLUMN</descriptionColumn>
       <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js</query>
       <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js</subQueries>
-      <resultContextNeon>Organisation_context</resultContextNeon>
+      <resultContextNeon>Organisation</resultContextNeon>
       <affectedTables>
         <element>ADDRESS</element>
         <element>COMMUNICATION</element>
@@ -4937,7 +4937,7 @@
       <descriptionColumn>DESCCOLUMN</descriptionColumn>
       <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/query.js</query>
       <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js</subQueries>
-      <resultContextNeon>Person_context</resultContextNeon>
+      <resultContextNeon>Person</resultContextNeon>
       <affectedTables>
         <element>ADDRESS</element>
         <element>COMMUNICATION</element>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 882d012d12af9d28493c83d0478e4ad1abc3fc75..744593984030e915d98d7148fd8e224644fd01b4 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -6,10 +6,10 @@
     <node name="CONTACTS" kind="123" title="Contactmanagement">
       <icon>VAADIN:STAR</icon>
       <node name="Group1" kind="123" title="">
-        <node name="Person_context" kind="10077" />
-        <node name="Organisation_context" kind="10077" />
-        <node name="Activity_context" kind="10077" />
-        <node name="Task_context" kind="10077" />
+        <node name="Person" kind="10077" />
+        <node name="Organisation" kind="10077" />
+        <node name="Activity" kind="10077" />
+        <node name="Task" kind="10077" />
         <node name="INTERNAL_ADMINISTRATOR" kind="159" />
       </node>
     </node>
@@ -17,21 +17,21 @@
       <icon>VAADIN:BRIEFCASE</icon>
       <node name="Group2" kind="123" title="">
         <node name="Vertriebsdashboard" kind="10090" />
-        <node name="Salesproject_context" kind="10077" />
-        <node name="Offer_context" kind="10077" />
-        <node name="Order_context" kind="10077" />
-        <node name="Contract_context" kind="10077" />
-        <node name="Product_context" kind="10077" />
-        <node name="Turnover_context" kind="10077" />
+        <node name="Salesproject" kind="10077" />
+        <node name="Offer" kind="10077" />
+        <node name="Order" kind="10077" />
+        <node name="Contract" kind="10077" />
+        <node name="Product" kind="10077" />
+        <node name="Turnover" kind="10077" />
         <node name="INTERNAL_ADMINISTRATOR" kind="159" />
       </node>
     </node>
     <node name="ADMINISTRATION" kind="123" title="Administration">
       <icon>VAADIN:CONTROLLER</icon>
       <node name="Group3" kind="123" title="">
-        <node name="Attribute_context" kind="10077" />
-        <node name="KeywordEntry_context" kind="10077" />
-        <node name="KeywordAttribute_context" kind="10077" />
+        <node name="Attribute" kind="10077" />
+        <node name="KeywordEntry" kind="10077" />
+        <node name="KeywordAttribute" kind="10077" />
         <node name="INTERNAL_ADMINISTRATOR" kind="159" />
       </node>
     </node>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 4b805447c3d3797be103b52807919804974b8df1..9ae49ba6263b8400f088c197ff8060a1d19fce06 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -14,7 +14,7 @@
     <entityField>
       <name>OBJECT_TYPE</name>
       <consumer>Contexts</consumer>
-      <linkedContext>Context_context</linkedContext>
+      <linkedContext>Context</linkedContext>
       <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index c55d9dd0b875f02d4361e6a46eccece15e89eb16..9249da09749998cc3dc218092d307391ff7e909f 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -90,10 +90,10 @@
       </children>
     </entityProvider>
     <entityParameter>
-      <name>RelId_param</name>
+      <name>ContactId_param</name>
       <expose v="true" />
       <mandatory v="true" />
-      <documentation>%aditoprj%/entity/Address_entity/entityfields/relid_param/documentation.adoc</documentation>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
     </entityParameter>
     <entityProvider>
       <name>ContactAddresses</name>
diff --git a/entity/Address_entity/conditionProcess.js b/entity/Address_entity/conditionProcess.js
index 62ada302eb217d55cd56b4a8a4e72b7f99874d8b..029bece9162d3a87ea09053626efcef906a8d9ef 100644
--- a/entity/Address_entity/conditionProcess.js
+++ b/entity/Address_entity/conditionProcess.js
@@ -1,7 +1,7 @@
 import("system.result");
 import("system.vars");
 
-if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
-    result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");  
+if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null && vars.get("$param.ContactId_param") != "")
+    result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");  
 else
     result.string("1 = 1");  
diff --git a/entity/Address_entity/entityfields/contact_id/valueProcess.js b/entity/Address_entity/entityfields/contact_id/valueProcess.js
index d2e1b432aef07fb4a0da589e632414a43f9c39c4..aa4a9e3b29063c140d593bb899093285f48b14f7 100644
--- a/entity/Address_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Address_entity/entityfields/contact_id/valueProcess.js
@@ -5,8 +5,8 @@ import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    if(vars.exists("$param.RelId_param") && vars.getString("$param.RelId_param"))
+    if(vars.exists("$param.ContactId_param") && vars.getString("$param.ContactId_param"))
     {
-        result.string(vars.getString("$param.RelId_param"));    
+        result.string(vars.getString("$param.ContactId_param"));    
     }
 }
diff --git a/entity/Address_entity/entityfields/relid_param/documentation.adoc b/entity/Address_entity/entityfields/contactid_param/documentation.adoc
similarity index 100%
rename from entity/Address_entity/entityfields/relid_param/documentation.adoc
rename to entity/Address_entity/entityfields/contactid_param/documentation.adoc
diff --git a/entity/Address_entity/recordcontainers/db/conditionProcess.js b/entity/Address_entity/recordcontainers/db/conditionProcess.js
index 34aa7047635486364e831dd80620fd9921b2e3a0..22505bedf3fc1ed150416e9462d6f132f39ff865 100644
--- a/entity/Address_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Address_entity/recordcontainers/db/conditionProcess.js
@@ -1,7 +1,7 @@
 import("system.result");
 import("system.vars");
 
-if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
-    result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");  
+if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null)
+    result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");  
 else
     result.string("1 = 2");  
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 94ce55e97ff56c40cee194ea570bdf80eae5db10..568f2cf06b9791f46337405bda74643a47d52513 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -117,8 +117,9 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/code.js</code>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -132,8 +133,9 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/code.js</code>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/code.js
similarity index 100%
rename from entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js
rename to entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/code.js
diff --git a/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/code.js
similarity index 100%
rename from entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js
rename to entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/code.js
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index b520a06d5a2fe3115b13e638385f45b487fb1413..d2e1ef75a8f1596e6efed00651911617de158eed 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -123,7 +123,7 @@
       <name>LINKOBJECT</name>
       <title>Linkobject</title>
       <consumer>Objects</consumer>
-      <linkedContext>Object_context</linkedContext>
+      <linkedContext>Object</linkedContext>
     </entityField>
     <entityField>
       <name>ICON</name>
@@ -191,7 +191,7 @@
       <name>LINKTYPE</name>
       <title>Linktype</title>
       <consumer>Contexts</consumer>
-      <linkedContext>Context_context</linkedContext>
+      <linkedContext>Context</linkedContext>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 78bf584f6a1129b21d805f2e4141b7166ea4a1f4..b9466bf642f7d8d4a1911304941a1b6d5cddc7b1 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -30,7 +30,7 @@
       <name>ATTRIBUTE_PARENT_ID</name>
       <title>Parent Attribute</title>
       <consumer>AttributeChildren</consumer>
-      <linkedContext>Attribute_context</linkedContext>
+      <linkedContext>Attribute</linkedContext>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
diff --git a/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
index fda65f2e1d81122225a9237f0738c2d3824fe58b..25d46bcaae41773ca9f297c7dbad700b2298a7cc 100644
--- a/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
 result.string(AttributeUtil.getAttributeNameById(vars.get("$field.AB_ATTRIBUTEID")));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js
index 490576bdd212bd187654aa7d9ee4f04011a5be33..9f1862b57265475b757e10d636d9f5ae5a31e2f2 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
-    result.string(AttributeUtil.getAttributeNameById(vars.get("$param.attrParentId_param")));
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
+    result.string(AttributeUtil.getAttributeNameById(vars.get("$param.attrParentId_param")));
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
index 4577feb68f61c4c5f6eb955e1a2b8f3be4161fc2..6698c1cd9bf3b2ee1ef19ced286b6f620fe93df2 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
+import("system.neon");
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
     result.string(vars.get("$param.attrParentId_param"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
index 8ab4e3f8c3ff494e56f4617c5a004388b5cdc589..b0b8a8a60f836bf10861191025d415dcd27122b8 100644
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
 result.string(vars.getString("$field.AB_ATTRIBUTEID"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index e9da10cf919b6044f3fd76a89e4be23741837ad1..9692e9118a2e8f7f41a6e8d4f901223814f7367f 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.result");
-import("Sql_lib");
-
-if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
-    result.string("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID = '" + vars.getString("$param.attrParentId_param") + "'");
-else
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
+    result.string("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID = '" + vars.getString("$param.attrParentId_param") + "'");
+else
     result.string("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID is null");
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 3e09f37f88e80934bfd8e783a94186b303391355..fa3202bbfff5e8986006f011b599182aab025a70 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -32,10 +32,10 @@
       <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
-      <name>RelId_param</name>
+      <name>ContactId_param</name>
       <expose v="true" />
       <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
-Usually this is used for filtering COMMUNICATION-entires by a specified contact or creating a new entry that is related to a contact.</description>
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
     </entityParameter>
     <entityField>
       <name>IS_STANDARD</name>
@@ -76,6 +76,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
           <expose v="true" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
         </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityProvider>
@@ -109,6 +114,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
           <expose v="true" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
         </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityProvider>
@@ -142,6 +152,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
           <expose v="true" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
         </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
diff --git a/entity/Communication_entity/entityfields/contact_id/valueProcess.js b/entity/Communication_entity/entityfields/contact_id/valueProcess.js
index f0a8586f297c5b8a3c9f403aa3a409d55e98763c..3d6d552a08f66b6233ee54594d9bef8ea36f872b 100644
--- a/entity/Communication_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Communication_entity/entityfields/contact_id/valueProcess.js
@@ -4,6 +4,6 @@ import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
-        result.string(vars.getString("$param.RelId_param"));    
+    if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null)
+        result.string(vars.getString("$param.ContactId_param"));    
 }
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js b/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
index 2d4e7c03d31b755426038ee42e8905e6a42f8457..549bf5d33254e504c379831578ba2ecacd09bbeb 100644
--- a/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
+++ b/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
@@ -2,12 +2,11 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-var relId, country, cond;
-cond = new SqlCondition();
+var cond = new SqlCondition();
 
-cond.andPrepareVars("CONTACT.CONTACTID", "$param.RelId_param");
+cond.andPrepareVars("CONTACT.CONTACTID", "$param.ContactId_param");
 //TODO: this should happen by 1:1 links instead of manually requesting the data by a select
-country = db.cell(cond.buildSql("select ADDRESS.COUNTRY from ADDRESS "
+var country = db.cell(cond.buildSql("select ADDRESS.COUNTRY from ADDRESS "
             + "join CONTACT on CONTACT.ADDRESS_ID = ADDRESS.ADDRESSID ", "1 = 1"));
 if (country != "") 
     result.string(country);
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/conditionProcess.js b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
index da78467b589dabc627885572fe7a5b3f9411a72e..efe13c793c4fa61b03bbdf03b2347999eccbcd94 100644
--- a/entity/Communication_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
@@ -5,7 +5,7 @@ import("Sql_lib");
 import("Keyword_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("COMMUNICATION.CONTACT_ID", "$param.RelId_param");
+cond.andPrepareVars("COMMUNICATION.CONTACT_ID", "$param.ContactId_param");
 
 if (vars.exists("$param.CommMediumIds_param"))
 {
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index c56de3ea1037c9b87888819798877d8c543db49e..13bfe56e0fa4dca6bffa62c1770c6d5efd751c06 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -98,7 +98,7 @@
       </dependencies>
     </entityProvider>
     <entityParameter>
-      <name>RelId_param</name>
+      <name>ContactId_param</name>
       <expose v="true" />
       <mandatory v="false" />
       <description>PARAMETER</description>
@@ -135,7 +135,7 @@
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>Relations</name>
+      <name>AnyContacts</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
diff --git a/entity/Contract_entity/conditionProcess.js b/entity/Contract_entity/conditionProcess.js
index 5d9f165b795a786af664f50c237b7350dfc24ef4..a1bd70f1174309288cfb62611a5c91d0695572d8 100644
--- a/entity/Contract_entity/conditionProcess.js
+++ b/entity/Contract_entity/conditionProcess.js
@@ -1,7 +1,7 @@
 import("system.result");
 import("system.vars");
 
-if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
-    result.string("CONTRACT.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");  
+if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null && vars.get("$param.ContactId_param") != "")
+    result.string("CONTRACT.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");  
 else
     result.string("1 = 1");  
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/conditionProcess.js b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
index e7df60028a23a6cdac4dc3ee7b8fa831cc7a1c7f..efee86e66ac2e77e2cdd918f417113223a973b47 100644
--- a/entity/Contract_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-var cond = SqlCondition.begin().andPrepareVars("CONTRACT.CONTACT_ID", "$param.RelId_param");
+var cond = SqlCondition.begin().andPrepareVars("CONTRACT.CONTACT_ID", "$param.ContactId_param");
 
 //TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1"))); 
\ No newline at end of file
+result.string(db.translateCondition(cond.build("1 = 1"))); 
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 5cf415ce65458415ad238fa58de961ae01dd0686..39910aadbdd36eeb00eb6cdbb5295e455f090feb 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -13,7 +13,7 @@
       <name>OBJECT1_TYPE</name>
       <title>Type 1</title>
       <consumer>Contexts</consumer>
-      <linkedContext>Context_context</linkedContext>
+      <linkedContext>Context</linkedContext>
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js</valueProcess>
@@ -46,7 +46,7 @@
       <name>OBJECT2_TYPE</name>
       <title>Type 2</title>
       <consumer>Contexts</consumer>
-      <linkedContext>Context_context</linkedContext>
+      <linkedContext>Context</linkedContext>
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js</valueProcess>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 046af73d8b1c7196cbd79aa7747490446b214fa4..18cdb9db5d2a5fd7f00750402b8ed7064f2bf44e 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -60,7 +60,7 @@
       <name>SALESPROJECT_ID</name>
       <title>Salesproject</title>
       <consumer>Salesprojects</consumer>
-      <linkedContext>Salesproject_context</linkedContext>
+      <linkedContext>Salesproject</linkedContext>
       <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js</mandatoryProcess>
       <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
@@ -233,7 +233,7 @@
       <searchable v="false" />
     </entityField>
     <entityConsumer>
-      <name>Relations</name>
+      <name>AnyContacts</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
diff --git a/entity/Offer_entity/entityfields/contact_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 8a77aa5cf6ae3f4bfc274705e26f033b8e9a9401..5ce78e6a9056118e8368c2c2d9acf2a620cfd52a 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -3,10 +3,10 @@ import("system.db");
 import("Util_lib");
 import("Entity_lib");
 
-var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
-if(relid != "")
+var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
+if(contactid != "")
 {
-    var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + relid + "'");
+    var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
     
     if(relData[0] != "")    vars.set("$field.LANGUAGE", relData[0]);
 }
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
index 6030254e6c22ff445a1f85f265c51326a27f69d6..1991c7036f76bc53bdb6c9ce2b6abe508001a7a1 100644
--- a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
@@ -23,4 +23,4 @@ var InputMapping = {
 
 var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
 
-CopyModuleUtils.openNewModules("Offer_context", ModulesMapping);
\ No newline at end of file
+CopyModuleUtils.openNewModules("Offer", ModulesMapping);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index 47330f1e11578a5d23a2a07819c9875dc90ce420..0a83f6827223845ef954c036bf5d99866118fe5e 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -23,4 +23,4 @@ var InputMapping = {
 
 var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
 
-CopyModuleUtils.openNewModules("Offer_context", ModulesMapping);
\ No newline at end of file
+CopyModuleUtils.openNewModules("Offer", ModulesMapping);
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 916eea0cb49d768d7545700d27ce26f29307fff7..cbd5d89cf8cfb1389252258e79d748467cfdf2dc 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -63,7 +63,7 @@
       <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
       <title>Article</title>
       <consumer>Products</consumer>
-      <linkedContext>Product_context</linkedContext>
+      <linkedContext>Product</linkedContext>
       <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
diff --git a/entity/Offeritem_entity/entityfields/product_id/documentation.adoc b/entity/Offeritem_entity/entityfields/product_id/documentation.adoc
index 5d6ffbd8dd98f0a218cec7b0d8a0228b1e65b94e..baa1f4c089a19c51bba2057bc9ee902929e62ec1 100644
--- a/entity/Offeritem_entity/entityfields/product_id/documentation.adoc
+++ b/entity/Offeritem_entity/entityfields/product_id/documentation.adoc
@@ -11,4 +11,4 @@ The following field are set with the values from the selected product:
 * UNIT
 * ITEMNAME
 * PRICE & VAT: Values from the current valid price list defined to this product. 
-  For futher informations see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
+  For further information see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 1de14f269dea71585c557cbd6cb9aa3850206cd9..8397a374758cf6eeef923ff6a17b1ec61a2b984e 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -8,9 +8,9 @@ var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"
 if(pid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
-    var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
+    var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
     
     var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
     
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index 328caec2766fd4b5eb84bb957f75d83194fae420..f6cb10a4585c3152a0d78ab4bed989186d609b63 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -9,9 +9,9 @@ var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUA
 if(pid != "" && newQuantity != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
-    var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: relid };
+    var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid };
     
     var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
     
diff --git a/entity/Offeritem_entity/onDBInsert.js b/entity/Offeritem_entity/onDBInsert.js
index 1d582401b5c75c0cf7edaa46f541e1dbcb17ead0..38707c33d413479d3756ad468a8406eca17e27af 100644
--- a/entity/Offeritem_entity/onDBInsert.js
+++ b/entity/Offeritem_entity/onDBInsert.js
@@ -10,10 +10,10 @@ var oid = vars.get("$field.OFFER_ID");
 if(oid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
     var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
-    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, relid);
+    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid);
     oiUtils.reOrgItems();
     
     //update offer price
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
index dbcb731bf907cf77be745faa29260e348e004369..ebfbe9a64451c5247673d279535b88f2e4a83872 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
@@ -11,10 +11,10 @@ var oid = vars.get("$field.OFFER_ID");
 if(oid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
     var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
-    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, relid);
+    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid);
     oiUtils.reOrgItems();
     
     //update offer price
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 59ca2428627828bd11255bde193524c56162421c..3940f0c89477b9234dc1176030eb430a8c7a37c0 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -57,7 +57,7 @@
       <name>SALESPROJECT_ID</name>
       <title>Salesproject</title>
       <consumer>Salesprojects</consumer>
-      <linkedContext>Salesproject_context</linkedContext>
+      <linkedContext>Salesproject</linkedContext>
       <mandatory v="true" />
       <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
@@ -216,11 +216,11 @@
       <name>CONTACT_PERSON_ID</name>
     </entityField>
     <entityConsumer>
-      <name>Relations</name>
+      <name>AnyContacts</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
-        <entityName>Relation_entity</entityName>
+        <entityName>AnyContact_entity</entityName>
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
diff --git a/entity/Order_entity/entityfields/contact_id/onValueChange.js b/entity/Order_entity/entityfields/contact_id/onValueChange.js
index 8a77aa5cf6ae3f4bfc274705e26f033b8e9a9401..5ce78e6a9056118e8368c2c2d9acf2a620cfd52a 100644
--- a/entity/Order_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Order_entity/entityfields/contact_id/onValueChange.js
@@ -3,10 +3,10 @@ import("system.db");
 import("Util_lib");
 import("Entity_lib");
 
-var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
-if(relid != "")
+var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
+if(contactid != "")
 {
-    var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + relid + "'");
+    var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
     
     if(relData[0] != "")    vars.set("$field.LANGUAGE", relData[0]);
 }
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/neworder/onActionProcess.js b/entity/Order_entity/entityfields/neworder/onActionProcess.js
index d224ae977c9e89adb57145866fb64ba050da7ad1..040f89358e13a4c422ecc072f2ddde0b1d0e291b 100644
--- a/entity/Order_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Order_entity/entityfields/neworder/onActionProcess.js
@@ -23,4 +23,4 @@ var InputMapping = {
 
 var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
 
-CopyModuleUtils.openNewModules("Order_context", ModulesMapping);
\ No newline at end of file
+CopyModuleUtils.openNewModules("Order", ModulesMapping);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/neworderversion/onActionProcess.js b/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
index b5163b61f07d8b65b6fb621a3e20bc3c987b2228..fdeec67b436c90312e53cecca701505c35368158 100644
--- a/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
+++ b/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
@@ -23,4 +23,4 @@ var InputMapping = {
 
 var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
 
-CopyModuleUtils.openNewModules("Order_context", ModulesMapping);
\ No newline at end of file
+CopyModuleUtils.openNewModules("Order", ModulesMapping);
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 14b2e4111b7f0fd824d2ee2cdcdb08cd553f298f..72088388935c823eb774b3b6b013745cf6ba0c09 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -63,7 +63,7 @@
       <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
       <title>Article</title>
       <consumer>Products</consumer>
-      <linkedContext>Product_context</linkedContext>
+      <linkedContext>Product</linkedContext>
       <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
diff --git a/entity/Orderitem_entity/entityfields/product_id/documentation.adoc b/entity/Orderitem_entity/entityfields/product_id/documentation.adoc
index 5d6ffbd8dd98f0a218cec7b0d8a0228b1e65b94e..baa1f4c089a19c51bba2057bc9ee902929e62ec1 100644
--- a/entity/Orderitem_entity/entityfields/product_id/documentation.adoc
+++ b/entity/Orderitem_entity/entityfields/product_id/documentation.adoc
@@ -11,4 +11,4 @@ The following field are set with the values from the selected product:
 * UNIT
 * ITEMNAME
 * PRICE & VAT: Values from the current valid price list defined to this product. 
-  For futher informations see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
+  For further information see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
index be1cf0e4b0a34b7dbed2d22473ce2f040f8752fd..b7739bae3a139c87c5804d78580226529f26c66a 100644
--- a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
@@ -8,9 +8,9 @@ var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"
 if(pid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
-    var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
+    var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
     
     var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
     
diff --git a/entity/Orderitem_entity/entityfields/quantity/onValueChange.js b/entity/Orderitem_entity/entityfields/quantity/onValueChange.js
index 328caec2766fd4b5eb84bb957f75d83194fae420..f6cb10a4585c3152a0d78ab4bed989186d609b63 100644
--- a/entity/Orderitem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Orderitem_entity/entityfields/quantity/onValueChange.js
@@ -9,9 +9,9 @@ var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUA
 if(pid != "" && newQuantity != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
-    var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: relid };
+    var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid };
     
     var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
     
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
index f1f78fd5af769ad274269a6047e8567982311b25..8c2e990bec42ec877008bd9215d01ced748c4631 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
@@ -11,10 +11,10 @@ var oid = vars.get("$field.SALESORDER_ID");
 if(oid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
-    var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
     var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
-    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.SALESORDERITEMID"), curr, relid);
+    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.SALESORDERITEMID"), curr, contactid);
     oiUtils.reOrgItems();
     
     //update order price
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 135db7bd852c1169921b8f123cb02fc1ce1ad6ca..d8f7510b93814da8e63d4df649dfa9d3f24821b1 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -148,13 +148,14 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js</code>
+          <name>DefaultAddressId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code>
           <triggerRecalculation v="true" />
         </entityParameter>
         <entityParameter>
-          <name>DefaultAddressId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
         </entityParameter>
       </children>
@@ -178,11 +179,10 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
-          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
-Usually this is used for filtering COMMUNICATION-entires by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -197,9 +197,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/contracts/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
+          <mandatory v="true" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -214,8 +216,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       </dependency>
       <children>
         <entityParameter>
-          <name>RelID_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/productprices/children/contactid_param/code.js</code>
+          <expose v="false" />
+          <triggerRecalculation v="false" />
+          <mandatory v="true" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -340,8 +345,9 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/code.js</code>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -355,8 +361,9 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/code.js</code>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js b/entity/Organisation_entity/entityfields/addresses/children/contactid_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/addresses/children/contactid_param/code.js
diff --git a/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js b/entity/Organisation_entity/entityfields/communications/children/contactid_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/communications/children/contactid_param/code.js
diff --git a/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js b/entity/Organisation_entity/entityfields/contracts/children/contactid_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/contracts/children/contactid_param/code.js
diff --git a/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/code.js
diff --git a/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js
index f66f0210fb9c2ed26abab3692f0d0b70c7df5ce9..80a6c50d2c30f111d84e4e6d94057c1e03ba6087 100644
--- a/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -1,3 +1,3 @@
 import("system.vars");
 import("system.neon");
-neon.openContext("Organisation_context", "OrganisationEditDefaults_view", [vars.get("$field.ORGANISATIONID")], neon.OPERATINGSTATE_EDIT, null); 
+neon.openContext("Organisation", "OrganisationEditDefaults_view", [vars.get("$field.ORGANISATIONID")], neon.OPERATINGSTATE_EDIT, null); 
diff --git a/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/code.js
diff --git a/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js b/entity/Organisation_entity/entityfields/productprices/children/contactid_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/productprices/children/contactid_param/code.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 3e4d6b6bd8d321e965263786a78e6a0b0e596668..bb586067b69150196fc0b2dbc6d8c2923c389663 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -144,13 +144,14 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js</code>
+          <name>DefaultAddressId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
           <triggerRecalculation v="true" />
         </entityParameter>
         <entityParameter>
-          <name>DefaultAddressId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
         </entityParameter>
       </children>
@@ -166,9 +167,12 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/communications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -193,9 +197,11 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/contracts/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/contracts/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
+          <mandatory v="true" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -212,8 +218,11 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelID_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/pricelists/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/pricelists/children/contactid_param/code.js</code>
+          <expose v="false" />
+          <triggerRecalculation v="false" />
+          <mandatory v="true" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -347,8 +356,9 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/contactid_param/code.js</code>
+          <expose v="false" />
           <triggerRecalculation v="true" />
         </entityParameter>
       </children>
@@ -398,8 +408,11 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/code.js</code>
+          <expose v="false" />
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -414,8 +427,11 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>RelId_param</name>
-          <code>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/code.js</code>
+          <expose v="false" />
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Person_entity/entityfields/communications/children/relid_param/code.js b/entity/Person_entity/entityfields/communications/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/communications/children/relid_param/code.js
rename to entity/Person_entity/entityfields/communications/children/contactid_param/code.js
diff --git a/entity/Person_entity/entityfields/contracts/children/relid_param/code.js b/entity/Person_entity/entityfields/contracts/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/contracts/children/relid_param/code.js
rename to entity/Person_entity/entityfields/contracts/children/contactid_param/code.js
diff --git a/entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js
rename to entity/Person_entity/entityfields/emailcommunications/children/contactid_param/code.js
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
index e0887ba77e67e26490ed3b4250526e895fd7f8e4..e7afa1485396900885b2a74453df003aa2869337 100644
--- a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -1,3 +1,3 @@
 import("system.vars");
 import("system.neon");
-neon.openContext("Person_context", "ContactEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
+neon.openContext("Person", "ContactEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
index 4b931551d10819fe41de65ca34fb93a61fb76e72..b0fcb98f2ebff8d3bc44ad52b7b2b7b515875f46 100644
--- a/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
+++ b/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
@@ -1,3 +1,3 @@
 import("system.vars");
 import("system.neon");
-neon.openContext("Person_context", "ContactEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null); 
+neon.openContext("Person", "ContactEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null); 
diff --git a/entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js b/entity/Person_entity/entityfields/orgaddresses/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js
rename to entity/Person_entity/entityfields/orgaddresses/children/contactid_param/code.js
diff --git a/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js b/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js
index ee3c282341e8d58da0b82d22c1671eeb557c7101..4306a7552935bc715f8b6a8906b3353bc7dd7a73 100644
--- a/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js
+++ b/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 
 if(vars.getString("$field.ORGANISATION_ID") != 0)
-    result.string("Organisation_context");
\ No newline at end of file
+    result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js b/entity/Person_entity/entityfields/persaddresses/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js
rename to entity/Person_entity/entityfields/persaddresses/children/contactid_param/code.js
diff --git a/entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js
rename to entity/Person_entity/entityfields/phonecommunications/children/contactid_param/code.js
diff --git a/entity/Person_entity/entityfields/pricelists/children/relid_param/code.js b/entity/Person_entity/entityfields/pricelists/children/contactid_param/code.js
similarity index 100%
rename from entity/Person_entity/entityfields/pricelists/children/relid_param/code.js
rename to entity/Person_entity/entityfields/pricelists/children/contactid_param/code.js
diff --git a/entity/Prod2prod_entity/externalOpenAction.js b/entity/Prod2prod_entity/externalOpenAction.js
index fc5697186ead211596c34a330410f1f17a4e23c4..ebe4247e954a0ae05655cb6cd40c9b8a30e2e791 100644
--- a/entity/Prod2prod_entity/externalOpenAction.js
+++ b/entity/Prod2prod_entity/externalOpenAction.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.neon");
 
-neon.openContext("Product_context", null, [vars.get("$field.SOURCE_ID")], neon.OPERATINGSTATE_VIEW, null);
\ No newline at end of file
+neon.openContext("Product", null, [vars.get("$field.SOURCE_ID")], neon.OPERATINGSTATE_VIEW, null);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
index c52e323fc90013dd1039ae3cf0cf32cc14f6c021..afd503496c5d5696769f88de130fb11781fe8889 100644
--- a/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
@@ -3,4 +3,4 @@ import("system.result");
 import("Contact_lib");
 
 if(vars.get("$field.CONTACT_ID"))
-    result.string("Organisation_context");
\ No newline at end of file
+    result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index d2358a563ff0be3769d0ad2bcdcc66516e84d697..f7906ab4f27d1f27801c3bc0e55b8544ccbc4721 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -43,7 +43,7 @@
       <name>PRODUCT_ID</name>
       <title>Product</title>
       <consumer>Products</consumer>
-      <linkedContext>Product_context</linkedContext>
+      <linkedContext>Product</linkedContext>
       <mandatory v="true" />
       <state>AUTO</state>
       <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
@@ -96,7 +96,7 @@
       <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
-      <name>RelID_param</name>
+      <name>ContactId_param</name>
       <expose v="true" />
       <triggerRecalculation v="true" />
       <mandatory v="false" />
diff --git a/entity/Productprice_entity/conditionProcess.js b/entity/Productprice_entity/conditionProcess.js
index fd616504b32f8857d73fe3a3d697b9234f67aaa9..7ba1349840d22af2496b9ec2cd638e5afa5ff1fa 100644
--- a/entity/Productprice_entity/conditionProcess.js
+++ b/entity/Productprice_entity/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 
 if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
     result.string("PRODUCTPRICE.PRODUCT_ID = ('" + vars.get("$param.ProductId_param") + "')");  
-else if(vars.exists("$param.RelID_param") && vars.get("$param.RelID_param") != "")
-    result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.RelID_param") + "')");  
+else if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != "")
+    result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.ContactId_param") + "')");  
 else
     result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/contact_id/valueProcess.js b/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
index 002e9f1a787d5a43956ddcfc7c76db8c835149b7..e9e20dba72e7a1820ad9d7b7b8570e58631f30dd 100644
--- a/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
@@ -4,7 +4,7 @@ import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    if(vars.exists("$param.RelID_param") && vars.get("$param.RelID_param") != "")
-        result.string(vars.get("$param.RelID_param"));    
+    if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != "")
+        result.string(vars.get("$param.ContactId_param"));    
 }
 
diff --git a/entity/Productprice_entity/entityfields/pricelist/documentation.adoc b/entity/Productprice_entity/entityfields/pricelist/documentation.adoc
index 777173dda73190f975c75f5475f8f7a31b4d7bfb..1ebd4759eaf66d4e1c31789c3b5ede36b2bb326e 100644
--- a/entity/Productprice_entity/entityfields/pricelist/documentation.adoc
+++ b/entity/Productprice_entity/entityfields/pricelist/documentation.adoc
@@ -13,6 +13,6 @@ The following criteria will be checked in function _ProductUtils.checkForIndenti
 * Identical from quantity
 * Identical currency
 * Identical purchase price/sales price
-* Idcentical Valid from and valid to OR 
+* Identical Valid from and valid to OR 
 
 If all criteria are fulfilled, price list can not be saved.
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
index fd616504b32f8857d73fe3a3d697b9234f67aaa9..7ba1349840d22af2496b9ec2cd638e5afa5ff1fa 100644
--- a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 
 if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
     result.string("PRODUCTPRICE.PRODUCT_ID = ('" + vars.get("$param.ProductId_param") + "')");  
-else if(vars.exists("$param.RelID_param") && vars.get("$param.RelID_param") != "")
-    result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.RelID_param") + "')");  
+else if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != "")
+    result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.ContactId_param") + "')");  
 else
     result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index c16a7679c19e2fba50366f05911cf52e3d8109dd..9b95b144361ae8ec9743539ec8e0ae5cf4f7cd8d 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -62,7 +62,7 @@
       <name>CONTACT_ID</name>
       <title>Organisation</title>
       <consumer>Organisations</consumer>
-      <linkedContext>Organisation_context</linkedContext>
+      <linkedContext>Organisation</linkedContext>
     </entityField>
     <entityField>
       <name>ORG_NAME</name>
@@ -129,6 +129,7 @@
         <entityParameter>
           <name>containerName_param</name>
           <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js</code>
+          <documentation>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc</documentation>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc b/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 15345f79e2bf15eadcef6b5b17bc78342f039bf8..0a77b8014d8b6cc924decdf569eb4f51f15f3d7c 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -74,6 +74,7 @@
         <entityParameter>
           <name>containerName_param</name>
           <code>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code>
+          <documentation>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc</documentation>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index d82728e21c7188569a12c24423b3fde844546ff5..23aa60f339091d58fada5369299dea47c6b19252 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -12,7 +12,7 @@
       <name>CONTACT_ID</name>
       <title>Person</title>
       <consumer>Contacts</consumer>
-      <linkedContext>Person_context</linkedContext>
+      <linkedContext>Person</linkedContext>
     </entityField>
     <entityField>
       <name>SALESPROJECT_ID</name>
@@ -100,7 +100,7 @@
       <name>PERSON_FULL_NAME</name>
       <title>Name</title>
       <consumer>CurrentContact</consumer>
-      <linkedContext>Person_context</linkedContext>
+      <linkedContext>Person</linkedContext>
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
index b8a7cf8b360661e7993c91dcaa3a9fabcbab989b..0bacbe88323102253f7dbedd5a7beb64b37cd59f 100644
--- a/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
@@ -1,2 +1,2 @@
-import("system.result");
-result.string("Person_context"); //to show the preview of the person
\ No newline at end of file
+import("system.result");
+result.string("Person"); //to show the preview of the person
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 3d5f6662a121b81d6deef04ee02063e863ed8567..187aeefd5659a4287be44398fc10894bdb9d090f 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -68,7 +68,7 @@
       <name>CONTACT_ID</name>
       <title>Company</title>
       <consumer>Organisations</consumer>
-      <linkedContext>Organisation_context</linkedContext>
+      <linkedContext>Organisation</linkedContext>
       <mandatory v="true" />
     </entityField>
     <entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 94d2fb3ea2fae7233d978d903e574f393b6a8cbd..4e792a2decaf645afe88c4b7bd2b120eea618036 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -47,14 +47,14 @@
       <name>REQUESTOR_CONTACT_ID</name>
       <title>{$TASK_REQUESTOR}</title>
       <consumer>ContactRequestors</consumer>
-      <linkedContext>Person_context</linkedContext>
+      <linkedContext>Person</linkedContext>
       <mandatory v="true" />
     </entityField>
     <entityField>
       <name>EDITOR_CONTACT_ID</name>
       <title>{$TASK_EDITOR}</title>
       <consumer>ContactEditors</consumer>
-      <linkedContext>Person_context</linkedContext>
+      <linkedContext>Person</linkedContext>
     </entityField>
     <entityField>
       <name>START_DATE</name>
diff --git a/entity/Task_entity/documentation.adoc b/entity/Task_entity/documentation.adoc
index 39ff16934ddd9a2959f4dcfeb34a6210d3472acc..cdbad20ffc5a74d460d1420118fe5e12358e6a14 100644
--- a/entity/Task_entity/documentation.adoc
+++ b/entity/Task_entity/documentation.adoc
@@ -1 +1 @@
-CAUTION: Do not confuse these tasks with calendar-tasks(=todos). The `Task_context` tasks are not syncable to a groupware system.
\ No newline at end of file
+CAUTION: Do not confuse these tasks with calendar-tasks(=todos). The context datamodel `Task` is not syncable to a groupware system.
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 77c0388b7aa46df43baf9c027fac78ee091f4b7f..0af11d1dce193585f663922dc96f57545e2c2bc4 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -34,7 +34,7 @@
       <name>CONTACT_ID</name>
       <title>Creator</title>
       <consumer>Contacts</consumer>
-      <linkedContext>Person_context</linkedContext>
+      <linkedContext>Person</linkedContext>
       <mandatory v="true" />
     </entityField>
     <entityField>
diff --git a/neonContext/Activity_context/Activity_context.aod b/neonContext/Activity/Activity.aod
similarity index 97%
rename from neonContext/Activity_context/Activity_context.aod
rename to neonContext/Activity/Activity.aod
index 42eca6015559d53b2ff08d57c12c5da68e0ff382..f73d6cd69bc11098099af9f139dbb462d7f11ed2 100644
--- a/neonContext/Activity_context/Activity_context.aod
+++ b/neonContext/Activity/Activity.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Activity_context</name>
+  <name>Activity</name>
   <title>Activity</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>ActivityMain_view</mainview>
diff --git a/neonContext/ActivityLink_context/ActivityLink_context.aod b/neonContext/ActivityLink/ActivityLink.aod
similarity index 95%
rename from neonContext/ActivityLink_context/ActivityLink_context.aod
rename to neonContext/ActivityLink/ActivityLink.aod
index 41595e4da1ada375494156a91b04d156736c820f..e27379336dd2e6da91c0f4cdbb96d4b619d33d08 100644
--- a/neonContext/ActivityLink_context/ActivityLink_context.aod
+++ b/neonContext/ActivityLink/ActivityLink.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>ActivityLink_context</name>
+  <name>ActivityLink</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>ActivityLinkFilter_view</filterview>
   <preview>ActivityLinkPreview_view</preview>
diff --git a/neonContext/Address_context/Address_context.aod b/neonContext/Address/Address.aod
similarity index 97%
rename from neonContext/Address_context/Address_context.aod
rename to neonContext/Address/Address.aod
index 1d00bdd197dc1599995d0ebe55fd4d78acfa31fc..1efcfbdab0ebca94348a476d7e76aab67f9a5f98 100644
--- a/neonContext/Address_context/Address_context.aod
+++ b/neonContext/Address/Address.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Address_context</name>
+  <name>Address</name>
   <title>Addresses</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>AddressFilter_view</filterview>
diff --git a/neonContext/AnyContact_context/AnyContact_context.aod b/neonContext/AnyContact/AnyContact.aod
similarity index 94%
rename from neonContext/AnyContact_context/AnyContact_context.aod
rename to neonContext/AnyContact/AnyContact.aod
index 333ed113206a61ccdb0f1204d2298e3e5b3c72bd..0453b6ff91872eca49770137e8ece8aa30152fbc 100644
--- a/neonContext/AnyContact_context/AnyContact_context.aod
+++ b/neonContext/AnyContact/AnyContact.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>AnyContact_context</name>
+  <name>AnyContact</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <lookupview>AnyContactLookup_view</lookupview>
   <entity>AnyContact_entity</entity>
diff --git a/neonContext/Attribute_context/Attribute_context.aod b/neonContext/Attribute/Attribute.aod
similarity index 95%
rename from neonContext/Attribute_context/Attribute_context.aod
rename to neonContext/Attribute/Attribute.aod
index e252ccf047d1ca7e695c1642d35dc31beb22229a..3504918a02b55108b0a0b0d7985b65676c4551c4 100644
--- a/neonContext/Attribute_context/Attribute_context.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Attribute_context</name>
-  <title>Attributes</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:TAGS</icon>
-  <mainview>AttributeMain_view</mainview>
-  <filterview>AttributeFilter_view</filterview>
-  <editview>AttributeEdit_view</editview>
-  <preview>AttributePreview_view</preview>
-  <lookupview>AttributeFilter_view</lookupview>
-  <entity>Attribute_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>058f2577-b598-4d92-90ad-628342302a9c</name>
-      <view>AttributeFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>96bf484d-dc8d-42ad-9242-dfefacc87956</name>
-      <view>AttributePreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>59089acc-a6db-48c2-8061-2d3ca8246e37</name>
-      <view>AttributeEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>05d998e7-7364-4425-aefe-3cf284933d52</name>
-      <view>AttributeMain_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>6ab8d733-544c-4e48-ade9-b5210a5e5355</name>
-      <view>AttributeTree_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>Attribute</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TAGS</icon>
+  <mainview>AttributeMain_view</mainview>
+  <filterview>AttributeFilter_view</filterview>
+  <editview>AttributeEdit_view</editview>
+  <preview>AttributePreview_view</preview>
+  <lookupview>AttributeFilter_view</lookupview>
+  <entity>Attribute_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>058f2577-b598-4d92-90ad-628342302a9c</name>
+      <view>AttributeFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>96bf484d-dc8d-42ad-9242-dfefacc87956</name>
+      <view>AttributePreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>59089acc-a6db-48c2-8061-2d3ca8246e37</name>
+      <view>AttributeEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>05d998e7-7364-4425-aefe-3cf284933d52</name>
+      <view>AttributeMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6ab8d733-544c-4e48-ade9-b5210a5e5355</name>
+      <view>AttributeTree_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/AttributeRelation_context/AttributeRelation_context.aod b/neonContext/AttributeRelation/AttributeRelation.aod
similarity index 91%
rename from neonContext/AttributeRelation_context/AttributeRelation_context.aod
rename to neonContext/AttributeRelation/AttributeRelation.aod
index d0ac7885be56960f91295248492192837017539e..7e9ce7018b9378bf85def94c6f6ec4f0bdc8148e 100644
--- a/neonContext/AttributeRelation_context/AttributeRelation_context.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>AttributeRelation_context</name>
-  <title>Attributes</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>AttributeRelationFilter_view</filterview>
-  <entity>AttributeRelation_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
-      <view>AttributeRelationFilter_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>AttributeRelation</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterview>AttributeRelationFilter_view</filterview>
+  <entity>AttributeRelation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
+      <view>AttributeRelationFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/AttributeUsage_context/AttributeUsage_context.aod b/neonContext/AttributeUsage/AttributeUsage.aod
similarity index 92%
rename from neonContext/AttributeUsage_context/AttributeUsage_context.aod
rename to neonContext/AttributeUsage/AttributeUsage.aod
index 520b5db6374fe8a00aea3a0141b481f10407b9c9..937fd6c3bcc15ff774b3e53389345906e9d1642d 100644
--- a/neonContext/AttributeUsage_context/AttributeUsage_context.aod
+++ b/neonContext/AttributeUsage/AttributeUsage.aod
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>AttributeUsage_context</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entity>AttributeUsage_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>6f384e66-886a-4a88-90b2-3fa74447b485</name>
-      <view>AttributeUsageFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>db6545ff-cbf4-4c47-aa52-30ae7e203448</name>
-      <view>AttributeUsageMultiEdit_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>AttributeUsage</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>AttributeUsage_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>6f384e66-886a-4a88-90b2-3fa74447b485</name>
+      <view>AttributeUsageFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>db6545ff-cbf4-4c47-aa52-30ae7e203448</name>
+      <view>AttributeUsageMultiEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Communication_context/Communication_context.aod b/neonContext/Communication/Communication.aod
similarity index 96%
rename from neonContext/Communication_context/Communication_context.aod
rename to neonContext/Communication/Communication.aod
index f9d7881449bbae7783f345cf2b5abf61fe2982ac..0556a75c348087405fb2759a14268826f58f2c7a 100644
--- a/neonContext/Communication_context/Communication_context.aod
+++ b/neonContext/Communication/Communication.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Communication_context</name>
+  <name>Communication</name>
   <title>Communication</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>Communication_entity</entity>
diff --git a/neonContext/Context_context/Context_context.aod b/neonContext/Context/Context.aod
similarity index 96%
rename from neonContext/Context_context/Context_context.aod
rename to neonContext/Context/Context.aod
index a647a63a82bd9eeaadb7fa2e7621802c820deb63..67f2dc98e0a14b51af7c83dbc929036c1d30f33e 100644
--- a/neonContext/Context_context/Context_context.aod
+++ b/neonContext/Context/Context.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Context_context</name>
+  <name>Context</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <lookupview>ContextLookup_view</lookupview>
   <entity>Context_entity</entity>
diff --git a/neonContext/Contract_context/Contract_context.aod b/neonContext/Contract/Contract.aod
similarity index 97%
rename from neonContext/Contract_context/Contract_context.aod
rename to neonContext/Contract/Contract.aod
index b33d8cc5b4affa87b7ab7dd31896860ae195a4e4..b7175973cfc9e81c169858ec251275248e3b46a7 100644
--- a/neonContext/Contract_context/Contract_context.aod
+++ b/neonContext/Contract/Contract.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Contract_context</name>
+  <name>Contract</name>
   <title>Contract</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>ContractMain_view</mainview>
diff --git a/neonContext/Countries_context/Countries_context.aod b/neonContext/Countries/Countries.aod
similarity index 96%
rename from neonContext/Countries_context/Countries_context.aod
rename to neonContext/Countries/Countries.aod
index 88cb4f92ece5cec30058a19be22bb532d8339bdf..6a77cccc33015e6f1fe31d01a613faad41a0479e 100644
--- a/neonContext/Countries_context/Countries_context.aod
+++ b/neonContext/Countries/Countries.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Countries_context</name>
+  <name>Countries</name>
   <title>Countries</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>CountriesTable_view</filterview>
diff --git a/neonContext/Document_context/Document_context.aod b/neonContext/Document/Document.aod
similarity index 97%
rename from neonContext/Document_context/Document_context.aod
rename to neonContext/Document/Document.aod
index e22fc8179d7e5ddc7c21400d535b22b5f6832762..9a629f44ab50cf49ad937fbdd8ad1e8db9537eed 100644
--- a/neonContext/Document_context/Document_context.aod
+++ b/neonContext/Document/Document.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Document_context</name>
+  <name>Document</name>
   <title>Document</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:FILE_TEXT_O</icon>
diff --git a/neonContext/Gender_context/Gender_context.aod b/neonContext/Gender_context/Gender_context.aod
deleted file mode 100644
index 3835449e6ad72421763e85df41e028e3cbbc8c94..0000000000000000000000000000000000000000
--- a/neonContext/Gender_context/Gender_context.aod
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Gender_context</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entity>Gender_keyword</entity>
-</neonContext>
diff --git a/neonContext/KeywordAttribute_context/KeywordAttribute_context.aod b/neonContext/KeywordAttribute/KeywordAttribute.aod
similarity index 95%
rename from neonContext/KeywordAttribute_context/KeywordAttribute_context.aod
rename to neonContext/KeywordAttribute/KeywordAttribute.aod
index 9b507f230bc3b86f25daa8f9da9f665131a26aad..f0021b7507a1b6808c75caa4b6d49b8715ccae2c 100644
--- a/neonContext/KeywordAttribute_context/KeywordAttribute_context.aod
+++ b/neonContext/KeywordAttribute/KeywordAttribute.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>KeywordAttribute_context</name>
+  <name>KeywordAttribute</name>
   <title>Keyword Attribute</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>KeywordAttributeFilter_view</filterview>
diff --git a/neonContext/KeywordAttributeRelation_context/KeywordAttributeRelation_context.aod b/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
similarity index 92%
rename from neonContext/KeywordAttributeRelation_context/KeywordAttributeRelation_context.aod
rename to neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
index 196b3da70093e4871c522020c21389852cebeb53..e66114b5b1492c9557de06ddca6fc1f88b41f174 100644
--- a/neonContext/KeywordAttributeRelation_context/KeywordAttributeRelation_context.aod
+++ b/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>KeywordAttributeRelation_context</name>
+  <name>KeywordAttributeRelation</name>
   <title>Keyword Attribute Values</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>KeywordAttributeRelation_entity</entity>
diff --git a/neonContext/KeywordEntry_context/KeywordEntry_context.aod b/neonContext/KeywordEntry/KeywordEntry.aod
similarity index 97%
rename from neonContext/KeywordEntry_context/KeywordEntry_context.aod
rename to neonContext/KeywordEntry/KeywordEntry.aod
index f5d5789f35ff1e4541fe7991dd104808d63f11d9..b7cc0c493b47063207ae62f8f9d7625601f49088 100644
--- a/neonContext/KeywordEntry_context/KeywordEntry_context.aod
+++ b/neonContext/KeywordEntry/KeywordEntry.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>KeywordEntry_context</name>
+  <name>KeywordEntry</name>
   <title>Keyword</title>
   <description>&amp;lt;null value&amp;gt;</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonContext/Language_context/Language_context.aod b/neonContext/Language/Language.aod
similarity index 91%
rename from neonContext/Language_context/Language_context.aod
rename to neonContext/Language/Language.aod
index 5b3f970f14fb95cc0e82b53c3c3f72b9afe0cd5f..f65a0badbab6b21a071aad1e02265474eff89e2e 100644
--- a/neonContext/Language_context/Language_context.aod
+++ b/neonContext/Language/Language.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Language_context</name>
+  <name>Language</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>Language_entity</entity>
 </neonContext>
diff --git a/neonContext/Object_context/Object_context.aod b/neonContext/Object/Object.aod
similarity index 95%
rename from neonContext/Object_context/Object_context.aod
rename to neonContext/Object/Object.aod
index c09553d8af6353233bf503cc64a19a918a344222..5b27c59711b3aab9998d88a7cc0c3f49c93d44e6 100644
--- a/neonContext/Object_context/Object_context.aod
+++ b/neonContext/Object/Object.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Object_context</name>
+  <name>Object</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <lookupview>ObjectLookup_view</lookupview>
   <entity>Object_entity</entity>
diff --git a/neonContext/ObjectRelation_context/ObjectRelation_context.aod b/neonContext/ObjectRelation/ObjectRelation.aod
similarity index 96%
rename from neonContext/ObjectRelation_context/ObjectRelation_context.aod
rename to neonContext/ObjectRelation/ObjectRelation.aod
index e8d0ed985d84d0c0a6f9f200fd50d3ca56c22755..386580a64a6b75f1cf013e1a867e830121506fc6 100644
--- a/neonContext/ObjectRelation_context/ObjectRelation_context.aod
+++ b/neonContext/ObjectRelation/ObjectRelation.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>ObjectRelation_context</name>
+  <name>ObjectRelation</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>ObjectRelationFilter_view</filterview>
   <editview>ObjectRelationEdit_view</editview>
diff --git a/neonContext/Offer_context/Offer_context.aod b/neonContext/Offer/Offer.aod
similarity index 97%
rename from neonContext/Offer_context/Offer_context.aod
rename to neonContext/Offer/Offer.aod
index ac38442f98da0f9c6d6b8b25d32ca2db51897505..d06dfe29d4e8997a05458fef5d18442f17484fb1 100644
--- a/neonContext/Offer_context/Offer_context.aod
+++ b/neonContext/Offer/Offer.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Offer_context</name>
+  <name>Offer</name>
   <title>Offer</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>OfferMain_view</mainview>
diff --git a/neonContext/Offeritem_context/Offeritem_context.aod b/neonContext/Offeritem/Offeritem.aod
similarity index 96%
rename from neonContext/Offeritem_context/Offeritem_context.aod
rename to neonContext/Offeritem/Offeritem.aod
index e36d0a25aa35d49e16b2d9fe222f5adf9d7689cf..5a275cdae87f9571339f9076b8c8e55bf8d14f16 100644
--- a/neonContext/Offeritem_context/Offeritem_context.aod
+++ b/neonContext/Offeritem/Offeritem.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Offeritem_context</name>
+  <name>Offeritem</name>
   <title>Offeritem</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>OfferitemFilter_view</filterview>
diff --git a/neonContext/Options_Context/Options_Context.aod b/neonContext/Options/Options.aod
similarity index 96%
rename from neonContext/Options_Context/Options_Context.aod
rename to neonContext/Options/Options.aod
index 179d7594b1402f86172bdc9c3cd3862556062c25..7ec19de7e2dcb0859c79557a33e04ea753e0de98 100644
--- a/neonContext/Options_Context/Options_Context.aod
+++ b/neonContext/Options/Options.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Options_Context</name>
+  <name>Options</name>
   <title>Options</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>Options_View</mainview>
diff --git a/neonContext/Order_context/Order_context.aod b/neonContext/Order/Order.aod
similarity index 97%
rename from neonContext/Order_context/Order_context.aod
rename to neonContext/Order/Order.aod
index eda6081d02d0a4cfa143292419160b9be4fd3fb0..2bbe1244cd84df9309366734d577ffb80e6514fa 100644
--- a/neonContext/Order_context/Order_context.aod
+++ b/neonContext/Order/Order.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Order_context</name>
+  <name>Order</name>
   <title>Receipt</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:FILE_TEXT_O</icon>
diff --git a/neonContext/Orderitem_context/Orderitem_context.aod b/neonContext/Orderitem/Orderitem.aod
similarity index 96%
rename from neonContext/Orderitem_context/Orderitem_context.aod
rename to neonContext/Orderitem/Orderitem.aod
index 29f01f5dcae621681c474ef293062e8221473640..7cf9125e5314247299fa80c139142a07c14a3013 100644
--- a/neonContext/Orderitem_context/Orderitem_context.aod
+++ b/neonContext/Orderitem/Orderitem.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Orderitem_context</name>
+  <name>Orderitem</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>Orderitem_entity</entity>
   <references>
diff --git a/neonContext/Organisation_context/Organisation_context.aod b/neonContext/Organisation/Organisation.aod
similarity index 97%
rename from neonContext/Organisation_context/Organisation_context.aod
rename to neonContext/Organisation/Organisation.aod
index 815baacaa3969dbca9cf62635b7d87761e460f0c..968ccbfe817a9cc274763fca03626b25ece07bfa 100644
--- a/neonContext/Organisation_context/Organisation_context.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Organisation_context</name>
+  <name>Organisation</name>
   <title>Company</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:BUILDING</icon>
diff --git a/neonContext/Person_context/Person_context.aod b/neonContext/Person/Person.aod
similarity index 98%
rename from neonContext/Person_context/Person_context.aod
rename to neonContext/Person/Person.aod
index 403cd77106eab81a065a87cf4b617583271777ad..10a0546266e2e87d1953ace9321870ef5e7cc98e 100644
--- a/neonContext/Person_context/Person_context.aod
+++ b/neonContext/Person/Person.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Person_context</name>
+  <name>Person</name>
   <title>Contact</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>PersonMain_view</mainview>
diff --git a/neonContext/Prod2prod_context/Prod2prod_context.aod b/neonContext/Prod2prod/Prod2prod.aod
similarity index 96%
rename from neonContext/Prod2prod_context/Prod2prod_context.aod
rename to neonContext/Prod2prod/Prod2prod.aod
index 05f7f455117cfecc5885b0b0e2987ad736f3e48d..7573a9c94d9de960e75caf33d7b66f716ad36ef9 100644
--- a/neonContext/Prod2prod_context/Prod2prod_context.aod
+++ b/neonContext/Prod2prod/Prod2prod.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Prod2prod_context</name>
+  <name>Prod2prod</name>
   <title></title>
   <comment>Prod2Prod is mainly used for the parts list of products</comment>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonContext/Product_context/Product_context.aod b/neonContext/Product/Product.aod
similarity index 97%
rename from neonContext/Product_context/Product_context.aod
rename to neonContext/Product/Product.aod
index af76f2c8c7e3f42a50ce6c889cf34cb6283b9755..1732344d4f6f164020573747971907b1372c1c73 100644
--- a/neonContext/Product_context/Product_context.aod
+++ b/neonContext/Product/Product.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Product_context</name>
+  <name>Product</name>
   <title>Product</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>ProductMain_view</mainview>
diff --git a/neonContext/Productprice_context/Productprice_context.aod b/neonContext/Productprice/Productprice.aod
similarity index 96%
rename from neonContext/Productprice_context/Productprice_context.aod
rename to neonContext/Productprice/Productprice.aod
index 9b7a23a449810d5f92adf19ec7f5b361d8c19a3d..5b9fa0169f486c803fcca45de5141eb61e4e768e 100644
--- a/neonContext/Productprice_context/Productprice_context.aod
+++ b/neonContext/Productprice/Productprice.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Productprice_context</name>
+  <name>Productprice</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>ProductpriceFilter_view</filterview>
   <editview>ProductpriceEdit_view</editview>
diff --git a/neonContext/Salesproject_context/Salesproject_context.aod b/neonContext/Salesproject/Salesproject.aod
similarity index 90%
rename from neonContext/Salesproject_context/Salesproject_context.aod
rename to neonContext/Salesproject/Salesproject.aod
index f21df4abe418179cac97fe4561001570b999388f..cf828aac4f6e718b1539118fa6804a5faac30b2d 100644
--- a/neonContext/Salesproject_context/Salesproject_context.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Salesproject_context</name>
+  <name>Salesproject</name>
   <title>Salesproject</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/neonContext/Salesproject_context/documentation.adoc</documentation>
+  <documentation>%aditoprj%/neonContext/Salesproject/documentation.adoc</documentation>
   <mainview>SalesprojectMain_view</mainview>
   <filterview>SalesprojectFilter_view</filterview>
   <editview>SalesprojectEdit_view</editview>
diff --git a/neonContext/Salesproject_context/documentation.adoc b/neonContext/Salesproject/documentation.adoc
similarity index 100%
rename from neonContext/Salesproject_context/documentation.adoc
rename to neonContext/Salesproject/documentation.adoc
diff --git a/neonContext/SalesprojectClassification_context/SalesprojectClassification_context.aod b/neonContext/SalesprojectClassification/SalesprojectClassification.aod
similarity index 94%
rename from neonContext/SalesprojectClassification_context/SalesprojectClassification_context.aod
rename to neonContext/SalesprojectClassification/SalesprojectClassification.aod
index 50015aa7f97f29a95b8cf8c3008cbe128e6778b3..983245de454577b7ad0d6046ab6f863413200c69 100644
--- a/neonContext/SalesprojectClassification_context/SalesprojectClassification_context.aod
+++ b/neonContext/SalesprojectClassification/SalesprojectClassification.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectClassification_context</name>
+  <name>SalesprojectClassification</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>SalesprojectClassificationFilter_view</filterview>
   <preview>SalesprojectClassificationPreview_view</preview>
diff --git a/neonContext/SalesprojectClassificationEntry_context/SalesprojectClassificationEntry_context.aod b/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
similarity index 94%
rename from neonContext/SalesprojectClassificationEntry_context/SalesprojectClassificationEntry_context.aod
rename to neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
index 513be574430b1e06c35fa5fe32fa3b0d29a3aa93..9fd349dbde19912693f1c688b873014c743378d9 100644
--- a/neonContext/SalesprojectClassificationEntry_context/SalesprojectClassificationEntry_context.aod
+++ b/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectClassificationEntry_context</name>
+  <name>SalesprojectClassificationEntry</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>SalesprojectClassificationEntryPreview_view</mainview>
   <filterview>SalesprojectClassificationEntryPreview_view</filterview>
diff --git a/neonContext/SalesprojectCompetition_context/SalesprojectCompetition_context.aod b/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
similarity index 95%
rename from neonContext/SalesprojectCompetition_context/SalesprojectCompetition_context.aod
rename to neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
index 9578e83ae8b172ad0e783d7df92c770e07d55552..40d50f2209cbebba9eb9685c86da007042a7700e 100644
--- a/neonContext/SalesprojectCompetition_context/SalesprojectCompetition_context.aod
+++ b/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectCompetition_context</name>
+  <name>SalesprojectCompetition</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>SalesprojectCompetitionFilter_view</filterview>
   <editview>SalesprojectCompetitionEdit_view</editview>
diff --git a/neonContext/SalesprojectCycle_context/SalesprojectCycle_context.aod b/neonContext/SalesprojectCycle/SalesprojectCycle.aod
similarity index 96%
rename from neonContext/SalesprojectCycle_context/SalesprojectCycle_context.aod
rename to neonContext/SalesprojectCycle/SalesprojectCycle.aod
index 177964021d07eb6f5946da28cf11bf98c79e5a4c..eafd4a0e171696f6de10fa52a6ad210be7b69363 100644
--- a/neonContext/SalesprojectCycle_context/SalesprojectCycle_context.aod
+++ b/neonContext/SalesprojectCycle/SalesprojectCycle.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectCycle_context</name>
+  <name>SalesprojectCycle</name>
   <description>Milestones of a salesproject</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>SalesprojectCycleFilter_view</filterview>
diff --git a/neonContext/SalesprojectForecast_context/SalesprojectForecast_context.aod b/neonContext/SalesprojectForecast/SalesprojectForecast.aod
similarity index 95%
rename from neonContext/SalesprojectForecast_context/SalesprojectForecast_context.aod
rename to neonContext/SalesprojectForecast/SalesprojectForecast.aod
index 8548bf19de71d333ad24d6ef7287f79bfebbb462..6c580deeb4fbf05b963d64f5c9863a5b35279d25 100644
--- a/neonContext/SalesprojectForecast_context/SalesprojectForecast_context.aod
+++ b/neonContext/SalesprojectForecast/SalesprojectForecast.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectForecast_context</name>
+  <name>SalesprojectForecast</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>SalesprojectForecastFilter_view</filterview>
   <editview>SalesprojectForecastEdit_view</editview>
diff --git a/neonContext/SalesprojectMember_context/SalesprojectMember_context.aod b/neonContext/SalesprojectMember/SalesprojectMember.aod
similarity index 96%
rename from neonContext/SalesprojectMember_context/SalesprojectMember_context.aod
rename to neonContext/SalesprojectMember/SalesprojectMember.aod
index 55c00eebd7e0d53d13bdae74a2a08ced9fecc767..ed2f52c32963f3ceec92dcca36c6b14bf6c56a98 100644
--- a/neonContext/SalesprojectMember_context/SalesprojectMember_context.aod
+++ b/neonContext/SalesprojectMember/SalesprojectMember.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectMember_context</name>
+  <name>SalesprojectMember</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>SalesprojectMemberFilter_view</filterview>
   <editview>SalesprojectMemberEdit_view</editview>
diff --git a/neonContext/SalesprojectSource_context/SalesprojectSource_context.aod b/neonContext/SalesprojectSource/SalesprojectSource.aod
similarity index 96%
rename from neonContext/SalesprojectSource_context/SalesprojectSource_context.aod
rename to neonContext/SalesprojectSource/SalesprojectSource.aod
index 12b145a8fe72bb4395b65c868a40609e68b13e89..7c6547346bd6f021b6f637c527fa29c62f10ff34 100644
--- a/neonContext/SalesprojectSource_context/SalesprojectSource_context.aod
+++ b/neonContext/SalesprojectSource/SalesprojectSource.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>SalesprojectSource_context</name>
+  <name>SalesprojectSource</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>SalesprojectSourceFilter_view</filterview>
   <editview>SalesprojectSourceEdit_view</editview>
diff --git a/neonContext/Social_context/Social_context.aod b/neonContext/Social/Social.aod
similarity index 96%
rename from neonContext/Social_context/Social_context.aod
rename to neonContext/Social/Social.aod
index eb52261481b6d6c472e1da630279464720d60315..eaa934c0d759bd827114766fffeb21302b63e4eb 100644
--- a/neonContext/Social_context/Social_context.aod
+++ b/neonContext/Social/Social.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Social_context</name>
+  <name>Social</name>
   <title>Social</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview></mainview>
diff --git a/neonContext/Stock_context/Stock_context.aod b/neonContext/Stock/Stock.aod
similarity index 96%
rename from neonContext/Stock_context/Stock_context.aod
rename to neonContext/Stock/Stock.aod
index 8e7d6f4c576e5ada61c48ed004ffab467bffa64a..7233bcbae8e5617c5239a130776b158cdf9dfe99 100644
--- a/neonContext/Stock_context/Stock_context.aod
+++ b/neonContext/Stock/Stock.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Stock_context</name>
+  <name>Stock</name>
   <title>Stock</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>StockFilter_view</filterview>
diff --git a/neonContext/Task_context/Task_context.aod b/neonContext/Task/Task.aod
similarity index 91%
rename from neonContext/Task_context/Task_context.aod
rename to neonContext/Task/Task.aod
index ecc29110ce8b3975061d296bf11f51d70006646f..c65d39f1171a872e9ca04df62709fc41d93642e5 100644
--- a/neonContext/Task_context/Task_context.aod
+++ b/neonContext/Task/Task.aod
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Task_context</name>
+  <name>Task</name>
   <title>Task</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/neonContext/Task_context/documentation.adoc</documentation>
+  <documentation>%aditoprj%/neonContext/Task/documentation.adoc</documentation>
   <mainview>TaskMain_view</mainview>
   <filterview>TaskFilter_view</filterview>
   <editview>TaskEdit_view</editview>
diff --git a/neonContext/Task_context/documentation.adoc b/neonContext/Task/documentation.adoc
similarity index 70%
rename from neonContext/Task_context/documentation.adoc
rename to neonContext/Task/documentation.adoc
index e6a998df6826aaaf8d7683c657fc1511f164295e..d3b9d959f70a3bf9333f7e31b14e7bbf8ec14b55 100644
--- a/neonContext/Task_context/documentation.adoc
+++ b/neonContext/Task/documentation.adoc
@@ -1,3 +1,3 @@
 A task describes a need for action (something to be done) by one or more responsible person(s).
 
-CAUTION: Do not confuse these tasks with calendar-tasks(=todos). The `Task_context` tasks are not syncable to a groupware system.
\ No newline at end of file
+CAUTION: Do not confuse these tasks with calendar-tasks(=todos). The context datamodel `Task` is not syncable to a groupware system.
\ No newline at end of file
diff --git a/neonContext/Timetracking_context/Timetracking_context.aod b/neonContext/Timetracking/Timetracking.aod
similarity index 96%
rename from neonContext/Timetracking_context/Timetracking_context.aod
rename to neonContext/Timetracking/Timetracking.aod
index eb7f0acbba1ff69e2c680a11ac0e97ebc2924b34..cf94e846166cb0dc9354e549d373374fb9625c52 100644
--- a/neonContext/Timetracking_context/Timetracking_context.aod
+++ b/neonContext/Timetracking/Timetracking.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Timetracking_context</name>
+  <name>Timetracking</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>TimetrackingFilter_view</filterview>
   <editview>TimetrackingEdit_view</editview>
diff --git a/neonContext/Turnover_context/Turnover_context.aod b/neonContext/Turnover/Turnover.aod
similarity index 94%
rename from neonContext/Turnover_context/Turnover_context.aod
rename to neonContext/Turnover/Turnover.aod
index cbc7aeee0b03219ed7a53a32b367371cb77a9088..eb4ac0420d35ddd7f89214d3102128631685de11 100644
--- a/neonContext/Turnover_context/Turnover_context.aod
+++ b/neonContext/Turnover/Turnover.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Turnover_context</name>
+  <name>Turnover</name>
   <title>Turnover</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>TurnoverChart_view</filterview>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 0c14d5e456eab7ddffa55d87576f7dd00cf6364f..804d4a1e67f0d15b58db8f6e4d4c44d0310624e8 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllActivitiesDashlet</name>
       <title>Activities</title>
       <description>Show all activities</description>
-      <fragment>Activity_context/filter</fragment>
+      <fragment>Activity/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>neon:history</icon>
@@ -27,7 +27,7 @@
       <name>InnateActivitiesDashlet</name>
       <title>My Activities</title>
       <description>Show my activities</description>
-      <fragment>Activity_context/filter</fragment>
+      <fragment>Activity/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>neon:history</icon>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index bcf16f07c694083818309d56f0ce92cbb61f7b60..278a72ae11a46c33de1ba4b5ef02edcf6169aec8 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
-  <name>AttributePreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Attr_template</name>
-      <titleField>ATTRIBUTE_NAME</titleField>
-      <subtitleField>ATTRIBUTE_TYPE</subtitleField>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributePreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Attr_template</name>
+      <titleField>ATTRIBUTE_NAME</titleField>
+      <subtitleField>ATTRIBUTE_TYPE</subtitleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeTree_view/AttributeTree_view.aod b/neonView/AttributeTree_view/AttributeTree_view.aod
index 7da227dabbb30c689bff63f545ef4518d6126076..b1bb94f4487d39a4d56c56d9706b3c3b99eebcc5 100644
--- a/neonView/AttributeTree_view/AttributeTree_view.aod
+++ b/neonView/AttributeTree_view/AttributeTree_view.aod
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
-  <name>AttributeTree_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <treetableViewTemplate>
-      <name>Treetable</name>
-      <parentField>ATTRIBUTE_PARENT_ID</parentField>
-      <titleField>ATTRIBUTE_NAME</titleField>
-      <descriptionField>ATTRIBUTE_TYPE</descriptionField>
-      <entityField>#ENTITY</entityField>
-    </treetableViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeTree_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treetableViewTemplate>
+      <name>Treetable</name>
+      <parentField>ATTRIBUTE_PARENT_ID</parentField>
+      <titleField>ATTRIBUTE_NAME</titleField>
+      <descriptionField>ATTRIBUTE_TYPE</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </treetableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index 780e3cd38e728326f46e1cc712213d79e300f109..ed39ce42020ae746c45d057de2778f3adf79c146 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllContractsDashlet</name>
       <title>Contracts</title>
       <description>Show all contracts</description>
-      <fragment>Contract_context/filter</fragment>
+      <fragment>Contract/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:form</icon>
diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
index f05c7ac403cf00591a9d1a26058bcc0a112ae6b8..f04081147474915cb205fb7605f20d4da7637766 100644
--- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
+++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
@@ -8,7 +8,7 @@
       <name>AditoFacebookDashlet</name>
       <title>ADITO Facebook Feed</title>
       <description>Show all Facebook posts of ADITO</description>
-      <fragment>Social_context/full</fragment>
+      <fragment>Social/full</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:facebook_square</icon>
@@ -33,7 +33,7 @@
       <name>FacebookDashletConfig</name>
       <title>Facebook Feed</title>
       <description>Show all Facebook posts of a user</description>
-      <fragment>Social_context/full</fragment>
+      <fragment>Social/full</fragment>
       <requiresConfiguration v="true" />
       <icon>vaadin:facebook_square</icon>
       <categories>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 7b026fda86a871982ac04bffbe4a0c82154f215f..53ba05900ebbc11455c07a3b4a5df53d69ee827d 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllOffersDashlet</name>
       <title>Offers</title>
       <description>Show all offers</description>
-      <fragment>Offer_context/filter</fragment>
+      <fragment>Offer/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:cart</icon>
@@ -27,7 +27,7 @@
       <name>SendOffersDashlet</name>
       <title>Sent offers</title>
       <description>Show all sent offers</description>
-      <fragment>Offer_context/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+      <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:cart</icon>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index e6d257d62f00bbb2d6c4f2026adbb7e4d409778c..8759414296e0bf6e1921ad3d3068dc57e296599b 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllOrdersDashlet</name>
       <title>Receipts</title>
       <description>Show all receipts</description>
-      <fragment>Order_context/filter</fragment>
+      <fragment>Order/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>VAADIN:FILE_TEXT_O</icon>
@@ -27,7 +27,7 @@
       <name>SendOrdersDashlet</name>
       <title>Sent receipts</title>
       <description>Show all sent receipts</description>
-      <fragment>Order_context/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+      <fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>VAADIN:FILE_TEXT_O</icon>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 6d85943f268ddd8632f79a535cc423fc975735cb..42815a374b95759344d91eb754372de398619373 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllOrgsDashlet</name>
       <title>Companies</title>
       <description>Show all companies</description>
-      <fragment>Organisation_context/filter</fragment>
+      <fragment>Organisation/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:building</icon>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index ed5c9040c702f2a2a14762b8a5b9396a386bdbfb..b465bc58f7ee67e677f524661e986bb58962d30f 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllContactsDashlet</name>
       <title>Contacts</title>
       <description>Show all contacts</description>
-      <fragment>Person_context/filter</fragment>
+      <fragment>Person/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:users</icon>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index fa2025c5ed63451be69666a50ec3a1867c913efb..d6837afcc054291cfe4c0f8f0395a0c64efde898 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllProductsDashlet</name>
       <title>Products</title>
       <description>Show all products</description>
-      <fragment>Product_context/filter</fragment>
+      <fragment>Product/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:hammer</icon>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index a04cea4869e3d7c295c21a42eb444083378d0a84..29c93d4f39c080379433f65949323e2d101c1c11 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllSalesprojectDashlet</name>
       <title>Salesprojects</title>
       <description>Show all salesprojects</description>
-      <fragment>Salesproject_context/filter</fragment>
+      <fragment>Salesproject/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:filter</icon>
@@ -27,7 +27,7 @@
       <name>OpenSalesprojectsDashlet</name>
       <title>Open salesprojects</title>
       <description>Show open salesprojects</description>
-      <fragment>Salesproject_context/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlS2V5IjoiMSIsInZhbHVlIjoiT2ZmZW4iLCJjb250ZW50VHlwZSI6IlRFWFQifV0%253D</fragment>
+      <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlS2V5IjoiMSIsInZhbHVlIjoiT2ZmZW4iLCJjb250ZW50VHlwZSI6IlRFWFQifV0%253D</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:filter</icon>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 40add15ffbeb8f9e85b3a2fe5132294566250d6e..090df557d88fc004ebedab4fa37d661223a3fc03 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -7,7 +7,7 @@
     <neonDashletConfiguration>
       <name>TurnoverDashlet</name>
       <title>Turnover</title>
-      <fragment>Turnover_context/full</fragment>
+      <fragment>Turnover/full</fragment>
       <singleton v="true" />
       <storeRoles>
         <element>INTERNAL_ADMINISTRATOR</element>
diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
index aaa216d051a2c3b714c9f27ec51cb4d2a548b844..25c658f82ad88d6c76b77c1f5a3493e2dd63dff4 100644
--- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
+++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
@@ -8,7 +8,7 @@
       <name>AditoTwitterDashlet</name>
       <title>ADITO Twitter Feed</title>
       <description>Show all tweets of ADITO</description>
-      <fragment>Social_context/full</fragment>
+      <fragment>Social/full</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:twitter_square</icon>
@@ -33,7 +33,7 @@
       <name>TwitterDashletConfig</name>
       <title>Twitter Feed</title>
       <description>Show all tweets of a user</description>
-      <fragment>Social_context/full</fragment>
+      <fragment>Social/full</fragment>
       <requiresConfiguration v="true" />
       <icon>vaadin:twitter_square</icon>
       <categories>
diff --git a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml b/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
index ebe9e74919d04ba4b40c15361d8679b32487fe07..190ffff07bded81d5b2d5233ee4c8d879d598ecc 100644
--- a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
+++ b/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
@@ -13,13 +13,13 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
             <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="83337967-5d58-4b17-88c2-2aeefa130c21"/>
             <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
-            <column name="OBJECT_TYPE" value="Person_context"/>
+            <column name="OBJECT_TYPE" value="Person"/>
             <column name="OBJECT_ROWID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -34,7 +34,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
             <column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -49,7 +49,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
             <column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -64,7 +64,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
             <column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -79,7 +79,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
             <column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -94,7 +94,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
             <column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -109,7 +109,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
             <column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -124,7 +124,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
             <column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -139,7 +139,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
             <column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
     </changeSet>
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
index e3ed48ba82af47d98ce117a3eeaf3d4c73af1524..ec60ebd3fee575cebf9421e4ba7b961e19ec8747 100644
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
@@ -12,9 +12,9 @@
         </insert>
         <insert tableName="AB_OBJECTRELATION">
             <column name="AB_OBJECTRELATIONID" value="102b5d75-304b-41f4-9426-ba13d4dce1c3"/>
-            <column name="OBJECT1_TYPE" value="Organisation_context"/>
+            <column name="OBJECT1_TYPE" value="Organisation"/>
             <column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-            <column name="OBJECT2_TYPE" value="Person_context"/>
+            <column name="OBJECT2_TYPE" value="Person"/>
             <column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
         </insert>
         <insert tableName="CONTACT">
@@ -72,7 +72,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
             <column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
         <insert tableName="ACTIVITY">
@@ -87,7 +87,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
             <column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
-            <column name="OBJECT_TYPE" value="Organisation_context"/>
+            <column name="OBJECT_TYPE" value="Organisation"/>
             <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
         </insert>
 
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml b/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
index 1c8fb45a8858d3aa41000a69b927962bbdeb4967..99eaa74e0d547c8d8ce54ab7bb41bbc3ad33dc9b 100644
--- a/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
@@ -59,7 +59,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="b111a1da-39f2-48ae-93a5-bad704e5ae48"/>
             <column name="ACTIVITY_ID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
-            <column name="OBJECT_TYPE" value="Person_context"/>
+            <column name="OBJECT_TYPE" value="Person"/>
             <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
         </insert>
         <rollback>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml b/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
index 4d9e26806c6a3b552ad394ef0900cf58e091eaf0..87ccb91699d93530e1fe3c9827a507d30bc5a80f 100644
--- a/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
@@ -59,7 +59,7 @@
         <insert tableName="ACTIVITYLINK">
             <column name="ACTIVITYLINKID" value="a331a1da-39f2-48ae-93a5-bad704e5ae48"/>
             <column name="ACTIVITY_ID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
-            <column name="OBJECT_TYPE" value="Person_context"/>
+            <column name="OBJECT_TYPE" value="Person"/>
             <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
         </insert>
         <rollback>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
index f2451e2af273e0ecb6136ddebee72b1344331a3d..78e3fb27480d753b524aa5aa9b5ed5f370c4d41d 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -19,9 +19,9 @@
     </insert>
     <insert tableName="AB_OBJECTRELATION">
         <column name="AB_OBJECTRELATIONID" value="6dd516b2-7887-4a17-930a-d39607c8b626"/>
-        <column name="OBJECT1_TYPE" value="Salesproject_context"/>
+        <column name="OBJECT1_TYPE" value="Salesproject"/>
         <column name="OBJECT1_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-        <column name="OBJECT2_TYPE" value="Person_context"/>
+        <column name="OBJECT2_TYPE" value="Person"/>
         <column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
     </insert>
     <insert tableName="SALESPROJECT_SOURCE">
diff --git a/process/Activity_lib/process.js b/process/Activity_lib/process.js
index f5e1edbcb11efe9b7c148136f92bed373123389b..b9a50c73f494bd24a9771afa8ffcc40ed2396a79 100644
--- a/process/Activity_lib/process.js
+++ b/process/Activity_lib/process.js
@@ -30,5 +30,5 @@ ActivityUtils.createNewActivity = function(pRowId)
     var params = {};
     params["ObjectId_param"] = ContextUtils.getCurrentContextId();
     params["RowId_param"] = pRowId;
-    neon.openContext("Activity_context", null, null, neon.OPERATINGSTATE_NEW, params);
+    neon.openContext("Activity", null, null, neon.OPERATINGSTATE_NEW, params);
 }
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index bb03b95f164fbbacc77ed981a1d7f4e40efc4718..43b6114339dbbcee6399d1955235b7c67149b696 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,260 +1,260 @@
-import("system.translate");
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("Sql_lib");
-
-/**
- * Provides functions for the work with attributes, like setting or getting the value of an attribute
- * or listing the available attributes for a context.
- * Don't instanciate this!
- * 
- * @class
- */
-function AttributeUtil () {}
-
-/**
- * Gives a list of all available attributes for a context. This is used in the possibleItems
- * process for the attribute id in AttributeRelation
- * 
- * @param {String} pObjectType the object type (= context)
- * 
- * @return {String[][]} two-dimensional array of attributeIds and names
- */
-AttributeUtil.getPossibleAttributes = function (pObjectType)
-{
-    if (pObjectType == null)
-        return [];
-    
-    var attrSql = "select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE"
-        + " join AB_ATTRIBUTEUSAGE  on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
-    attrSql = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
-        .and("ATTRIBUTE_ACTIVE = 1")
-        .buildSql(attrSql);
-
-    return db.table(attrSql);
-}
-
-/**
- * returns the name of an attribute
- * 
- * @param {String} pAttributeId the id of the attribute
- * 
- * @return {String} the name of the attribute
- */
-AttributeUtil.getAttributeNameById = function (pAttributeId) 
-{
-    var attributeNames = [];
-    var attribute;
-    do {
-        attribute = db.array(db.ROW, SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
-            .buildSql("select ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID from AB_ATTRIBUTE")
-        );
-        if (attribute.length > 0)
-        {
-            attributeNames.push(attribute[0]);
-            pAttributeId = attribute[1];
-        }
-        else
-            pAttributeId = "";
-    } while (pAttributeId);
-    
-    return attributeNames.reverse().join(" / ");
-}
-
-/**
- * gets the value of an attribute for one dataset (e. g. a person)
- */
-AttributeUtil.getAttribute = function (pAttributeId, pObjectType, pObjectRowId, pGetIdValue)
-{
-    //TODO: implement
-}
-
-AttributeUtil.getAttributes = function ()
-{
-    //TODO: implement maybe
-}
-
-/**
- * sets the value of an attribute for one dataset (e. g. a person)
- */
-AttributeUtil.setAttribute = function ()
-{
-    //TODO: implement
-}
-
-
-/**
- * This is used in the AttributeRelation enitiy to make the work with attributes there
- * easier. You probaly won't need this for anything else.
- * 
- * @param {String} pAttrId the id of the attribute
- */
-function AttributeHandler (pAttrId)   //TODO: find out if this class is necessary, maybe there is a more elegant solution, this could also be static
-{
-    this.attributeId = pAttrId;
-    this._attributeType = null;
-}
-
-AttributeHandler.begin = function (pAttrId)
-{
-    return new AttributeHandler(pAttrId);
-}
-
-/**
- * gets the type of the attribute by the attributeId, after the first call the value
- * is stored so that the sql selection is done only once
- * 
- * @return {String} attribute type
- */
-AttributeHandler.prototype._getAttributeType = function () //TODO: maybe the type should be an own field in the entity instead of getting the type from the attribute id
-{
-    if (this._attributeType == null && this.attributeId != null)
-    {
-        var attrTypeSelect = "select ATTRIBUTE_TYPE from AB_ATTRIBUTE";
-        attrTypeSelect = SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", this.attributeId)
-            .buildSql(attrTypeSelect);
-        this._attributeType = db.cell(attrTypeSelect).trim();
-    }
-    return this._attributeType;
-}
-
-/**
- * returns the field that belongs to the type of the attribute
- * 
- * @return {String} attribute field
- */
-AttributeHandler.prototype.getAttributeField = function ()
-{
-    return AttributeTypes.getEntityField(this._getAttributeType());
-}
-
-/**
- * returns the content type that belongs to the type of the attribute
- * 
- * @return {String} attribute field
- */
-AttributeHandler.prototype.getAttributeContentType = function ()
-{
-    return AttributeTypes.getContentType(this._getAttributeType());
-}
-
-AttributeHandler.prototype.setAttributeValue = function (pValue)
-{
-    var field = "$field." + this.getAttributeField();
-    if (field != null && vars.exists(field))
-        neon.setFieldValue(field, pValue)
-    return pValue;
-}
-
-/**
- * Object for the enumeration and management of all attribute types.
- * This Object is only for the general definition of attribute types and for getting
- * data about every type, anything that has to do with a specific attribute (= the function requires an attribute id)
- * should be done in AttributeUtils.
- * The values for each type are:
- * 
- * contentType = the value that is returned in the contentType process for the attribute
- * databaseField = the database field that holds values of attributes with the type
- * entityField = the field in the AttributeRelation enity that holds the value of the attribute for that type
- * 
- * The display name is controlled by the keyword 'AttributeType'
- */
-var AttributeTypes = {
-    TEXT : { 
-        toString : function () {return "TEXT"},
-        contentType : "TEXT", 
-        databaseField : "CHAR_VALUE", 
-        entityField : "CHAR_VALUE"
-    },
-    DATE : {
-        toString : function () {return "DATE"},
-        contentType : "DATE", 
-        databaseField : "DATE_VALUE", 
-        entityField : "DATE_VALUE"
-    },
-    NUMBER : {
-        toString : function () {return "NUMBER"},
-        contentType : "NUMBER", 
-        databaseField : "NUMBER_VALUE", 
-        entityField : "NUMBER_VALUE"
-    },
-    BOOLEAN : {
-        toString : function () {return "BOOLEAN"},
-        contentType : "BOOLEAN", 
-        databaseField : "BOOL_VALUE", 
-        entityField : "BOOL_VALUE"
-    },
-    COMBO : {
-        toString : function () {return "COMBO"},
-        contentType : "TEXT", 
-        databaseField : "ID_VALUE", 
-        entityField : "ID_VALUE"
-    },
-    GROUP : {
-        toString : function () {return "GROUP"},
-        contentType : null, 
-        databaseField : null, 
-        entityField : null
-    }
-};
-
-
-/**
- * returns the required contentType for the given attribute type
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {String} the contentType for the attribute
- */
-AttributeTypes.getContentType = function (pAttributeType)
-{
-    if (pAttributeType in AttributeTypes)
-        return AttributeTypes[pAttributeType].contentType;
-    return null;
-}
-
-/**
- * returns the entity field for the given attribute type that holds the value of the attribute
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {String} the field for the attribute
- */
-AttributeTypes.getEntityField = function (pAttributeType)
-{
-    if (pAttributeType in AttributeTypes)
-        return AttributeTypes[pAttributeType].entityField;
-    return null;
-}
-
-/**
- * returns the database field for the given attribute type that holds the value of the attribute
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {String} the database field for the attribute
- */
-AttributeTypes.getDatabaseField = function (pAttributeType)
-{
-    if (pAttributeType in AttributeTypes)
-        return AttributeTypes[pAttributeType].databaseField;
-    return null;
-}
-
-/**
- * returns the name of the given attribute type
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {String} the name the attribute
- */
-AttributeTypes.getName = function (pAttributeType)
-{
-    if (pAttributeType in AttributeTypes)
-        return translate.text(AttributeTypes[pAttributeType].displayName);
-    return null;
-}
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+/**
+ * Provides functions for the work with attributes, like setting or getting the value of an attribute
+ * or listing the available attributes for a context.
+ * Don't instanciate this!
+ * 
+ * @class
+ */
+function AttributeUtil () {}
+
+/**
+ * Gives a list of all available attributes for a context. This is used in the possibleItems
+ * process for the attribute id in AttributeRelation
+ * 
+ * @param {String} pObjectType the object type (= context)
+ * 
+ * @return {String[][]} two-dimensional array of attributeIds and names
+ */
+AttributeUtil.getPossibleAttributes = function (pObjectType)
+{
+    if (pObjectType == null)
+        return [];
+    
+    var attrSql = "select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE"
+        + " join AB_ATTRIBUTEUSAGE  on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
+    attrSql = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
+        .and("ATTRIBUTE_ACTIVE = 1")
+        .buildSql(attrSql);
+
+    return db.table(attrSql);
+}
+
+/**
+ * returns the name of an attribute
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * 
+ * @return {String} the name of the attribute
+ */
+AttributeUtil.getAttributeNameById = function (pAttributeId) 
+{
+    var attributeNames = [];
+    var attribute;
+    do {
+        attribute = db.array(db.ROW, SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+            .buildSql("select ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID from AB_ATTRIBUTE")
+        );
+        if (attribute.length > 0)
+        {
+            attributeNames.push(attribute[0]);
+            pAttributeId = attribute[1];
+        }
+        else
+            pAttributeId = "";
+    } while (pAttributeId);
+    
+    return attributeNames.reverse().join(" / ");
+}
+
+/**
+ * gets the value of an attribute for one dataset (e. g. a person)
+ */
+AttributeUtil.getAttribute = function (pAttributeId, pObjectType, pObjectRowId, pGetIdValue)
+{
+    //TODO: implement
+}
+
+AttributeUtil.getAttributes = function ()
+{
+    //TODO: implement maybe
+}
+
+/**
+ * sets the value of an attribute for one dataset (e. g. a person)
+ */
+AttributeUtil.setAttribute = function ()
+{
+    //TODO: implement
+}
+
+
+/**
+ * This is used in the AttributeRelation enitiy to make the work with attributes there
+ * easier. You probaly won't need this for anything else.
+ * 
+ * @param {String} pAttrId the id of the attribute
+ */
+function AttributeHandler (pAttrId)   //TODO: find out if this class is necessary, maybe there is a more elegant solution, this could also be static
+{
+    this.attributeId = pAttrId;
+    this._attributeType = null;
+}
+
+AttributeHandler.begin = function (pAttrId)
+{
+    return new AttributeHandler(pAttrId);
+}
+
+/**
+ * gets the type of the attribute by the attributeId, after the first call the value
+ * is stored so that the sql selection is done only once
+ * 
+ * @return {String} attribute type
+ */
+AttributeHandler.prototype._getAttributeType = function () //TODO: maybe the type should be an own field in the entity instead of getting the type from the attribute id
+{
+    if (this._attributeType == null && this.attributeId != null)
+    {
+        var attrTypeSelect = "select ATTRIBUTE_TYPE from AB_ATTRIBUTE";
+        attrTypeSelect = SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", this.attributeId)
+            .buildSql(attrTypeSelect);
+        this._attributeType = db.cell(attrTypeSelect).trim();
+    }
+    return this._attributeType;
+}
+
+/**
+ * returns the field that belongs to the type of the attribute
+ * 
+ * @return {String} attribute field
+ */
+AttributeHandler.prototype.getAttributeField = function ()
+{
+    return AttributeTypes.getEntityField(this._getAttributeType());
+}
+
+/**
+ * returns the content type that belongs to the type of the attribute
+ * 
+ * @return {String} attribute field
+ */
+AttributeHandler.prototype.getAttributeContentType = function ()
+{
+    return AttributeTypes.getContentType(this._getAttributeType());
+}
+
+AttributeHandler.prototype.setAttributeValue = function (pValue)
+{
+    var field = "$field." + this.getAttributeField();
+    if (field != null && vars.exists(field))
+        neon.setFieldValue(field, pValue)
+    return pValue;
+}
+
+/**
+ * Object for the enumeration and management of all attribute types.
+ * This Object is only for the general definition of attribute types and for getting
+ * data about every type, anything that has to do with a specific attribute (= the function requires an attribute id)
+ * should be done in AttributeUtils.
+ * The values for each type are:
+ * 
+ * contentType = the value that is returned in the contentType process for the attribute
+ * databaseField = the database field that holds values of attributes with the type
+ * entityField = the field in the AttributeRelation enity that holds the value of the attribute for that type
+ * 
+ * The display name is controlled by the keyword 'AttributeType'
+ */
+var AttributeTypes = {
+    TEXT : { 
+        toString : function () {return "TEXT"},
+        contentType : "TEXT", 
+        databaseField : "CHAR_VALUE", 
+        entityField : "CHAR_VALUE"
+    },
+    DATE : {
+        toString : function () {return "DATE"},
+        contentType : "DATE", 
+        databaseField : "DATE_VALUE", 
+        entityField : "DATE_VALUE"
+    },
+    NUMBER : {
+        toString : function () {return "NUMBER"},
+        contentType : "NUMBER", 
+        databaseField : "NUMBER_VALUE", 
+        entityField : "NUMBER_VALUE"
+    },
+    BOOLEAN : {
+        toString : function () {return "BOOLEAN"},
+        contentType : "BOOLEAN", 
+        databaseField : "BOOL_VALUE", 
+        entityField : "BOOL_VALUE"
+    },
+    COMBO : {
+        toString : function () {return "COMBO"},
+        contentType : "TEXT", 
+        databaseField : "ID_VALUE", 
+        entityField : "ID_VALUE"
+    },
+    GROUP : {
+        toString : function () {return "GROUP"},
+        contentType : null, 
+        databaseField : null, 
+        entityField : null
+    }
+};
+
+
+/**
+ * returns the required contentType for the given attribute type
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {String} the contentType for the attribute
+ */
+AttributeTypes.getContentType = function (pAttributeType)
+{
+    if (pAttributeType in AttributeTypes)
+        return AttributeTypes[pAttributeType].contentType;
+    return null;
+}
+
+/**
+ * returns the entity field for the given attribute type that holds the value of the attribute
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {String} the field for the attribute
+ */
+AttributeTypes.getEntityField = function (pAttributeType)
+{
+    if (pAttributeType in AttributeTypes)
+        return AttributeTypes[pAttributeType].entityField;
+    return null;
+}
+
+/**
+ * returns the database field for the given attribute type that holds the value of the attribute
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {String} the database field for the attribute
+ */
+AttributeTypes.getDatabaseField = function (pAttributeType)
+{
+    if (pAttributeType in AttributeTypes)
+        return AttributeTypes[pAttributeType].databaseField;
+    return null;
+}
+
+/**
+ * returns the name of the given attribute type
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {String} the name the attribute
+ */
+AttributeTypes.getName = function (pAttributeType)
+{
+    if (pAttributeType in AttributeTypes)
+        return translate.text(AttributeTypes[pAttributeType].displayName);
+    return null;
+}
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index 1970ce342437f15c3260901f762c3aeca60bd27e..f704ccfc6d6f2caa62fee555e5890d3b97abd4eb 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -62,7 +62,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
     {
         //set the new standard comm-record
         cond.clear();
-        //check communicationid, relId and medium to prevent data-inconsistency when bad function params are passed by (e.g communicationid of a different category)
+        //check communicationid, contactId and medium to prevent data-inconsistency when bad function params are passed by (e.g communicationid of a different category)
         cond.andPrepare("COMMUNICATION.COMMUNICATIONID", pNewStandardCommId).andPrepare("COMMUNICATION.CONTACT_ID", pAffectedRowId);
         cond.and("MEDIUM_ID in (" + mediumIds.join(", ") + ")");
         statements.push(["COMMUNICATION", cols, types, ["1"], cond.build()]);
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 7c171910ff19b8c0579f0957a134ab463e3f1e2e..019c9557e71d7f258dd425977c6ef2ba61dbcfdf 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -143,10 +143,10 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
     switch (RelationUtils.getRelationTypeByPersOrg(pPersId, pOrgId))
     {
         case 1: // Org
-            return ContextUtils.getContextName("Organisation_context");
+            return ContextUtils.getContextName("Organisation");
         case 2: // private Person
         case 3: // Person
-            return ContextUtils.getContextName("Person_context");
+            return ContextUtils.getContextName("Person");
         default:
             return "";
     }
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index c5f2ed932ccfe0dcbe2657fa51340d9d61780a55..5965deeba144c239e66f8c9b39bb81849957cc2e 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -106,14 +106,14 @@ ContextUtils._getSelectMap = function()
     var maskingUtils = new SqlMaskingUtils();
     return {
           // contextId             nameField  Tablename, IDField, isSystemAlias
-        "Organisation_context": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", false],
-        "Person_context": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", false],
-        "Activity_context": ["SUBJECT", "ACTIVITY", "ACTIVITYID", false],
-        "Salesproject_context": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", false],
+        "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", false],
+        "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", false],
+        "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", false],
+        "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", false],
         // TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
         // maskingUtils.concat([SqlMaskingUtils.cast("CONTRACTCODE", "varchar", 10), getKeySQL("CONTRACTTYPE", "CONTRACTTYPE" )])
-        "Contract_context": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID", false]
-//        "Appointment_context": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID", true]
+        "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID", false]
+//        "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID", true]
     }
 }
 
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index 35f7e853dcd75442482259ed85ca4c6a6746f4ac..c811a8f7be0193ac7efff4c6f214d742caebbb3d 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -20,7 +20,7 @@ function CopyModuleUtils() {}
  * 
  * @example 
  *  var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
- *  CopyModuleUtils.openNewModules("Offer_context", ModulesMapping);
+ *  CopyModuleUtils.openNewModules("Offer", ModulesMapping);
  */
 CopyModuleUtils.openNewModules = function(pNeonContext, pModulesMapping)
 {
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 0665a167aa408eef97b9cca65ce8beab042c8ee4..41cadea985cebf7e1b1e094bc1beddfcc5935f6e 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -75,7 +75,7 @@ OfferUtils.createNewOffer = function(pSalesprojectId, pRelationId)
     if (pRelationId)
         params["ContactId_param"] = pRelationId;
     
-    neon.openContext("Offer_context", null, null, neon.OPERATINGSTATE_NEW, params);
+    neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
 }
 
 
@@ -295,7 +295,7 @@ OfferUtils.copyToOrder = function (pOfferId, pSalesprojectId, pContactId, pLangu
         "OrderAddress_param" : pAddress || "",
         "OrderHeader_param" : pHeader || ""
     };
-    neon.openContext("Order_context", null, null, neon.OPERATINGSTATE_NEW, params);
+    neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
 }
 
 
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 062753456e2da9f5f8bec2f429614a035d62e552..d006db8a76a57988e82843bbeaeffcfdce37b6e9 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -74,7 +74,7 @@ OrderUtils.createNewOrder = function(pSalesprojectId, pRelationId)
     if (pRelationId)
         params["ContactId_param"] = pRelationId;
     
-    neon.openContext("Order_context", null, neon.OPERATINGSTATE_NEW, params);
+    neon.openContext("Order", null, neon.OPERATINGSTATE_NEW, params);
 }
 
 /**
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 72b442f09b175bf1f2b33eb7b7cf47c19faa9f3d..0d183d8d4093ca00748c8324471fc309e380e369 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -93,9 +93,9 @@ ProductUtils.getStockCount = function(pid) {
  * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
  *          var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
  *          var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- *          var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ *          var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
  *          var pUtils = new ProductUtils();
- *          var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
+ *          var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
  *          var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
  * 
  * @return {Object} { <br>
diff --git a/process/Timetracking_lib/process.js b/process/Timetracking_lib/process.js
index 2a540245b62190ef1454d600cf1ab7000426913a..664d6574bedc18c220cea42395ecf787791d5e83 100644
--- a/process/Timetracking_lib/process.js
+++ b/process/Timetracking_lib/process.js
@@ -1,47 +1,47 @@
-import("system.db");
-import("system.neon");
-import("Context_lib");
-
-/**
- * Methods used for time tracking.
- * Do not create an instance of this!
- * 
- * @class
- */
-function Timetracking() {}
-   
-/**
- * calculates the total time of all time trackings of the object
- * 
- * @param {String} pRowId the rowId
- * 
- * @return {Number} total time in minutes
- */
-Timetracking.getTotalTrackingTime = function (pRowId)
-{
-    var objectId = ContextUtils.getCurrentContextId();
-    var totalMinutes = db.cell(SqlCondition.begin()
-        .andPrepare("TIMETRACKING.OBJECT_ID", objectId)
-        .andPrepare("TIMETRACKING.ROW_ID", pRowId)
-        .buildSql("select sum(MINUTES) from TIMETRACKING", "1=0"));
-    
-    return Number(totalMinutes);
-}
-
-/**
- * Create a new time tracking
- * 
- * @param {String} pRowId the rowId
- * 
- * @return {Number} total time in minutes
- */
-Timetracking.createNewTimeTracking = function (pRowId)
-{
-    var objectId = ContextUtils.getCurrentContextId();
-    var params = {
-        "ObjectId_param" : objectId,
-        "RowId_param" : pRowId
-    };
-    
-    neon.openContext("Timetracking_context", null, null, neon.OPERATINGSTATE_NEW, params);
+import("system.db");
+import("system.neon");
+import("Context_lib");
+
+/**
+ * Methods used for time tracking.
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function Timetracking() {}
+   
+/**
+ * calculates the total time of all time trackings of the object
+ * 
+ * @param {String} pRowId the rowId
+ * 
+ * @return {Number} total time in minutes
+ */
+Timetracking.getTotalTrackingTime = function (pRowId)
+{
+    var objectId = ContextUtils.getCurrentContextId();
+    var totalMinutes = db.cell(SqlCondition.begin()
+        .andPrepare("TIMETRACKING.OBJECT_ID", objectId)
+        .andPrepare("TIMETRACKING.ROW_ID", pRowId)
+        .buildSql("select sum(MINUTES) from TIMETRACKING", "1=0"));
+    
+    return Number(totalMinutes);
+}
+
+/**
+ * Create a new time tracking
+ * 
+ * @param {String} pRowId the rowId
+ * 
+ * @return {Number} total time in minutes
+ */
+Timetracking.createNewTimeTracking = function (pRowId)
+{
+    var objectId = ContextUtils.getCurrentContextId();
+    var params = {
+        "ObjectId_param" : objectId,
+        "RowId_param" : pRowId
+    };
+    
+    neon.openContext("Timetracking", null, null, neon.OPERATINGSTATE_NEW, params);
 }
\ No newline at end of file