diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4cd0514b5c6a0c530b8a0b928b4942bbf0a38849..414ff2eb81e92fcd7606f0e8d6fe8696cb414819 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1103,8 +1103,8 @@
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
     <entityField>
-      <name>OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+      <name>ORGANISATION_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Organisation_entity/entityfields/objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/objecttype/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6fd625f50dd19ce5a6e0415fdb93a9cd15721001..828766d541a77c594a9f9c4d3daea43416012465 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1267,8 +1267,8 @@
       </children>
     </entityProvider>
     <entityField>
-      <name>OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+      <name>PERSON_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Person_entity/entityfields/objecttype/valueProcess.js b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/objecttype/valueProcess.js
rename to entity/Person_entity/entityfields/person_objecttype/valueProcess.js
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 63fb9474aec50b700fb793b31044b5b3decfd3c2..eca1cae9668a835e0b55987f8baa97f4ed33e1c0 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -21,7 +21,7 @@
     </cardViewTemplate>
     <favoriteViewTemplate>
       <name>Favorite</name>
-      <objectType>OBJECTTYPE</objectType>
+      <objectType>ORGANISATION_OBJECTTYPE</objectType>
       <rowId>#UID</rowId>
       <entityField>#ENTITY</entityField>
       <title>favorites</title>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 17032aac82178b7304d5f61f40f81c6ad94b113a..f0f73a44de57c9a4d23dbb9336ceb3406c99f6f8 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -21,7 +21,7 @@
     </cardViewTemplate>
     <favoriteViewTemplate>
       <name>Favorites</name>
-      <objectType>OBJECTTYPE</objectType>
+      <objectType>PERSON_OBJECTTYPE</objectType>
       <rowId>#UID</rowId>
       <entityField>#ENTITY</entityField>
       <title>favorites</title>