diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 76e44c8617ee98456fd3d45a15c8cb972b1d94e7..53eefff3e9a0536965f4a03d72fe853d1d0e2104 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -3,14 +3,14 @@
   <name>Pers_entity</name>
   <title>Contact</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <alias>Data_alias</alias>
+  <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess>
+  <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess>
   <recordContainerType>DB</recordContainerType>
   <caption>Contact</caption>
   <captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess>
   <iconId>VAADIN:USERS</iconId>
   <imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess>
-  <alias>Data_alias</alias>
-  <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess>
-  <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess>
   <entityFields>
     <entityField>
       <name>DATEOFBIRTH</name>
@@ -48,7 +48,6 @@
       <tableName>PERS</tableName>
       <columnName>GENDER</columnName>
       <caption>Gender</caption>
-      <linkedContext>Default_context</linkedContext>
       <outgoingField>PersGender_dfo</outgoingField>
       <possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index b0f2142f63120b471b54bfc6315e1e9844692dc3..473ef689d837b86aee98b7cd8c0d4c1ef1f4c727 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>xRM-Basic-5</projectName>
+  <projectName>xRM-Basic5</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>