diff --git a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
index b1083f22c88d6280ef1cb91e22a5169f1f6f8a8c..7b43ff2f6bef70bf04cd150c46dd7d9f921cf5d0 100644
--- a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
+++ b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.ActivityCategory);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.activityCategory());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js b/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
index 8cfc283099c6d657eef5f498c9a5c37bc435b73b..c135c700dd88b19e0fef3cf02e2ebd74bda48977 100644
--- a/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
+++ b/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ActivityDirection);
\ No newline at end of file
+result.string($KeywordRegistry.activityDirection());
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
index b6f62dcf12a4843bb6aac2f820d8dea7024e1c5c..5337285ee96bbb64faa000f776d4eb1f05305df8 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityCategory, "ACTIVITY.CATEGORY");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.activityCategory(), "ACTIVITY.CATEGORY");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
index 1c43b5f520affa6cddbe8dfb95db976ffa4a0061..41920efa9a9a34b6034160177ecd4a7edcbf80fd 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityDirection, "ACTIVITY.DIRECTION");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.activityDirection(), "ACTIVITY.DIRECTION");
 result.string(sql);
diff --git a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
index d94b1e852be6638011a6fe581953d25d0e7f339f..167d3dc35f38110620b4eb5e6004b4c4454578f2 100644
--- a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
+++ b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.AddressType);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.addressType());
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js b/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
index 2ffc9444b90d2ae8a6b4b14be3099c784ca2912b..34af55ea17e392d97e440c715ebb50b3b1f0f66c 100644
--- a/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
+++ b/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AddressType, "ADDRESS.ADDR_TYPE");
-result.string(sql);
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.addressType(), "ADDRESS.ADDR_TYPE");
+result.string(sql);
diff --git a/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
index 619f63d8dcc79bb835afdf13e9704898dcae4d84..1b16072cc5a33cdaf35fd48c69d9b74e98b526f7 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
@@ -4,10 +4,11 @@ import("system.result");
 import("system.vars");
 import("Attribute_lib");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
 {
     var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
     if (type == $AttributeTypes.COMBO)
-        result.string(KeywordUtils.getViewValue($KeywordRegistry.get.AttributeType, $AttributeTypes.COMBOVALUE));
+        result.string(KeywordUtils.getViewValue($KeywordRegistry.attributeType(), $AttributeTypes.COMBOVALUE));
 }
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js
index 437ff727d34d1243615ba8b321e0713af35ae485..dc6dfca332983312b5fc1181f8a357c182ac603f 100644
--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.AttributeType);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.attributeType());
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
index 8c745d3aa3627911fb2de2138a2381f8870a32a1..70d91a13284d4fe84c3ac11898f9818d944f46a2 100644
--- a/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
+++ b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AttributeType, "AB_ATTRIBUTE.ATTRIBUTE_TYPE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "AB_ATTRIBUTE.ATTRIBUTE_TYPE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
index 017dca7fccdf0ca07d9bbf697823f8c81ee80a95..8f3681332b390618660138d7ac4fac9c61abe5fb 100644
--- a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
+++ b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.CommunicationMedium);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.communicationMedium());
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js b/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
index 8ca588b73c625d4be29961c893115e709df8c2a9..5fb31db85d8c9574b7746ddc1fca98ddafa92b76 100644
--- a/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
+++ b/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.CommunicationMedium, "COMMUNICATION.MEDIUM_ID");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationMedium(), "COMMUNICATION.MEDIUM_ID");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js b/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
index 279ddaaf279e54233680dea48d9937503f0d530b..5739345823bc0b832b6e7814fc7b97291a9f599c 100644
--- a/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
@@ -2,8 +2,9 @@ import("system.translate");
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var contractType = KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.get("$field.CONTRACTTYPE"));
+var contractType = KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.get("$field.CONTRACTTYPE"));
 var contractCode = vars.get("$field.CONTRACTCODE");
 
 result.string((contractType || translate.text("Contract")) + " " + contractCode);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
index 54ff29d035dab6cf6017627910ae6a472dec27e0..f17d453fcdc0a4cdd0830eac47ba7d7db0fea3db 100644
--- a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
+result.string($KeywordRegistry.contractPayment());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
index 54ff29d035dab6cf6017627910ae6a472dec27e0..f17d453fcdc0a4cdd0830eac47ba7d7db0fea3db 100644
--- a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
+result.string($KeywordRegistry.contractPayment());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
index 0fe52ea7a199de4de39209b3f5f75eb10315a1b4..8b185106748e306ba26e122862d4d33e49b447ec 100644
--- a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ContractType);
\ No newline at end of file
+result.string($KeywordRegistry.contractType());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/image/valueProcess.js b/entity/Contract_entity/entityfields/image/valueProcess.js
index 0219288c0b8874c0bf8b9a265b8229c65b3efab3..7d2a0e8c8f6947c8c57a61074628e05f4bb1d7a3 100644
--- a/entity/Contract_entity/entityfields/image/valueProcess.js
+++ b/entity/Contract_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
index d84fac9571b6495f5e06a6c1df40c631eefb0fdb..8e21b7b2cfa48b02572985537eb52289a065ef5a 100644
--- a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractStatus, "CONTRACT.CONTRACTSTATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACT.CONTRACTSTATUS");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
index 5f5e46ae862cacca32fc9145db9da181553b1f8d..dbf92aa783a002bc306473100ad00428206427c3 100644
--- a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractType, "CONTRACT.CONTRACTTYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACT.CONTRACTTYPE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
index 51b49d230598c3a4ba0e6d5e467b2f807d418602..a2edaa56105648db6c90de124d63b4e2383833e0 100644
--- a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractPayment, "CONTRACT.PAYMENT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractPayment(), "CONTRACT.PAYMENT");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js b/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js
index aee5aa764b590de8807fb1e55b2ebbe4d3900295..e52675c31d5faf2c260c05bd11438d29755121ca 100644
--- a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js
+++ b/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.KeywordAttributeType);
\ No newline at end of file
+result.string($KeywordRegistry.keywordAttributeType());
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index 4095a1df3b895b7e6887f19e94e719a9ec8fbdb5..a08460ea208091b387b4fe5cd47dbfa78c9504fa 100644
--- a/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.KeywordAttributeType, "AB_KEYWORD_ATTRIBUTE.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.keywordAttributeType(), "AB_KEYWORD_ATTRIBUTE.TYPE");
 result.string(sql);
diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
index 251895de0caa384e595ac12282df6a3955093b04..c82efe19555b1d56e35a8e103aecffa015136880 100644
--- a/entity/Offer_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
@@ -1,9 +1,10 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) 
-{
-    var currency = KeywordUtils.getViewValue($KeywordRegistry.get.Currency, vars.get("$param.OfferCurrency_param"));
-    result.string(currency);
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) 
+{
+    var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OfferCurrency_param"));
+    result.string(currency);
 }
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/image/valueProcess.js b/entity/Offer_entity/entityfields/image/valueProcess.js
index 4705d8645a4f11582c670ed094445d4a6f160ce0..17664f2a052b736ff699cf8cdee04a6b10d73fdc 100644
--- a/entity/Offer_entity/entityfields/image/valueProcess.js
+++ b/entity/Offer_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.OfferStatus, vars.getString("$field.STATUS")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.offerStatus(), vars.getString("$field.STATUS")) );
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
index 0ef9cd25651259dd176ac538fd5ef7a4cdc00935..4c7780fc3a92a387ce3420c577290d3fc22221a6 100644
--- a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+++ b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
+result.string($KeywordRegistry.currency());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
index 86f885ef0bcbc6fee71e25863b358eacc6980407..84f4d7951933717d735bd7f88f38fdff4b14f2c9 100644
--- a/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
+++ b/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.OfferStatus);
\ No newline at end of file
+result.string($KeywordRegistry.offerStatus());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
index 6a8622fcede40b9a9c31684358e8111fa3065e27..b5612781a16cf17e988af9ad4c1f375ea2abd119 100644
--- a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
+++ b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.OfferProbability);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.offerProbability());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
index 13bbda5570f30f932d7484aa813b1a6b6c99072a..be3be7b53e29117afd1dc3b139c0cd99034a37ba 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "OFFER.CURRENCY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "OFFER.CURRENCY");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
index 8718498cbce42f7e07acc4c4b13302f919791a0e..e9591dca90a38b8354700b428504eec663a4afeb 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferProbability, "OFFER.PROBABILITY");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerProbability(), "OFFER.PROBABILITY");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index e6d5b0c724f6f5ccf53a7c8f5152237b2f7b2ba0..47456c05cd7947009988f06233963406266701aa 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferStatus, "OFFER.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS");
 result.string(sql);
diff --git a/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa93d73a75f71c79affa7b02d47668e3..0881ceab5803df2043bdf3ca34277137e48b6a6b 100644
--- a/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
index c21537814b1655b685387ba0a608f116ddee21ad..116859e4d94e5bae0bce9983a85ffad7b392cba1 100644
--- a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+++ b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
index 55e2a9c3ac9ccfc2b74803b24d1b29cc29fd1f3b..44fe0737367589779f577d652c9bf292b3ef167c 100644
--- a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "OFFERITEM.GROUPCODEID");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "OFFERITEM.GROUPCODEID");
 result.string(sql);
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
index 6804ff9fe016ab211d9c3fb384be68817ebfa62d..1f5e5ef5089e7769f7cb4f9f7565802f0efc8eb1 100644
--- a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "OFFERITEM.UNIT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "OFFERITEM.UNIT");
 result.string(sql);
diff --git a/entity/Order_entity/entityfields/currency/displayValueProcess.js b/entity/Order_entity/entityfields/currency/displayValueProcess.js
index 2519786ebebdab4dd7112825bf47108ea7110ead..76d0d8a1e703554cba1c6987434ff62990691e36 100644
--- a/entity/Order_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/currency/displayValueProcess.js
@@ -1,9 +1,10 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-if (vars.exists("$param.OrderCurrency_param")) 
-{
-    var currency = KeywordUtils.getViewValue($KeywordRegistry.get.Currency, vars.get("$param.OrderCurrency_param"));
-    result.string(currency);
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+if (vars.exists("$param.OrderCurrency_param")) 
+{
+    var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OrderCurrency_param"));
+    result.string(currency);
 }
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/image/valueProcess.js b/entity/Order_entity/entityfields/image/valueProcess.js
index 52a10cb1a727f778872eb03f08ab872da81a39f5..c02371b12bec59c4dcc278169f2d08c6fb919cc0 100644
--- a/entity/Order_entity/entityfields/image/valueProcess.js
+++ b/entity/Order_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.SalesorderState, vars.getString("$field.STATUS")) );
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.getString("$field.STATUS")) );
diff --git a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
index 0ef9cd25651259dd176ac538fd5ef7a4cdc00935..4c7780fc3a92a387ce3420c577290d3fc22221a6 100644
--- a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+++ b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
+result.string($KeywordRegistry.currency());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js b/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
index cd95c55b921c762bde79bfc52f9c5acfc3a68d96..21e1ac4efb78a649858f36b6f7cdffbd30509e2c 100644
--- a/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
+++ b/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.SalesorderState);
\ No newline at end of file
+result.string($KeywordRegistry.salesorderState());
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
index 260c4da2e24cd277de2bb10d2c4fb3599be84484..96a20903efbd23dc29c8dac4a97c46c2fe6d3c88 100644
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "SALESORDER.CURRENCY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "SALESORDER.CURRENCY");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 57efdee546910fa235465b3c90280d5bd3958591..f2b9a0bfd51ec122ed45118cc0db8673efa32eb4 100644
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesorderState, "SALESORDER.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS");
 result.string(sql);
diff --git a/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa93d73a75f71c79affa7b02d47668e3..0881ceab5803df2043bdf3ca34277137e48b6a6b 100644
--- a/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
index c21537814b1655b685387ba0a608f116ddee21ad..116859e4d94e5bae0bce9983a85ffad7b392cba1 100644
--- a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+++ b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
index c9ff4dc3eedebfc89ba5d92a7fc2bb59772bb260..98962fe2604eef91a87d6c0717360b8a5268165d 100644
--- a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESORDERITEM.GROUPCODEID");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESORDERITEM.GROUPCODEID");
 result.string(sql);
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
index 23be3ff92aaa59d8cb08b9c43c150ea4f823c8eb..8df589a2cc9f62b8d471a8c982c1eeb9886ed823 100644
--- a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "SALESORDERITEM.UNIT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "SALESORDERITEM.UNIT");
 result.string(sql);
diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
index e01caa2834a6c1d27a619ea582b50f8a52f22494..2f4d03edea3a8ff7253f793a4c8a3585f03db848 100644
--- a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ContactStatus);
\ No newline at end of file
+result.string($KeywordRegistry.contactStatus());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js
index 06fbc3ebbb1a587f502d8f5e885ceb4b6e6c34ed..9f418ef99a76f73e9ce0e06b98eb299c5431d63c 100644
--- a/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.OrganisationType);
+result.string($KeywordRegistry.organisationType());
diff --git a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
index 164f16fcc53184600073169dd821faa55a3065ff..a76a727534152d479a8b4cbef548371ef4224dc0 100644
--- a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPricePolitics);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
index 9688e9d0a754f99651c2a111b61da316a9985c20..cae1ead3876117be7f9a2c2be4fcc91f3f3b5964 100644
--- a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectStrenght);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
index 924004e96f5e1cd0dd125b3f13fedb1b2a7caeb1..9973fed72b013f63d5400a1bd09de489911df93c 100644
--- a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectWeakness);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectWeakness());
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
index 2b241686b07844ade69d98f75b616615da5b640e..d352cbd476f1f9c7225a6d4e287f254d0478fb4b 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPricePolitics, "ORGANISATION.PRICE_POLITICS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPricePolitics(), "ORGANISATION.PRICE_POLITICS");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index c831d8b5a5dd945d8017287b41e1577f12407430..b63b2d57742bc29e8f35acd8bae539ec0a560c9c 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContactStatus, "CONTACT.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contactStatus(), "CONTACT.STATUS");
 result.string(sql);
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
index 622c9e2e8e7a2129a12cd32045d0946fc1abd5da..0071a532b7942b287c869f4eaef13c430b057297 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectStrenght, "ORGANISATION.STRENGTH");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectStrenght(), "ORGANISATION.STRENGTH");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index 619878d59fb73109a10f794c87ab9932d039091d..2265271d80a155d2600e0f2fc2e423ed391d985c 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OrganisationType, "ORGANISATION.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.organisationType(), "ORGANISATION.TYPE");
 result.string(sql);
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
index 5eed0cbf94ccf6d26e9d0b1bc397dab84bf9e705..1f3ec844e7b00069d9f8bb49e3f1842402b71bdd 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js b/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
index 2ebed5250dcf6d888af8a86154f7bf70893866f3..2a130b4196c03f8f085c36d26f4428d2ac706e54 100644
--- a/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
+++ b/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.PersonGender);
+result.string($KeywordRegistry.personGender());
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
index e6d8ad46e0f687fbab7d9c4dd23d39e1b3520112..2ca5eb7d19351645ff25822e2ab91a43713853bd 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.PersonGender, "PERSON.GENDER");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.personGender(), "PERSON.GENDER");
 result.string(sql);
diff --git a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js
index 72863229e5c11a62175f7a3cfb2f9b5d809329b7..dbfb722d579ddde54ef73f90ebddc2c4269c6b25 100644
--- a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js
+++ b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js
@@ -4,6 +4,7 @@ import("system.db");
 import("system.neon");
 import("Keyword_lib");
 import("Product_lib");
+import("KeywordRegistry_basic");
 
 var condition = "";
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
@@ -23,7 +24,7 @@ var prods = db.table("select PRODUCTID, GROUPCODEID, PRODUCTNAME, PRODUCTCODE fr
 var res = [];
 for(var i = 0; i < prods.length; i++)
 {
-    res.push([prods[i][0], KeywordUtils.getViewValue($KeywordRegistry.get.ProductGroupcode, prods[i][1]) + " / " + prods[i][2] + " / " + prods[i][3]]);
+    res.push([prods[i][0], KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), prods[i][1]) + " / " + prods[i][2] + " / " + prods[i][3]]);
 }
 
 result.object(res);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa93d73a75f71c79affa7b02d47668e3..0881ceab5803df2043bdf3ca34277137e48b6a6b 100644
--- a/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
index c21537814b1655b685387ba0a608f116ddee21ad..116859e4d94e5bae0bce9983a85ffad7b392cba1 100644
--- a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+++ b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
index f2dc803438076d35d0d9581bee0c37b5e398fe86..80b33bbf4ed76dec940817aee09916a9b15606fa 100644
--- a/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
+++ b/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "PRODUCT.GROUPCODEID");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "PRODUCT.GROUPCODEID");
 result.string(sql);
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
index 9a7de9042791562aedb9b712ca1d33064fcaa735..fbb5feb156534fdc53f23a8bc38714b1f9313133 100644
--- a/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
+++ b/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "PRODUCT.UNIT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "PRODUCT.UNIT");
 result.string(sql);
diff --git a/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
index 0ef9cd25651259dd176ac538fd5ef7a4cdc00935..4c7780fc3a92a387ce3420c577290d3fc22221a6 100644
--- a/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+++ b/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
+result.string($KeywordRegistry.currency());
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js b/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
index df8bbcf76e52f919af02a749a9d69f4021de2d5c..bdea9310b4cabba5b587c62ecfe4c466c3dc4948 100644
--- a/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
+++ b/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ProductPricelist);
+result.string($KeywordRegistry.productPricelist());
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
index 6cefa2f3b98461559313664013fb6a85ec05cc12..49249021849c167d7ff0fb0b3cea9389f042150c 100644
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "PRODUCTPRICE.CURRENCY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "PRODUCTPRICE.CURRENCY");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
index 2b365d5dbf8cb91f79bdd4587a481862f0fe5b1d..e83ab1dfc880532cf6bcd1dcbaa3e8a0e49affa3 100644
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductPricelist, "PRODUCTPRICE.PRICELIST");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productPricelist(), "PRODUCTPRICE.PRICELIST");
 result.string(sql);
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
index e8da600c125b86a957641c45b60d852b15cd5d93..0fda06efff26a459feed87a3433a92ff99b14171 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPhase);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
index 164f16fcc53184600073169dd821faa55a3065ff..a76a727534152d479a8b4cbef548371ef4224dc0 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPricePolitics);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
index 9688e9d0a754f99651c2a111b61da316a9985c20..cae1ead3876117be7f9a2c2be4fcc91f3f3b5964 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectStrenght);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
index 5eed0cbf94ccf6d26e9d0b1bc397dab84bf9e705..1f3ec844e7b00069d9f8bb49e3f1842402b71bdd 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js
index b855b77f902b216254400e1e637a73c0b5ef24e7..cbd1c681941578fe0b1e5234bd3c80837eaaae0a 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.SalesprojectWonLost);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectWonLost());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
index 2b241686b07844ade69d98f75b616615da5b640e..d352cbd476f1f9c7225a6d4e287f254d0478fb4b 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPricePolitics, "ORGANISATION.PRICE_POLITICS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPricePolitics(), "ORGANISATION.PRICE_POLITICS");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
index 622c9e2e8e7a2129a12cd32045d0946fc1abd5da..0071a532b7942b287c869f4eaef13c430b057297 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectStrenght, "ORGANISATION.STRENGTH");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectStrenght(), "ORGANISATION.STRENGTH");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
index 5eed0cbf94ccf6d26e9d0b1bc397dab84bf9e705..1f3ec844e7b00069d9f8bb49e3f1842402b71bdd 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
index 2a00ab72fd1fe8804847ae5a2cddb88afceb1d77..09107aba69570d4b7cdc97c6e6eee0b76c93c11a 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPhase, "SALESPROJECT.PHASE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT.PHASE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
index f3ca32ff036d770ee78a7319a9ff54545559237e..588db217f864d270398ee0f75c43b0acc6d78b80 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWonLost, "SALESPROJECT_COMPETITION.REASON");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWonLost(), "SALESPROJECT_COMPETITION.REASON");
 result.string(sql);
diff --git a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa93d73a75f71c79affa7b02d47668e3..0881ceab5803df2043bdf3ca34277137e48b6a6b 100644
--- a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js b/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
index a381b5188c60a12cd0ab9536bc3671e6e482f245..a2590bfa96fa9edd3731fa755fea15389de5dfac 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
+++ b/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESPROJECT_FORECAST.GROUPCODE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESPROJECT_FORECAST.GROUPCODE");
 result.string(sql);
diff --git a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
index fcae12d10e03c0391978172ff2bb8dc16ea1f269..7042000352a08048c56df02c22a9a1af2b70830d 100644
--- a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
+++ b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.SalesprojectMemberRole);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectMemberRole());
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
index c336643dcfcb147d5f27c04dceeca3cc0f453354..18c379f40354d3845c0987ffe926f7e9f0631476 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectMemberRole, "SALESPROJECT_MEMBER.SALESPROJECT_ROLE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectMemberRole(), "SALESPROJECT_MEMBER.SALESPROJECT_ROLE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
index 5cda1338b7ac02d7d8c721e7b90d0a30d562b9f0..c2806676a54f2d6c4dd76dd80551413e4ef9cc2a 100644
--- a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
+++ b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.SalesprojectSource);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectSource());
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
index 940b47fc5de9a42dcf39ae8e35566585cc91d4be..78804de15943f7f1439549a5854d5d04f8918da6 100644
--- a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectSource, "SALESPROJECT_SOURCE.SOURCE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectSource(), "SALESPROJECT_SOURCE.SOURCE");
 result.string(sql);
diff --git a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
index 4463ef92a8dcc4301c23d3e50d69e6a207c774ad..148aaa91247ddc35cef8d361cb890735366d75b6 100644
--- a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectEstimation);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectEstimation());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
index e8da600c125b86a957641c45b60d852b15cd5d93..0fda06efff26a459feed87a3433a92ff99b14171 100644
--- a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPhase);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js
index 4eecf47c8cf65b769844277ca6d404f996267724..6ca842dd15dc19ccf7e8af70272fabaee25756af 100644
--- a/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.SalesprojectProbability);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectProbability());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
index 87fd3dd173cdd9bd3e1b086108fe1a60bc5f5259..9604353462b5f896fe861ef98813706bc705a3e7 100644
--- a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectState);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectState());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
index 4b115fd11659f1f86fe6b616f03dbf249c1c2903..eb8f932fddcd182a6256f4e7eb337a3f44884718 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectEstimation, "SALESPROJECT.ESTIMATIONVALUE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
index 2a00ab72fd1fe8804847ae5a2cddb88afceb1d77..09107aba69570d4b7cdc97c6e6eee0b76c93c11a 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPhase, "SALESPROJECT.PHASE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT.PHASE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
index a5769eccec40249640f8612dacb4ecede39106f4..f5ef49dc97e054a1378a98f5cf434622dd068c45 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectProbability, "SALESPROJECT.PROBABILITY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectProbability(), "SALESPROJECT.PROBABILITY");
 result.string(sql);
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
index 3760bf66522240508659d3518aaab608058fa7e6..fd49eda303bdc422d288bacde15a4d61683cdd3c 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectState, "SALESPROJECT.STATE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "SALESPROJECT.STATE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js b/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js
index e26a2604ef40955c2d68108716f127bf8290cbe3..96b4ada951a400b65e3e56e0885a3f0d196db22c 100644
--- a/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js
+++ b/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.StockWarehouse);
\ No newline at end of file
+result.string($KeywordRegistry.stockWarehouse());
\ No newline at end of file
diff --git a/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js b/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js
index ffecade2a1ac4c81cf347c212c9acb30314ade74..4ff8fe23b40a4838516cfa85e441e852d8b4970e 100644
--- a/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js
+++ b/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.StockWarehouse, "STOCK.WAREHOUSE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.stockWarehouse(), "STOCK.WAREHOUSE");
 result.string(sql);
diff --git a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
index 875229a98771a9c1766eefd2c8cbbf168a3b78b5..8a4cee16039670b6963ac6920a03a81bf1a8ad43 100644
--- a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
+++ b/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.TaskPriority);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js
index 580aeb3de0aefd7c19493d577f9c2128fbbc70d1..729ee3d1884b9c7884bcbb920f3f9c4f5c54738a 100644
--- a/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js
+++ b/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.TaskStatus);
\ No newline at end of file
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js
index 45a01452c07d95ae93a3fe02d862477270852e1e..308d10e96440d31d0a01fc030db90ecf88ff9350 100644
--- a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js
+++ b/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.get.TaskType);
\ No newline at end of file
+result.string($KeywordRegistry.taskType());
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
index b1416e0d693943c2e5f0f6cc5c02d4c89c0689a1..0b2c6568c32b748a32d429eddffbc29e9f24d980 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskPriority, "TASK.PRIORITY");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskPriority(), "TASK.PRIORITY");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 4af15e0ec64815e204b045a8ba800de3847f2342..30eb95f58808f11dcc55f47d69c83025233fe2db 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskStatus, "TASK.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskStatus(), "TASK.STATUS");
 result.string(sql);
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index a0b8bddfdcbd1c4f834335de9e052af44a0e4f3b..8f9ef6854e6d5c7f94f11bd1eec4865d67074b17 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -1,5 +1,6 @@
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskType, "TASK.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskType(), "TASK.TYPE");
 result.string(sql);
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index 74fa0b796d49d26a64f3dc1afebdec42fa58ec9d..5e172901d9f8b0a4a4585865f37490c6b1656b4e 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -7,6 +7,7 @@ import("system.translate");
 import("Data_lib");
 import("Keyword_lib");
 import("Money_lib");
+import("KeywordRegistry_basic");
 
 var turnoverCategory = translate.text('Turnover');
 var forecastCategory = translate.text('Forecast');
@@ -14,13 +15,13 @@ var forecastCategory = translate.text('Forecast');
 // load data
 var sumOfMonthTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, sum(NET + VAT) from SALESORDER group by year(SALESORDERDATE), month(SALESORDERDATE) order by yearNum, monthNum");
 var sumOfMonthForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, sum(VOLUME * 1000) from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START) order by yearNum, monthNum");
-var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESORDERITEM.GROUPCODEID") + ") \n\
+var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESORDERITEM.GROUPCODEID") + ") \n\
                                             from SALESORDER \n\
                                             join SALESORDERITEM on SALESORDERITEM.SALESORDER_ID = SALESORDER.SALESORDERID \n\
                                             where SALESORDERITEM.OPTIONAL <> 1 \n\
                                             group by year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE \n\
                                             order by yearNum, monthNum");                  //           V--V--> there is no VAT/Discount in forecasts  V-----> forecasts are grouped by grupcode and have always quantity 1
-var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000),                      1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
+var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000),                      1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
 
 // build chartData
 var rootNode = "";
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index a141d5584656b0b0c04064bf1ca47762311946ee..ce5e562a291f0b76d4c96c392579d53cd38bbbf0 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -1,4 +1,3 @@
-
 /**
  * provides static functionality for a registry of keywords
  * The main reason for this is a convenient usage within jdito-code (autocomplete)
@@ -39,4 +38,15 @@ $KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource"};
 $KeywordRegistry.salesorderState = function(){return "SalesorderState"};
 $KeywordRegistry.salesprojectWonLost = function(){return "SalesprojectWonLost"};
 $KeywordRegistry.stockWarehouse = function(){return "StockWarehouse"};
-$KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability"};
\ No newline at end of file
+$KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability"};
+$KeywordRegistry.activityCategory = function(){return "ActivityCategory"};
+$KeywordRegistry.addressType = function(){return "AddressType"};
+$KeywordRegistry.offerProbability = function(){return "OfferProbability"};
+$KeywordRegistry.communicationMedium = function(){return "CommunicationMedium"};
+$KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics"};
+$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness"};
+$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"};
+$KeywordRegistry.salesprojectEstimation = function(){return "SalesprojectEstimation"};
+$KeywordRegistry.salesprojectState = function(){return "SalesprojectState"};
+$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"};
+$KeywordRegistry.taskPriority = function(){return "TaskPriority"};
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 716a56fb2ae06122dde7cf8903132805185f100f..fac87a5a41c758ad886812fb8ad124640a534e9d 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -14,6 +14,7 @@ import("Report_lib");
 import("OfferOrder_lib");
 import("PostalAddress_lib");
 import("Neon_lib");
+import("KeywordRegistry_basic");
 
 /**
  * Methods used by Offer.
@@ -190,7 +191,7 @@ OfferUtils.openOfferReport = function(pOfferID)
             row[25], //offercode
             text.formatDouble(row[26], translate.text("#,##0.00"), true),    //vat
             text.formatDouble(itemSum, translate.text("#,##0.00"), true),    //itemsum
-            KeywordUtils.getViewValue($KeywordRegistry.get.QuantityUnit, row[19]) //unittext
+            KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), row[19]) //unittext
         ];
     });
     
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 793d7d0ecd7b102a8129224553d64550e086a057..4eb2065194eef9d9bdbc4db00a7faf6561db38cb 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -6,6 +6,7 @@ import("Report_lib");
 import("Sql_lib");
 import("Keyword_lib");
 import("PostalAddress_lib");
+import("KeywordRegistry_basic");
 
 /**
  * a static Utility class for the Org context.
@@ -151,7 +152,7 @@ OrgUtils.openOrgReport = function(pOrgId)
     
     taskData.forEach(function (row) 
     {
-        row[2] = KeywordUtils.getViewValue($KeywordRegistry.get.TaskStatus, row[2]);
+        row[2] = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), row[2]);
         _joinArrayVals(row, 3, 2); //join FIRSTNAME and LASTNAME together
     });
     taskData = ReportData.begin(["SUBJECT", "INFOTEXT", "STATUS", "RESPONSIBLE"]).add(taskData);