diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index d938417de0efb3b802a73436b4c54fa8ac7df176..592e9d563ac5ea2f2ceeaee060945f86c28565c7 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -179,7 +179,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>ObjectRelation_entity</entityName>
-        <fieldName>ByObject1_dfi</fieldName>
+        <fieldName>Object1</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 99ee24db73dcc717cbd1df8d0dba4d2ee19b6e55..216207cccdfdeca137ea423d773ec9001b7dddcf 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -501,7 +501,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>ObjectRelation_entity</entityName>
-        <fieldName>ByAnyObject_dfi</fieldName>
+        <fieldName>AnyObject</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index ce309b86912583f4db5cccd2e67f30bcc6a5e8f9..957485605dbf08d1732409a3f67578d7598a6788 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -59,7 +59,7 @@
       <description>PARAMETER</description>
     </entityParameter>
     <entityProvider>
-      <name>ByObject1_dfi</name>
+      <name>Object1</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -108,7 +108,7 @@
       <description>PARAMETER</description>
     </entityParameter>
     <entityProvider>
-      <name>ByObject2_dfi</name>
+      <name>Object2</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <children>
@@ -139,7 +139,7 @@
       </children>
     </entityProvider>
     <entityProvider>
-      <name>ByBothObjects_dfi</name>
+      <name>BothObjects</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <children>
@@ -194,7 +194,7 @@
       <description>PARAMETER</description>
     </entityParameter>
     <entityProvider>
-      <name>ByAnyObject_dfi</name>
+      <name>AnyObject</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -238,11 +238,6 @@
         </entityParameter>
       </children>
     </entityProvider>
-    <entityProvider>
-      <name>test_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -308,4 +303,3 @@
     </dbRecordContainer>
   </recordContainers>
 </entity>
-
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 128211f6055fb705902f3d1b588925488fb87ba9..471dcf5af0f55936532810a3a1099334a7d8add4 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -493,7 +493,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
       <dependency>
         <name>dependency</name>
         <entityName>ObjectRelation_entity</entityName>
-        <fieldName>ByAnyObject_dfi</fieldName>
+        <fieldName>AnyObject</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index d5db2d716173ebd939ff77ced7ce5ce662814623..3109225050ad96dc1df9dbb08f0bd1712da9e597 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -313,7 +313,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>ObjectRelation_entity</entityName>
-        <fieldName>ByAnyObject_dfi</fieldName>
+        <fieldName>AnyObject</fieldName>
       </dependency>
       <children>
         <entityParameter>