diff --git a/entity/DSGVOInfo_entity/entityfields/datedeadline/mandatoryProcess.js b/entity/DSGVOInfo_entity/entityfields/datedeadline/mandatoryProcess.js
index 0543f4ceb723c217a081276a676b12f71015c5eb..324b330151fbc1a9bd48a07869aaaeb072c39e43 100644
--- a/entity/DSGVOInfo_entity/entityfields/datedeadline/mandatoryProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/datedeadline/mandatoryProcess.js
@@ -3,4 +3,4 @@ import("KeywordRegistry_basic");
 import("system.vars");
 import("system.result");
 
-result.object(vars.get("$param.ReportType_param") == DataPrivacyUtils.DisclosureReportName() && vars.get("$field.deadline") != "" && vars.get("$field.deadline") != $KeywordRegistry.DSGVODeadline$onTime());
\ No newline at end of file
+result.object(vars.get("$param.ReportType_param") == DataPrivacyUtils.DisclosureReportName() && vars.get("$field.deadline") != "" && vars.get("$field.deadline") != $KeywordRegistry.dsgvoDeadline$onTime());
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/entityfields/datedeadline/stateProcess.js b/entity/DSGVOInfo_entity/entityfields/datedeadline/stateProcess.js
index 3c440e90a8eddadd305813732e4b7436760889b1..9d141f7f4915fda4c7a59915152d1ecb5ac55d0d 100644
--- a/entity/DSGVOInfo_entity/entityfields/datedeadline/stateProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/datedeadline/stateProcess.js
@@ -6,7 +6,7 @@ import("KeywordRegistry_basic");
 
 if (vars.get("$param.ReportType_param") == DataPrivacyUtils.DisclosureReportName())
 {
-    if (vars.get("$field.deadline") && vars.get("$field.deadline") != $KeywordRegistry.DSGVODeadline$onTime())
+    if (vars.get("$field.deadline") && vars.get("$field.deadline") != $KeywordRegistry.dsgvoDeadline$onTime())
         result.string(neon.COMPONENTSTATE_EDITABLE);
     else
         result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js b/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
index 241f74778cc9673531a9d60b5ead573c7d75ec23..e140a66ed292bb53fa196996a562b4665d68a5cc 100644
--- a/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
+++ b/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
@@ -2,7 +2,7 @@ import("KeywordRegistry_basic");
 import("system.vars");
 import("system.neon");
 
-if (vars.get("$this.value") == $KeywordRegistry.DSGVODeadline$onTime())
+if (vars.get("$this.value") == $KeywordRegistry.dsgvoDeadline$onTime())
 {
     neon.setFieldValues({
         "$field.dateDeadline": ""
diff --git a/entity/DSGVOInfo_entity/entityfields/garantee/mandatoryProcess.js b/entity/DSGVOInfo_entity/entityfields/garantee/mandatoryProcess.js
index 4b8d2f2f16acb0781b96a2258e13774a7ddc930e..3d5236a0fbf1f2a9917d615b3cedb3065923acb4 100644
--- a/entity/DSGVOInfo_entity/entityfields/garantee/mandatoryProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/garantee/mandatoryProcess.js
@@ -3,5 +3,5 @@ import("system.vars");
 import("system.neon");
 import("KeywordRegistry_basic");
 
-result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none() 
-           && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$inland());
\ No newline at end of file
+result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none() 
+           && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$inland());
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/entityfields/garantee/stateProcess.js b/entity/DSGVOInfo_entity/entityfields/garantee/stateProcess.js
index 8dc37099f20a895a20ec9d7defbfdd00f20308d0..455b4fa0533358440a7f68532ce82dbfe1b4b082 100644
--- a/entity/DSGVOInfo_entity/entityfields/garantee/stateProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/garantee/stateProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 import("system.neon");
 import("KeywordRegistry_basic");
 
-if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none() && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$inland())
+if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none() && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$inland())
 {
     result.string(neon.COMPONENTSTATE_EDITABLE);
 }
diff --git a/entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js b/entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js
index cdbc336e4ae7c15b04c521b1ec0a4f2015d24490..6301513a9df9cb9e2eb6b385b800fb48a6e54659 100644
--- a/entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("KeywordRegistry_basic");
 import("system.result");
 
-result.string($KeywordRegistry.DSGVOGuarantee());
\ No newline at end of file
+result.string($KeywordRegistry.dsgvoGuarantee());
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/entityfields/recipient/mandatoryProcess.js b/entity/DSGVOInfo_entity/entityfields/recipient/mandatoryProcess.js
index 4f7af0e1dab1d69cc1579f04f09e7e4da0bbb784..de3c08140ff329c4580823e74d7d41e991695ca8 100644
--- a/entity/DSGVOInfo_entity/entityfields/recipient/mandatoryProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/recipient/mandatoryProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.neon");
 import("KeywordRegistry_basic");
 
-result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none());
\ No newline at end of file
+result.object(vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none());
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/entityfields/recipient/stateProcess.js b/entity/DSGVOInfo_entity/entityfields/recipient/stateProcess.js
index 6a3687894cb27fe68eac6a23e9774562a298552b..756911b924bab101ee9dfab8743ab1b990c82b33 100644
--- a/entity/DSGVOInfo_entity/entityfields/recipient/stateProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/recipient/stateProcess.js
@@ -4,7 +4,7 @@ import("system.vars");
 import("system.neon");
 import("KeywordRegistry_basic");
 
-if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.DSGVOTransmission$none())
+if (vars.get("$field.TRANSMISSION") && vars.get("$field.TRANSMISSION") != $KeywordRegistry.dsgvoTransmission$none())
 {
     result.string(neon.COMPONENTSTATE_EDITABLE);
 }
diff --git a/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js b/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
index 031834e9c654cf7f3e6ddbeb9b814dc655ceb95e..e18fabe80d94934695e3f3fe46ffdd18d631ef15 100644
--- a/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
+++ b/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
@@ -2,7 +2,7 @@ import("KeywordRegistry_basic");
 import("system.vars");
 import("system.neon");
 
-if (vars.get("$this.value") == $KeywordRegistry.DSGVOTransmission$none())
+if (vars.get("$this.value") == $KeywordRegistry.dsgvoTransmission$none())
 {
     neon.setFieldValues({
         "$field.RECIPIENT": "",
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
index aab9432c45b93a49745bde854bfdcfada816331c..b51d9069c3f21fd773d59657203ad8d3f6bd4928 100644
--- a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
+++ b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOGuarantee(), "DSGVOINFO.GUARANTEE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoGuarantee(), "DSGVOINFO.GUARANTEE");
 result.string(sql);
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
index 7c9e6a4cde65ad274be90f7d4c76e0f12128379d..1cd3f3f3f243503eed32b959c33a61c46004d277 100644
--- a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
+++ b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOTransmission(), "DSGVOINFO.TRANSMISSION");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoTransmission(), "DSGVOINFO.TRANSMISSION");
 result.string(sql);
diff --git a/entity/DSGVO_entity/entityfields/dsgvotype/displayValueProcess.js b/entity/DSGVO_entity/entityfields/dsgvotype/displayValueProcess.js
index 952ed787e8168e45e8e294a26865f5ef569b78b7..72549ead1c6c1898f7c35f84a8abb36ce4595ccf 100644
--- a/entity/DSGVO_entity/entityfields/dsgvotype/displayValueProcess.js
+++ b/entity/DSGVO_entity/entityfields/dsgvotype/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.result");
 import("Keyword_lib");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), vars.get("$this.value")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoType(), vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js b/entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js
index 245270971322b851dd24f308b377c949d6d9f5ec..e3137fa5ae698c33c827d9c4ccb8cc67ec9b66e9 100644
--- a/entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js
+++ b/entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.DSGVOPurpose());
\ No newline at end of file
+result.string($KeywordRegistry.dsgvoPurpose());
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js b/entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js
index 37e7e4c7585ce1bb27218e08d6dd94e1f7a6c94b..a777c1ebc111b9c6e9954a7fe8a6b4433d030c90 100644
--- a/entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js
+++ b/entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.DSGVOStatuoritysource());
\ No newline at end of file
+result.string($KeywordRegistry.dsgvoStatuoritysource());
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js b/entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js
index 55a2d94f1039eff44d908d07fb958802af38838b..6cdce1d4579b3a930a63906ca3cbee9d9fdb157e 100644
--- a/entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js
+++ b/entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.DSGVOType());
\ No newline at end of file
+result.string($KeywordRegistry.dsgvoType());
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/purpose/displayValueProcess.js b/entity/DSGVO_entity/entityfields/purpose/displayValueProcess.js
index 473d70c8e03baf65b05ffba822df0ac500c35ba4..ceb809e9d48aabd0515af5c96fbca913074bf6a0 100644
--- a/entity/DSGVO_entity/entityfields/purpose/displayValueProcess.js
+++ b/entity/DSGVO_entity/entityfields/purpose/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("KeywordRegistry_basic");
 import("Keyword_lib");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOPurpose(), vars.get("$field.PURPOSE")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoPurpose(), vars.get("$field.PURPOSE")));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/statuoritysource/displayValueProcess.js b/entity/DSGVO_entity/entityfields/statuoritysource/displayValueProcess.js
index 50071f1e659a6419aa90ab0ddc429b2769076fa7..e7e44596afa069231ec41a7611b9ba921731a3b9 100644
--- a/entity/DSGVO_entity/entityfields/statuoritysource/displayValueProcess.js
+++ b/entity/DSGVO_entity/entityfields/statuoritysource/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("KeywordRegistry_basic");
 import("Keyword_lib");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOStatuoritysource(), vars.get("$field.STATUORITYSOURCE")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoStatuoritysource(), vars.get("$field.STATUORITYSOURCE")));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/value/contentTypeProcess.js b/entity/DSGVO_entity/entityfields/value/contentTypeProcess.js
index a96c4d2059fdbcbdb397571422b72ed8da12e7a0..44303ce0e65c86bb9393acd43a152fd9c7abc6c5 100644
--- a/entity/DSGVO_entity/entityfields/value/contentTypeProcess.js
+++ b/entity/DSGVO_entity/entityfields/value/contentTypeProcess.js
@@ -8,7 +8,7 @@ import("system.neon");
 logging.log(vars.get("$field.DSGVOTYPE"));
 switch (vars.get("$field.DSGVOTYPE").trim())
 {
-    case $KeywordRegistry.DSGVOType$birth().trim():
+    case $KeywordRegistry.dsgvoType$birth().trim():
         result.string("DATE");
         break;
     default:
diff --git a/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js b/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js
index 91a2439d76a87078fe11b740c5972d3f8e5c395b..db82774a9ad18f9e15e0735707fb6cfe524afd1c 100644
--- a/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js
@@ -15,7 +15,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
         vars.get("$field.ROW_ID"), vars.get("$sys.date"), vars.get("$field.TABLENAME"),
         null,  KeywordUtils. vars.get("$field.RIGHT").valueOf(), vars.get("$field.VALID_TO"), 
         vars.get("$field.CONTACT_ID"), vars.get("$field.USE").valueOf()];
-    // KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOUse(), "DSGVO.USE");
+    // KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoUse(), "DSGVO.USE");
     db.insertData("DSGVO", cols, null, vals);
 }
 
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index fc346ec79514df986c04287f19d801887d494947..78656bb581dc27cb7908a9dc6b0a3e6115e8f83d 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -222,7 +222,7 @@ DataPrivacyUtils.getDSGVO = function(pContactId, pFilterCond)
                     "DATE_EDIT," +             // 9
                     "USER_NEW," +              // 10
                     "USER_EDIT, " +            // 11
-                    KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOType(), "DSGVOTYPE") // 12 - dsgvotype-displayvalue
+                    KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoType(), "DSGVOTYPE") // 12 - dsgvotype-displayvalue
 
     
     var data = db.table(cond.buildSql("select " + select + " from DSGVO", "1 = 2"));
@@ -296,7 +296,7 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
                     "",             // "DATE_EDIT," +             // 9
                     currentUser,    // "USER_NEW," +              // 10
                     "",             // "USER_EDIT "               // 11
-                    KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), StringUtils.toChar36(dsgvotype.key)), // 12
+                    KeywordUtils.getViewValue($KeywordRegistry.dsgvoType(), StringUtils.toChar36(dsgvotype.key)), // 12
                 ])
             }
         });
@@ -354,10 +354,10 @@ DataPrivacyUtils.dataForExport = function(pContactId, pLocale)
         var dsgvotype = DataPrivacyType.get(pRow.DSGVOTYPE);
         
         var newRow = [
-            KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), pRow.DSGVOTYPE, pLocale),
+            KeywordUtils.getViewValue($KeywordRegistry.dsgvoType(), pRow.DSGVOTYPE, pLocale),
             (dsgvotype.formatAsDate ?  datetime.toDate(pRow.VALUE, translate.text("dd.MM.yyyy", pLocale), "UTC") : pRow.VALUE),
-            KeywordUtils.getViewValue($KeywordRegistry.DSGVOStatuoritysource(), pRow.STATUORITYSOURCE, pLocale),
-            KeywordUtils.getViewValue($KeywordRegistry.DSGVOPurpose(), pRow.PURPOSE, pLocale),
+            KeywordUtils.getViewValue($KeywordRegistry.dsgvoStatuoritysource(), pRow.STATUORITYSOURCE, pLocale),
+            KeywordUtils.getViewValue($KeywordRegistry.dsgvoPurpose(), pRow.PURPOSE, pLocale),
             datetime.toDate(pRow.VALID_TO, translate.text("dd.MM.yyyy", pLocale), "UTC"),
         ];
         
@@ -414,7 +414,7 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
     
     // text for transmission
     var transmission = "";
-    if (pDSGVOInfo.transmission != $KeywordRegistry.DSGVOTransmission$none())
+    if (pDSGVOInfo.transmission != $KeywordRegistry.dsgvoTransmission$none())
     {
         // load recipient // TODO: evtl. put this load entity into lib and use it in all display value processes
         var recipientConfig = entities.createConfigForLoadingRows()
@@ -426,9 +426,9 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
         
         transmission = translate.text("The data is transmitted to the following recipients:", pLocale);
         transmission += " " + pDSGVOInfo.recipient;
-        if (pDSGVOInfo.transmission == $KeywordRegistry.DSGVOTransmission$foreign())
+        if (pDSGVOInfo.transmission == $KeywordRegistry.dsgvoTransmission$foreign())
         {
-            pDSGVOInfo.garantees = KeywordUtils.getViewValue($KeywordRegistry.DSGVOGuarantee(), pDSGVOInfo.garantees, pLocale),
+            pDSGVOInfo.garantees = KeywordUtils.getViewValue($KeywordRegistry.dsgvoGuarantee(), pDSGVOInfo.garantees, pLocale),
             
             transmission += "\n" + translate.text("The transfer of data to recipients located in a third country is based on the following guarantees:", pLocale) 
                           + "\n" + pDSGVOInfo.garantees;
@@ -452,15 +452,15 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
     
     // text for deadline
     var deadline = "";
-    if(pDSGVOInfo.deadline == $KeywordRegistry.DSGVODeadline$onTime())
+    if(pDSGVOInfo.deadline == $KeywordRegistry.dsgvoDeadline$onTime())
         deadline = translate.text("We hereby comply with your request within the statutory period of one month.", pLocale);
     else
     {
         deadline = translate.withArguments("As stated in our letter of %0, we have made use of the possibility to extend the deadline to three months due to %1.",
             [datetime.toDate(pDSGVOInfo.deadlineDate, translate.text("dd.MM.yyyy", pLocale)),
-             (pDSGVOInfo.deadline == $KeywordRegistry.DSGVODeadline$complex() ? translate.text("the high complexity of your application", pLocale) 
+             (pDSGVOInfo.deadline == $KeywordRegistry.dsgvoDeadline$complex() ? translate.text("the high complexity of your application", pLocale) 
                 :
-             (pDSGVOInfo.deadline == $KeywordRegistry.DSGVODeadline$count() ? translate.text("the number of your applications", pLocale) : ""))
+             (pDSGVOInfo.deadline == $KeywordRegistry.dsgvoDeadline$count() ? translate.text("the number of your applications", pLocale) : ""))
             ], pLocale)
     }
     
@@ -613,7 +613,7 @@ DataPrivacyUtils.dsgvoMkDataAnonymous = function(pPersId, pContactId)
             //condition = " CONTACT_ID = '" + pContactId + "' and ADDRESSID = '" + data[i][9] + "' ";
             updArray.push(["ADDRESS", columns, columnTypes, values, condition]);
         }
-        newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), $KeywordRegistry.DSGVOTablename$address()));
+        newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.dsgvoTablename(), $KeywordRegistry.dsgvoTablename$address()));
     }
     
     //Kommunikationsdaten
@@ -637,7 +637,7 @@ DataPrivacyUtils.dsgvoMkDataAnonymous = function(pPersId, pContactId)
             
             updArray.push(["COMM", columns, columnTypes, values, condition]);            
         }
-        newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), $KeywordRegistry.DSGVOTablename$communication()));
+        newAnonymCategories.push(KeywordUtils.getViewValue($KeywordRegistry.dsgvoTablename(), $KeywordRegistry.dsgvoTablename$communication()));
     }
     
     if (updArray.length > 0)
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ae8128a8387ba28060667b5a16fb061aaed9356c..11f8e9dd000f4f85e919f0a2d363bad799c0d199 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -150,22 +150,22 @@ $KeywordRegistry.personGender$other = function(){return "o";};
 
 $KeywordRegistry.permissionCondType = function(){return "PermissionCondType";};
 $KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
-$KeywordRegistry.DSGVOPurpose = function(){return "DSGVOPurpose";};
-$KeywordRegistry.DSGVOStatuoritysource = function(){return "DSGVOStatuoritysource";};
-
-$KeywordRegistry.DSGVOType = function() {return "DSGVOType";};
-$KeywordRegistry.DSGVOType$birth = function() {return "TYPE_BIRTH                          ";};
-
-$KeywordRegistry.DSGVOTransmission = function() {return "DSGVOTransmission";};
-$KeywordRegistry.DSGVOTransmission$none = function() {return   "DSGVONONE                           ";};
-$KeywordRegistry.DSGVOTransmission$inland = function() {return "DSGVOINLAND                         ";};
-$KeywordRegistry.DSGVOTransmission$foreign = function() {return "DSGVOFOREIGN                        ";};
-
-$KeywordRegistry.DSGVODeadline = function() {return "DSGVODeadline";};
-$KeywordRegistry.DSGVODeadline$onTime = function() {return "DSGVOONTIME                         ";};
-$KeywordRegistry.DSGVODeadline$complex = function() {return "DSGVODEADLINECOMPLEX                ";};
-$KeywordRegistry.DSGVODeadline$count = function() {return "DSGVODEADLINECOUNT                  ";};
-$KeywordRegistry.DSGVOGuarantee = function() {return "DSGVOGuarantee";};
+$KeywordRegistry.dsgvoPurpose = function(){return "DSGVOPurpose";};
+$KeywordRegistry.dsgvoStatuoritysource = function(){return "DSGVOStatuoritysource";};
+
+$KeywordRegistry.dsgvoType = function() {return "DSGVOType";};
+$KeywordRegistry.dsgvoType$birth = function() {return "TYPE_BIRTH                          ";};
+
+$KeywordRegistry.dsgvoTransmission = function() {return "DSGVOTransmission";};
+$KeywordRegistry.dsgvoTransmission$none = function() {return   "DSGVONONE                           ";};
+$KeywordRegistry.dsgvoTransmission$inland = function() {return "DSGVOINLAND                         ";};
+$KeywordRegistry.dsgvoTransmission$foreign = function() {return "DSGVOFOREIGN                        ";};
+
+$KeywordRegistry.dsgvoDeadline = function() {return "DSGVODeadline";};
+$KeywordRegistry.dsgvoDeadline$onTime = function() {return "DSGVOONTIME                         ";};
+$KeywordRegistry.dsgvoDeadline$complex = function() {return "DSGVODEADLINECOMPLEX                ";};
+$KeywordRegistry.dsgvoDeadline$count = function() {return "DSGVODEADLINECOUNT                  ";};
+$KeywordRegistry.dsgvoGuarantee = function() {return "DSGVOGuarantee";};
 
 $KeywordRegistry.textPlaceholder = function(){return "textPlaceholder";};