diff --git a/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod b/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
index 64b9a1e738d1ca149e1dcc088118f731f870cf3c..9ee761a59233ddf6feb78282dc0c121bffd5c953 100644
--- a/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
+++ b/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
@@ -17,8 +17,8 @@
<name>FILTER_CONDITION</name>
<title>Condition</title>
<contentType>FILTER_TREE</contentType>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/onValueChange.js
similarity index 100%
rename from entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js
rename to entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/onValueChange.js
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/valueProcess.js
similarity index 100%
rename from entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js
rename to entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/valueProcess.js
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index fa429536f9db0f8b9ba1fab98c64efb56e268dca..506cb431b67c884bec519643a609d94ef04f4b18 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -910,42 +910,6 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
- <entityConsumer>
- <name>OrganisationDuplicates</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- <children>
- <entityParameter>
- <name>filterName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/filtername_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>recordIdToIgnore_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/recordidtoignore_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>resultFields_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfields_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>resultFieldsIdFieldName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfieldsidfieldname_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>targetEntity_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/targetentity_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>valuesToScan_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/valuestoscan_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>targetContext_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationduplicates/children/targetcontext_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityProvider>
<name>SelfDuplicatesProvider</name>
<titlePlural>Duplicates</titlePlural>
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/filtername_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/filtername_param/valueProcess.js
deleted file mode 100644
index 517d55822d0c5276183daef2f41fc8dcfd0b3e58..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/filtername_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("OrganisationDuplicates");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/recordidtoignore_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/recordidtoignore_param/valueProcess.js
deleted file mode 100644
index 68a0694645c086c652eb10ed12720998b4146cad..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/recordidtoignore_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.ORGANISATIONID"));
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfields_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfields_param/valueProcess.js
deleted file mode 100644
index daed36607e029adb9fd456d551c6e81c506d9480..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfields_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string(JSON.stringify(["NAME", "STANDARD_PHONE_COMMUNICATION", "STANDARD_EMAIL_COMMUNICATION", "ORGANISATIONID"]));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfieldsidfieldname_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfieldsidfieldname_param/valueProcess.js
deleted file mode 100644
index d3bd35e20196092d94e713892060a728a2a618fa..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/resultfieldsidfieldname_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ORGANISATIONID");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/targetcontext_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/targetcontext_param/valueProcess.js
deleted file mode 100644
index 6be9b7dc0bec4faae14d54827ce1dc99499fbaa0..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/targetcontext_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/targetentity_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/targetentity_param/valueProcess.js
deleted file mode 100644
index e781fb72fd248164b8b63a98008094744aee7460..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/targetentity_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("Organisation_entity");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationduplicates/children/valuestoscan_param/valueProcess.js b/entity/Organisation_entity/entityfields/organisationduplicates/children/valuestoscan_param/valueProcess.js
deleted file mode 100644
index afaaa47d8ac7882a6771d63393f8adf0cd04a854..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/organisationduplicates/children/valuestoscan_param/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-var picture = vars.get("$field.PICTURE");
-var name = vars.get("$field.NAME");
-let status = vars.get("$field.STATUS");
-let recordId = vars.get("$field.ORGANISATIONID");
-
-logging.log("picture -> " + picture);
-
-result.object({PICTURE: picture, NAME: name, STATUS: status, ORGANISATIONID: recordId});
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index ae9e3b679ebd5ff7c195473b7565e8c15767e646..f2b9b93fcd6fbeb9f46ad73a88e0e237bed50c0a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -987,50 +987,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
- <entityConsumer>
- <name>PersonDuplicates</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- <children>
- <entityParameter>
- <name>targetEntity_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/targetentity_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>filterName_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/filtername_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>resultFields_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/resultfields_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>valuesToScan_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/valuestoscan_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>resultFieldsIdFieldName_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/resultfieldsidfieldname_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>recordIdToIgnore_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/recordidtoignore_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>targetContext_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/targetcontext_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>sourceContactId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/sourcecontactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>contactIdToCheckForCachedDuplicates_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personduplicates/children/contactidtocheckforcachedduplicates_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityParameter>
<name>OnlyShowContactIds_param</name>
<expose v="true" />
diff --git a/entity/Person_entity/entityfields/personduplicates/children/contactidtocheckforcachedduplicates_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/contactidtocheckforcachedduplicates_param/valueProcess.js
deleted file mode 100644
index 821415ae694dd9c3d98a7703f4c59b81a37f524b..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/contactidtocheckforcachedduplicates_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/filtername_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/filtername_param/valueProcess.js
deleted file mode 100644
index cd2178222d92547ecbe173509f06b149164a2097..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/filtername_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("PersonDuplicates");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/recordidtoignore_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/recordidtoignore_param/valueProcess.js
deleted file mode 100644
index 821415ae694dd9c3d98a7703f4c59b81a37f524b..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/recordidtoignore_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/resultfields_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/resultfields_param/valueProcess.js
deleted file mode 100644
index 4b05025f1c3027e68cca59e6ca7d1c971d1f9ee2..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/resultfields_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string(JSON.stringify(["FIRSTNAME", "LASTNAME", "CONTACTID"]));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/resultfieldsidfieldname_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/resultfieldsidfieldname_param/valueProcess.js
deleted file mode 100644
index 364d24387465fffab727ed9de8a8be10524e2db5..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/resultfieldsidfieldname_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("CONTACTID");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/sourcecontactid_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/sourcecontactid_param/valueProcess.js
deleted file mode 100644
index 821415ae694dd9c3d98a7703f4c59b81a37f524b..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/sourcecontactid_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/targetcontext_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/targetcontext_param/valueProcess.js
deleted file mode 100644
index 8fccd9a7e20bf5ab2fb1982a956d9e3c475ec5ff..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/targetcontext_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("Person");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/targetentity_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/targetentity_param/valueProcess.js
deleted file mode 100644
index 0f7bee25ea3bd34aeeceff7f47f7f9118e69b7ba..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/targetentity_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("Person_entity");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personduplicates/children/valuestoscan_param/valueProcess.js b/entity/Person_entity/entityfields/personduplicates/children/valuestoscan_param/valueProcess.js
deleted file mode 100644
index 8e2ffcbd3918fe9aa384c329025074d480dca3ce..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/personduplicates/children/valuestoscan_param/valueProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-/*
- * All values to the configured filters have to be defined here.
- * The same field as defined in resultFieldsIdFieldName and the respective id have to be included in the values list.
- * It has to be the correct id of the target entity, which is also used to open the preview.
- */
-var firstname = vars.get("$field.FIRSTNAME");
-var lastname = vars.get("$field.LASTNAME");
-let gender = vars.get("$field.GENDER");
-let recordId = vars.get("$field.CONTACTID");
-
-
-result.object({FIRSTNAME: firstname, LASTNAME: lastname, GENDER: gender, CONTACTID: recordId});
\ No newline at end of file