diff --git a/entity/Appointment_entity/entityfields/summary/onValueChange.js b/entity/Appointment_entity/entityfields/summary/onValueChange.js
index 5c77a90fc3af3a8375d03d5fe6e2ca4634f0027a..968228a7cd631a96b8dec4ad234b787d16ac3953 100644
--- a/entity/Appointment_entity/entityfields/summary/onValueChange.js
+++ b/entity/Appointment_entity/entityfields/summary/onValueChange.js
@@ -1,10 +1,10 @@
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-
-
-//var entry = JSON.parse(vars.get("$param.Entry_param"));
-//
-//entry[calendars.SUMMARY] = vars.get("$field.SUMMARY");
-//
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+
+
+//var entry = JSON.parse(vars.get("$param.Entry_param"));
+//
+//entry[calendars.SUMMARY] = vars.get("local.value");
+//
 //neon.setFieldValue("$param.Entry_param", JSON.stringify(entry));
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
index 6991eccc9143e886238cfb6d745e83359814c62e..1a42050e6f2f9a6337de2b1f250623a372de1152 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
@@ -1,7 +1,7 @@
-import("system.vars");
-import("system.neon");
-import("Campaign_lib");
-
-var stepId;
-stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
+import("system.vars");
+import("system.neon");
+import("Campaign_lib");
+
+var stepId;
+stepId = CampaignUtils.getDefaultCampaignStep(vars.get("local.value"));
 neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
index ef4b32c6c5801121bfac2c42c138c3b10ee5d2d9..73033cd7e06fc00bb164ff8920be139478a10057 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
@@ -2,5 +2,5 @@ import("system.neon");
 import("Campaign_lib");
 import("system.vars");
 
-var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
+var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("local.value"));
 neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractend/onValueChange.js b/entity/Contract_entity/entityfields/contractend/onValueChange.js
index 7b6446d1fea311587b24f3b353cb0f3a2ec44904..290f3dbb283c1d89f1add09c6babdced7a4608e7 100644
--- a/entity/Contract_entity/entityfields/contractend/onValueChange.js
+++ b/entity/Contract_entity/entityfields/contractend/onValueChange.js
@@ -2,7 +2,7 @@ import("system.vars");
 import("Util_lib");
 import("Entity_lib");
 
-var cEnd = vars.get("$field.CONTRACTEND");
+var cEnd = vars.get("local.value");
 var cDue = vars.get("$field.CONTRACTDUE");
 
 if (cDue != "" && cDue > cEnd)
diff --git a/entity/Offer_entity/entityfields/status/onValueChange.js b/entity/Offer_entity/entityfields/status/onValueChange.js
index 81a275dcbdee865fbd6796f60354f0a62abbb96a..d06a9e01b5af62f0a0637d6db848cb7a76f626da 100644
--- a/entity/Offer_entity/entityfields/status/onValueChange.js
+++ b/entity/Offer_entity/entityfields/status/onValueChange.js
@@ -2,7 +2,7 @@ import("system.vars");
 import("Offer_lib");
 
 var offerId = vars.getString("$field.OFFERID");
-if (offerId && vars.get("$field.STATUS") == 2 || vars.get("$field.STATUS") == 3 || vars.get("$field.STATUS") == 4)
+if (offerId && vars.get("local.value") == 2 || vars.get("local.value") == 3 || vars.get("local.value") == 4)
 {
     OfferUtils.setSent(offerId);
 }
\ 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 6f96be4201ed5ce7eda37e4f6b7225bd3c07393e..2c2dc40460231b4e6cf5f081f48894856bb4cafc 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -20,7 +20,7 @@ if(pid != "")
     //TODO: loading from db until loading from Consumer is possible.
     var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter, 
             [["info", db.translateStatement(SqlCondition.begin()
-                                  .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_ROWID", "$field.PRODUCT_ID")
+                                  .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_ROWID", "local.value")
                                   .and("DESCRIPTIONTRANSLATION.OBJECT_TYPE = 'Product'")
                                   .andPrepareVars("DESCRIPTIONTRANSLATION.LANG", "$param.Language_param")
                                   .buildSql("(select DESCRIPTION from DESCRIPTIONTRANSLATION", "1=2", ")"))]
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index ff55fb2f6178b863ff7edef2306dccd39c83efaf..fb4e9cd064797fec6328246002ca808c35012d0c 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -32,6 +32,6 @@ var quatity = vars.get("$local.value") ? vars.get("$local.value") : "";
 
 if (parseInt(quatity) <= 0)
 {
-    neon.setFieldValue("$field.QUANTITY", "1");
+    neon.setFieldValue("local.value", "1");
 }
     
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js b/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js
index 972cb181d553b480c039c0d77fca8da35a528c71..c25fdd4accd9b18cf7cce1a8d7c9a0e5ed8e1fb1 100644
--- a/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js
+++ b/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js
@@ -1,4 +1,4 @@
 import("Entity_lib");
 
 // TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.STANDARD_EMAIL_COMMUNICATION");
\ No newline at end of file
+FieldChanges.setChange("local.value");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js b/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js
index 991c92d38d0731524a8de4eb6d0adabb661a71c3..c25fdd4accd9b18cf7cce1a8d7c9a0e5ed8e1fb1 100644
--- a/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js
+++ b/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js
@@ -1,4 +1,4 @@
 import("Entity_lib");
 
 // TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.STANDARD_PHONE_COMMUNICATION");
\ No newline at end of file
+FieldChanges.setChange("local.value");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js b/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js
index 972cb181d553b480c039c0d77fca8da35a528c71..c25fdd4accd9b18cf7cce1a8d7c9a0e5ed8e1fb1 100644
--- a/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js
+++ b/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js
@@ -1,4 +1,4 @@
 import("Entity_lib");
 
 // TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.STANDARD_EMAIL_COMMUNICATION");
\ No newline at end of file
+FieldChanges.setChange("local.value");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js b/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
index 991c92d38d0731524a8de4eb6d0adabb661a71c3..c25fdd4accd9b18cf7cce1a8d7c9a0e5ed8e1fb1 100644
--- a/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
+++ b/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
@@ -1,4 +1,4 @@
 import("Entity_lib");
 
 // TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.STANDARD_PHONE_COMMUNICATION");
\ No newline at end of file
+FieldChanges.setChange("local.value");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/onValueChange.js b/entity/Salesproject_entity/entityfields/state/onValueChange.js
index 509f1db7864bbf1d05e44ad0f040196524f85dc4..2514501632a6280db55f63a847e39b4410daf0fb 100644
--- a/entity/Salesproject_entity/entityfields/state/onValueChange.js
+++ b/entity/Salesproject_entity/entityfields/state/onValueChange.js
@@ -9,7 +9,7 @@ import("system.neon");
 
 if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
 {
-    var state = vars.get("$field.STATE");
+    var state = vars.get("local.value");
 
     // Postponed
     if (state == $KeywordRegistry.salesprojectState$postponed())