diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 98e773860af1ec014b8ecf9bbcab91ff7691021f..1fcaef75b7ca47765c209440bbc722eb830a5d6b 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5957,7 +5957,7 @@
       <descriptionColumn>DESCCOLUMN</descriptionColumn>
       <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
       <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
-      <resultContextNeon>Pers_context</resultContextNeon>
+      <resultContextNeon>Contact_context</resultContextNeon>
       <affectedTables>
         <element>ADDRESS</element>
         <element>COMM</element>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 520211cda6a8a5d8a41811d4909bce0bfdea0f2b..9334e5af6e1e6080c98e5405625ec1b1b43b0614 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -6,7 +6,7 @@
     <node name="CONTACTS" kind="123" title="Contactmanagement">
       <icon>VAADIN:STAR</icon>
       <node name="Group1" kind="123" title="">
-        <node name="Pers_context" kind="10077" />
+        <node name="Contact_context" kind="10077" />
         <node name="Org_context" kind="10077" />
         <node name="Activity_context" kind="10077" />
         <node name="Task_context" kind="10077" />
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
index 637f5c51eb6e418eb58ab19f10307808ddfb7d45..bdf21bff229e2fc53e311e8c33204853247fd7c6 100644
--- a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -1,3 +1,3 @@
 import("system.vars");
 import("system.neon");
-neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
+neon.openContext("Contact_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
index 5b79095577e1ed73ed5e5b97eb4e6eef74cefcbf..13db55b253b42f698a6617a584753c2ec2932a19 100644
--- a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
+++ b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
@@ -1,3 +1,3 @@
 import("system.vars");
 import("system.neon");
-neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null); 
+neon.openContext("Contact_context", "PersEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null); 
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 69802846f926f5b9985384e54d31a7f9d8052c3b..7b4b09176b4c36615593a3fd9678b9c19ef7a174 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -23,7 +23,7 @@
       <name>RELATION_ID</name>
       <title>Person</title>
       <consumer>PersLookup_dfo</consumer>
-      <linkedContext>Pers_context</linkedContext>
+      <linkedContext>Contact_context</linkedContext>
     </entityField>
     <entityField>
       <name>SALESPROJECT_ID</name>
@@ -118,7 +118,7 @@
       <name>PERS_FULL_NAME</name>
       <title>Name</title>
       <consumer>PersSalesprojectMember_dfo</consumer>
-      <linkedContext>Pers_context</linkedContext>
+      <linkedContext>Contact_context</linkedContext>
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 54d1d60df1504bbcac5bdea99e247d09c8d64a2a..99697c470aa3ae758c72c8d25ed93b7b6b7a9b9d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -47,14 +47,14 @@
       <name>REQUESTOR_RELATION_ID</name>
       <title>{$TASK_REQUESTOR}</title>
       <consumer>PersRequestor_dfo</consumer>
-      <linkedContext>Pers_context</linkedContext>
+      <linkedContext>Contact_context</linkedContext>
       <mandatory v="true" />
     </entityField>
     <entityField>
       <name>EDITOR_RELATION_ID</name>
       <title>{$TASK_EDITOR}</title>
       <consumer>PersEditor_dfo</consumer>
-      <linkedContext>Pers_context</linkedContext>
+      <linkedContext>Contact_context</linkedContext>
     </entityField>
     <entityField>
       <name>START_DATE</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 0daec3e216fc2867ed113eba3ca827846f5996e6..55fe3c6efc6598d3057abc1d9b96e178ab178c0d 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -42,7 +42,7 @@
       <name>RELATION_ID</name>
       <title>Creator</title>
       <consumer>TimetrackingPers_dfo</consumer>
-      <linkedContext>Pers_context</linkedContext>
+      <linkedContext>Contact_context</linkedContext>
       <mandatory v="true" />
     </entityField>
     <entityField>
diff --git a/neonContext/Pers_context/Pers_context.aod b/neonContext/Contact_context/Contact_context.aod
similarity index 98%
rename from neonContext/Pers_context/Pers_context.aod
rename to neonContext/Contact_context/Contact_context.aod
index 5a53cd234c30ab2c2f9d033908913bde76db7907..897040a7ae9e46899faeb64489d4026c7f2e0180 100644
--- a/neonContext/Pers_context/Pers_context.aod
+++ b/neonContext/Contact_context/Contact_context.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
-  <name>Pers_context</name>
+  <name>Contact_context</name>
   <title>Contact</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <mainview>PersMain_view</mainview>
diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/PersFilter_view/PersFilter_view.aod
index 78fa4cbc7adcf0e89a332893530287649fe29a97..dc771b721c132492bd4bb0dd2db22a1e50863ad2 100644
--- a/neonView/PersFilter_view/PersFilter_view.aod
+++ b/neonView/PersFilter_view/PersFilter_view.aod
@@ -8,7 +8,7 @@
       <name>AllContactsDashlet</name>
       <title>Contacts</title>
       <description>Show all contacts</description>
-      <fragment>Pers_context/filter</fragment>
+      <fragment>Contact_context/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:users</icon>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 34ae91ccc4bcb403fe4f58f47dde87cc4f28aa5a..1baea5a1e7e495efb073fd095f40be9da3396365 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -52,7 +52,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
     var maskingUtils = new SqlMaskingUtils();
     
     select += "when 'Org_context' then (select \"NAME\" from ORG where ORG.ORGID = " + pRowIdDbField + ") ";
-    select += "when 'Pers_context' then (select " + maskingUtils.concat(["FIRSTNAME", "LASTNAME"]) + " from PERS where PERS.PERSID = " + pRowIdDbField + ") ";
+    select += "when 'Contact_context' then (select " + maskingUtils.concat(["FIRSTNAME", "LASTNAME"]) + " from PERS where PERS.PERSID = " + pRowIdDbField + ") ";
     select += "when 'Activity_context' then (select SUBJECT from ACTIVITY where ACTIVITY.ACTIVITYID = " + pRowIdDbField + ") ";
     select += "when 'Salesproject_context' then (select " + maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]) + " from SALESPROJECT where SALESPROJECT.SALESPROJECTID = " + pRowIdDbField + ") ";
     // TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
diff --git a/process/Relation_lib/process.js b/process/Relation_lib/process.js
index e3dac3e9360959c422e934ec837b82823c9c6c42..c66c485dffa12768d6be9d37b24ad92cac7884ad 100644
--- a/process/Relation_lib/process.js
+++ b/process/Relation_lib/process.js
@@ -146,7 +146,7 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
             return ContextUtils.getContextName("Org_context");
         case 2: // private Pers
         case 3: // Pers
-            return ContextUtils.getContextName("Pers_context");
+            return ContextUtils.getContextName("Contact_context");
         default:
             return "";
     }