diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index a871a2e086082ef38d5d48c7fa6f51af35c60fae..5a3be8bc441a7c7be97e56d8618a0b407e0761b8 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -211,8 +211,8 @@
     <entityProvider>
       <name>AnyObject</name>
       <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>AnyTargetType</targetContextField>
-      <targetIdField>AnyTargetRowid</targetIdField>
+      <targetContextField>AnyObjectType</targetContextField>
+      <targetIdField>AnyObjectRowid</targetIdField>
       <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobject/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -311,15 +311,17 @@
       </children>
     </entityConsumer>
     <entityField>
-      <name>AnyTargetRowid</name>
-      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js</displayValueProcess>
+      <name>AnyObjectRowid</name>
+      <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc</documentation>
+      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjectrowid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
-      <name>AnyTargetType</name>
+      <name>AnyObjectType</name>
+      <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc</documentation>
       <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js</displayValueProcess>
+      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js</displayValueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..29b3c356fb8f351c572ff747316347964f3b279d
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Context_lib");
+
+if (vars.exists("$field.AnyObjectType") && vars.get("$field.AnyObjectType") && vars.exists("$field.AnyObjectRowid") && vars.get("$field.AnyObjectRowid"))
+{
+    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.AnyObjectType"), vars.get("$field.AnyObjectRowid"))));
+}
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..336799b4617739da6a7435355cd9e7bde4e3650f
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc
@@ -0,0 +1,3 @@
+This field is only filled when using the AnyObject Provider.
+
+Calculates the opposite side of the given AnyObject parameters.
diff --git a/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/valueProcess.js
similarity index 100%
rename from entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js
rename to entity/ObjectRelation_entity/entityfields/anyobjectrowid/valueProcess.js
diff --git a/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js
similarity index 53%
rename from entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js
rename to entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js
index f1a57bdf9eb379e0fdf5fc3e450c565e91ca9d58..ca00da6bc37690b86ed4f22e84626869fba6984b 100644
--- a/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js
@@ -2,7 +2,7 @@ import("system.project");
 import("system.result");
 import("system.vars");
 
-if (vars.exists("$field.AnyTargetType") && vars.get("$field.AnyTargetType"))
+if (vars.exists("$field.AnyObjectType") && vars.get("$field.AnyObjectType"))
 {
-    result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.AnyTargetType"))[1]);
+    result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.AnyObjectType"))[1]);
 }
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc b/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fba180b53ae87bb36854010f09dbb75125fd3159
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc
@@ -0,0 +1,3 @@
+This field is only filled when using the AnyObject Provider.
+
+Calculates the opposite side of the given AnyObject parameters.
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js
similarity index 100%
rename from entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js
rename to entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js
diff --git a/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js
deleted file mode 100644
index a99df2a0b5971053ef6aa2b7cd19ea0f40d97522..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Context_lib");
-
-if (vars.exists("$field.AnyTargetType") && vars.get("$field.AnyTargetType") && vars.exists("$field.AnyTargetRowid") && vars.get("$field.AnyTargetRowid"))
-{
-    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.AnyTargetType"), vars.get("$field.AnyTargetRowid"))));
-}
diff --git a/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod
index d104f4a2fc5c9d0a9579d154760d61224f5cd29b..bcfa55713b2623688e648247cfb45de79368a04e 100644
--- a/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod
+++ b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod
@@ -38,8 +38,8 @@
     <treetableViewTemplate>
       <name>AnyObjectRelations</name>
       <favoriteActionGroup2></favoriteActionGroup2>
-      <titleField>AnyTargetType</titleField>
-      <descriptionField>AnyTargetRowid</descriptionField>
+      <titleField>AnyObjectType</titleField>
+      <descriptionField>AnyObjectRowid</descriptionField>
       <entityField>#ENTITY</entityField>
     </treetableViewTemplate>
   </children>
diff --git a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
index dfe764020a852fc3faf8d154d995353cec975d49..7b8c5fa852078ebc12bff8fdc3873c95d54ddb0f 100644
--- a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
+++ b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
@@ -10,8 +10,8 @@
   <children>
     <treetableViewTemplate>
       <name>AnyObjectRelations</name>
-      <parentField>AnyTargetType</parentField>
-      <titleField>AnyTargetRowid</titleField>
+      <parentField>AnyObjectType</parentField>
+      <titleField>AnyObjectRowid</titleField>
       <entityField>#ENTITY</entityField>
       <title></title>
     </treetableViewTemplate>