diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index e18801ffb9cab3450e4dc8c5dbe77069c76add1b..2adfbf836586ba40322bbdfd1e2d28fb40bff967 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -110,7 +110,7 @@
       </dependencies>
     </entityProvider>
     <entityParameter>
-      <name>RoleTitle_param</name>
+      <name>RoleName_param</name>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
@@ -133,7 +133,7 @@
       </dependency>
     </entityConsumer>
     <entityParameter>
-      <name>EntityTitle_param</name>
+      <name>EntityId_param</name>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
diff --git a/entity/PermissionDetail_entity/contentTitleProcess.js b/entity/PermissionDetail_entity/contentTitleProcess.js
index 327e3f48bfe87797eb4f122b038302ea716de517..4ab83eef7bd698f6e11166a888ecbf502ba578bb 100644
--- a/entity/PermissionDetail_entity/contentTitleProcess.js
+++ b/entity/PermissionDetail_entity/contentTitleProcess.js
@@ -6,18 +6,21 @@ import("system.result");
 
 var res = "";
 var entityName = vars.get("$field.ENTITY");
+var roleName = vars.get("$field.ROLE");
+var accesstype = vars.get("$field.ACCESSTYPE");
+var cond = vars.get("$field.CONDITION");
 var emptyCond = PermissionUtil.getEmptyCondString(entityName);
 
-switch (vars.get("$field.ACCESSTYPE")) {
+switch (accesstype) {
     case "E":
-        if (vars.get("$param.RoleTitle_param") && vars.get("$field.ENTITY") != "") {
-            res += vars.get("$field.ENTITY");
-        } else if (vars.get("$param.EntityTitle_param") && vars.get("$field.ROLE") != "") {
-            res += vars.get("$field.ROLE");
-        } else if (vars.get("$field.ROLE") != "") {
-            res += vars.get("$field.ROLE");
-        } else if (vars.get("$field.ENTITY") != "") {
-            res += vars.get("$field.ENTITY");
+        if (vars.get("$param.RoleName_param") && entityName != "") {
+            res += entityName;
+        } else if (vars.get("$param.EntityId_param") && roleName != "") {
+            res += roleName;
+        } else if (roleName != "") {
+            res += roleName;
+        } else if (entityName != "") {
+            res += entityName;
         }
         break;
     case "R":
@@ -31,8 +34,8 @@ switch (vars.get("$field.ACCESSTYPE")) {
         break;
 }
 
-if (vars.get("$field.ACCESSTYPE") != "E") {
-    if (vars.get("$field.CONDITION") != emptyCond && vars.get("$field.CONDITION") != "") {
+if (accesstype != "E") {
+    if (cond != emptyCond && cond != "") {
         res += " - conditional";
     } else {
         res += " - default";
diff --git a/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js
index d6e5c24e75eed9d70d14526054b11a129a22f83b..9af4d04f98f855a4ac508c84de3efe76fa26ecdc 100644
--- a/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js
@@ -5,8 +5,8 @@ import("system.neon");
 var recordstate = vars.get("$sys.recordstate");
 var entity = "";
 
-if(vars.exists("$param.EntityTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
-    entity = vars.get("$param.EntityTitle_param"); 
+if(vars.exists("$param.EntityId_param") && recordstate == neon.OPERATINGSTATE_NEW) {
+    entity = vars.get("$param.EntityId_param"); 
 } else {
     entity = vars.get("$field.ENTITY");
 }
diff --git a/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js b/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js
index 943bb0881702bf7d6a70344f64c3d99834e6834b..81377c2374ab5fb09010365597bd8ea59d280baf 100644
--- a/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js
@@ -2,7 +2,7 @@ import("system.result");
 import("system.vars");
 import("system.neon");
 
-var entityTitle = vars.get("$param.EntityTitle_param");
+var entityTitle = vars.get("$param.EntityId_param");
 
 if (entityTitle != undefined && entityTitle != null && entityTitle != "") {
     result.string(neon.COMPONENTSTATE_READONLY);
diff --git a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
index d6e5c24e75eed9d70d14526054b11a129a22f83b..9af4d04f98f855a4ac508c84de3efe76fa26ecdc 100644
--- a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
@@ -5,8 +5,8 @@ import("system.neon");
 var recordstate = vars.get("$sys.recordstate");
 var entity = "";
 
-if(vars.exists("$param.EntityTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
-    entity = vars.get("$param.EntityTitle_param"); 
+if(vars.exists("$param.EntityId_param") && recordstate == neon.OPERATINGSTATE_NEW) {
+    entity = vars.get("$param.EntityId_param"); 
 } else {
     entity = vars.get("$field.ENTITY");
 }
diff --git a/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js
index 2451eaf8b61ddfb81691af626c0e388f80b07cc1..dd624541a8d9d3bc51548ef10d3d536cd41f7f4a 100644
--- a/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js
@@ -6,8 +6,8 @@ import("system.neon");
 var recordstate = vars.get("$sys.recordstate");
 var role = "";
 
-if (vars.exists("$param.RoleTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
-    role = vars.get("$param.RoleTitle_param");
+if (vars.exists("$param.RoleName_param") && recordstate == neon.OPERATINGSTATE_NEW) {
+    role = vars.get("$param.RoleName_param");
 } else {
     role = vars.get("$this.value"); // this.value is already role title - role name gets converted to role title in contentProcess
 }
diff --git a/entity/PermissionDetail_entity/entityfields/role/stateProcess.js b/entity/PermissionDetail_entity/entityfields/role/stateProcess.js
index f5fec84a8c27d08002a0d7e50ab9aa4839078944..2a216166d092e128f9b3d2d8f544b6a8c8c7ddad 100644
--- a/entity/PermissionDetail_entity/entityfields/role/stateProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/role/stateProcess.js
@@ -2,7 +2,7 @@ import("system.result");
 import("system.vars");
 import("system.neon");
 
-var roleTitle = vars.get("$param.RoleTitle_param");
+var roleTitle = vars.get("$param.RoleName_param");
 
 if (roleTitle != undefined && roleTitle != null && roleTitle != "") {
     result.string(neon.COMPONENTSTATE_READONLY);
diff --git a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
index 83a1eb4e203e560ee9f4be26a3e1fed3886bbe8e..a085bf7a670d5f99bee99966ea01e134a3af6e8e 100644
--- a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
@@ -6,8 +6,8 @@ import("system.neon");
 var recordstate = vars.get("$sys.recordstate");
 var role = "";
 
-if (vars.exists("$param.RoleTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
-    role = vars.get("$param.RoleTitle_param");
+if (vars.exists("$param.RoleName_param") && recordstate == neon.OPERATINGSTATE_NEW) {
+    role = vars.get("$param.RoleName_param");
 } else {
     role = PermissionUtil.resolveRoleTitle(vars.get("$this.value"));
 }
diff --git a/entity/PermissionDetail_entity/iconIdProcess.js b/entity/PermissionDetail_entity/iconIdProcess.js
index a1d937f1db6a42a70921758a3cf759f1701701ad..a52fc0e601bfdae5f3d3676d6ca0ec9b3e9ceff1 100644
--- a/entity/PermissionDetail_entity/iconIdProcess.js
+++ b/entity/PermissionDetail_entity/iconIdProcess.js
@@ -3,9 +3,9 @@ import("system.result");
 
 switch (vars.get("$field.ACCESSTYPE")) {
     case "E":
-        if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
+        if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
             result.string("VAADIN:CONNECT");
-        } else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
+        } else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
             result.string("VAADIN:USER_CHECK");
         }
         break;
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
index af8f904bf6b375b2f4ffd304214a0879a3f6d5cf..64e6cf96666fb928990c9c5b01372351b4050c4e 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
@@ -52,10 +52,10 @@ else if (entitiesUsePermFlagSet.length > 0)
     querySelect.and(newWhereIfSet("ASYS_PERMISSIONSET.FIELD_ID", fieldsUsePermFlagSet, SqlBuilder.IN(), undefined, alias)
                               .or("FIELD_ID is NULL"));
     
-    if (vars.get("$param.RoleTitle_param")) {
-        querySelect.and("ASYS_PERMISSIONSET.ROLE_ID", "$param.RoleTitle_param")
-    } else if (vars.get("$param.EntityTitle_param")) {
-        querySelect.and("ASYS_PERMISSIONSET.ENTITY_ID", "$param.EntityTitle_param")
+    if (vars.get("$param.RoleName_param")) {
+        querySelect.and("ASYS_PERMISSIONSET.ROLE_ID", "$param.RoleName_param")
+    } else if (vars.get("$param.EntityId_param")) {
+        querySelect.and("ASYS_PERMISSIONSET.ENTITY_ID", "$param.EntityId_param")
     }
     
     // get all permissions which are already in db
@@ -206,7 +206,7 @@ function sortResultsByCondition(a, b) {
 }
 
 function sortResultByTitleAlphabetically(a, b) {
-    if (vars.get("$param.RoleTitle_param")) {
+    if (vars.get("$param.RoleName_param")) {
         if (a[1] < b[1]) return -1;
         if (a[1] > b[1]) return 1;
         return 0;
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index b2006b9d74a349c0fd3b27a7ceca370802b5c8d6..36e70416b835fd711ead67d87f15d54b0cabb3f1 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -57,7 +57,7 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>EntityTitle_param</name>
+          <name>EntityId_param</name>
           <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
@@ -72,7 +72,7 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>EntityTitle_param</name>
+          <name>EntityId_param</name>
           <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index 70dfee92a9a3555047c7503b3f829a8ff6be0df7..f0e8a0786144a64086670e6506476e93f625f4de 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -76,12 +76,12 @@
       </dependencies>
     </entityProvider>
     <entityParameter>
-      <name>RoleTitle_param</name>
+      <name>RoleName_param</name>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
-      <name>EntityTitle_param</name>
+      <name>EntityId_param</name>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
diff --git a/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js b/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js
index 4dc06d1921917b2bf4fbad084eed77af247ba273..5973b8dab2349f1dc0538156f49abdb96e65740e 100644
--- a/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js
+++ b/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js
@@ -2,8 +2,8 @@ import("system.result");
 import("system.vars");
 import("system.translate");
 
-if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
+if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
     result.string(translate.text("Entity"));
-} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
+} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
     result.string(translate.text("Role"));
 }
\ No newline at end of file
diff --git a/entity/PermissionOverview_entity/iconIdProcess.js b/entity/PermissionOverview_entity/iconIdProcess.js
index df51be0f8f1a0e175ed2c78421459b46cc76721d..48a0dccaacf8b151c0628908159a1ad5899e4fa3 100644
--- a/entity/PermissionOverview_entity/iconIdProcess.js
+++ b/entity/PermissionOverview_entity/iconIdProcess.js
@@ -1,8 +1,8 @@
 import("system.vars");
 import("system.result");
 
-if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
+if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
     result.string("VAADIN:CONNECT");
-} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
+} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
     result.string("VAADIN:USER_CHECK");
 }
\ No newline at end of file
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index 293144a2513456337e2e290106ec4020e21269a3..74858275777a3decccb191074f1cf3c611ca0333 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -25,8 +25,8 @@ for each (let entityMetaData in entitiesMetaData) {
 var rolesOrEntitiesSelect = new SqlBuilder(alias).where();
 var rolesOrEntities = [];
 
-if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
-    roleName = vars.getString("$param.RoleTitle_param");
+if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
+    roleName = vars.getString("$param.RoleName_param");
     if (roleName == roleInternalEveryone) {
         var counter = 0;
         for each (let entityUsePermFlagSet in entitiesUsePermFlagSet) {
@@ -39,8 +39,8 @@ if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param"))
     rolesOrEntitiesSelect.select("distinct ASYS_PERMISSIONSET.ENTITY_ID")
         .from("ASYS_PERMISSIONSET")
         .and("ASYS_PERMISSIONSET.ROLE_ID", roleName);
-} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
-    entityName = vars.getString("$param.EntityTitle_param");
+} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
+    entityName = vars.getString("$param.EntityId_param");
     if (PermissionUtil.getNumberOfPermissions(entityName, roleInternalEveryone) == 0) {
         // no permissions for INTERNAL_EVERYONE found -> display X's for all actions
         res.push(["NOREALPERMINDB", roleInternalEveryone, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"]);
@@ -56,9 +56,9 @@ rolesOrEntities = rolesOrEntitiesSelect
 
 var entityPermSetId = "";
 for each (var entry in rolesOrEntities) { // entry contains either a role or an entity, depending on which param exists
-    if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
+    if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
         entityPermSetId = PermissionUtil.getSetRoot(roleName, entry);
-    } else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
+    } else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
         entityPermSetId = PermissionUtil.getSetRoot(entry, entityName);
     }
     var recordPermSetId = newSelect("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", alias)
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index cb7d090b6506b259734f2a52ee4e40639f896c31..06fb910e261a4ad197c5fe4b9bb51a8b77ee4757 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -43,7 +43,7 @@
       <name>TheirPermissions</name>
       <children>
         <entityParameter>
-          <name>RoleTitle_param</name>
+          <name>RoleName_param</name>
           <valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
@@ -57,7 +57,7 @@
       <name>PermissionOverviews</name>
       <children>
         <entityParameter>
-          <name>RoleTitle_param</name>
+          <name>RoleName_param</name>
           <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>