From e0ff5eafeebfa44be0c5b3619447a3018be540a1 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Wed, 10 Mar 2010 14:39:15 +0000
Subject: [PATCH] rename document classes for testers from 'XXX Divergence
 Tester' to 'XXX Equivalence Tester'.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33585 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../aggregate_tester.xml                      |   2 +-
 .../base_application_tester.xml               |   2 +-
 .../base_contribution_tester.xml              |   2 +-
 .../delivery_mode_divergence_tester.xml       |   2 +-
 .../delivery_tester.xml                       |   2 +-
 .../description_tester.xml                    |   2 +-
 .../destination_account_tester.xml            |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../incoterm_tester.xml                       |   2 +-
 .../price_currency_tester.xml                 |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_account_tester.xml                 |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../variation_tester.xml                      |   2 +-
 .../aggregate_tester.xml                      |   2 +-
 .../base_application_tester.xml               |   2 +-
 .../base_contribution_tester.xml              |   2 +-
 .../delivery_mode_divergence_tester.xml       |   2 +-
 .../description_tester.xml                    |   2 +-
 .../destination_account_tester.xml            |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../incoterm_tester.xml                       |   2 +-
 .../price_currency_tester.xml                 |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_account_tester.xml                 |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../variation_tester.xml                      |   2 +-
 .../aggregate_tester.xml                      |   2 +-
 .../base_application_tester.xml               |   2 +-
 .../base_contribution_tester.xml              |   2 +-
 .../delivery_tester.xml                       |   2 +-
 .../description_tester.xml                    |   2 +-
 .../destination_account_tester.xml            |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../incoterm_tester.xml                       |   2 +-
 .../price_currency_tester.xml                 |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_account_tester.xml                 |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../variation_tester.xml                      |   2 +-
 .../aggregate_tester.xml                      |   2 +-
 .../base_application_tester.xml               |   2 +-
 .../base_contribution_tester.xml              |   2 +-
 .../delivery_mode_divergence_tester.xml       |   2 +-
 .../description_tester.xml                    |   2 +-
 .../destination_account_tester.xml            |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../incoterm_tester.xml                       |   2 +-
 .../price_currency_tester.xml                 |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_account_tester.xml                 |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../variation_tester.xml                      |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../destination_total_asset_price_tester.xml  |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../source_total_asset_price_tester.xml       |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../aggregate_tester.xml                      |   2 +-
 .../base_contribution_tester.xml              |   2 +-
 .../delivery_mode_divergence_tester.xml       |   2 +-
 .../delivery_tester.xml                       |   2 +-
 .../description_tester.xml                    |   2 +-
 .../destination_account_tester.xml            |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../incoterm_tester.xml                       |   2 +-
 .../price_currency_tester.xml                 |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../quantity_unit_tester.xml                  |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_account_tester.xml                 |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../variation_tester.xml                      |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../payment_mode_tester.xml                   |   2 +-
 .../price_tester.xml                          |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 .../aggregate_tester.xml                      |   2 +-
 .../base_application_tester.xml               |   2 +-
 .../base_contribution_tester.xml              |   2 +-
 .../delivery_mode_tester.xml                  |   2 +-
 .../description_tester.xml                    |   2 +-
 .../destination_account_tester.xml            |   2 +-
 .../destination_administration_tester.xml     |   2 +-
 .../destination_decision_tester.xml           |   2 +-
 .../destination_function_tester.xml           |   2 +-
 .../destination_payment_tester.xml            |   2 +-
 .../destination_project_tester.xml            |   2 +-
 .../destination_section_tester.xml            |   2 +-
 .../destination_tester.xml                    |   2 +-
 .../incoterm_tester.xml                       |   2 +-
 .../price_currency_tester.xml                 |   2 +-
 .../quantity_tester.xml                       |   2 +-
 .../reference_tester.xml                      |   2 +-
 .../resource_tester.xml                       |   2 +-
 .../source_account_tester.xml                 |   2 +-
 .../source_administration_tester.xml          |   2 +-
 .../source_decision_tester.xml                |   2 +-
 .../source_function_tester.xml                |   2 +-
 .../source_payment_tester.xml                 |   2 +-
 .../source_project_tester.xml                 |   2 +-
 .../source_section_tester.xml                 |   2 +-
 .../source_tester.xml                         |   2 +-
 .../start_date_tester.xml                     |   2 +-
 .../stop_date_tester.xml                      |   2 +-
 ...ory%20Membership%20Divergence%20Tester.xml |   2 +-
 .../DateTime%20Divergence%20Tester.xml        |   2 +-
 .../Float%20Divergence%20Tester.xml           |   2 +-
 ...erted%20Quantity%20Divergence%20Tester.xml |   2 +-
 .../String%20Divergence%20Tester.xml          |   2 +-
 .../Variation%20Divergence%20Tester.xml       |   2 +-
 ...=> CategoryMembershipEquivalenceTester.py} |  12 +-
 ...Tester.py => DateTimeEquivalenceTester.py} |  12 +-
 ...nceTester.py => FloatEquivalenceTester.py} |  12 +-
 ... NetConvertedQuantityEquivalenceTester.py} |   8 +-
 ...ceTester.py => StringEquivalenceTester.py} |  12 +-
 ...ester.py => VariationEquivalenceTester.py} |  12 +-
 .../ERP5/PropertySheet/DivergenceTester.py    |  15 --
 .../ERP5/PropertySheet/EquivalenceTester.py   |  56 ++++++
 product/ERP5/interfaces/equivalence_tester.py | 171 ++++++++++++++++++
 ...rgence_tester.py => equivalence_tester.py} |  16 +-
 226 files changed, 485 insertions(+), 273 deletions(-)
 rename product/ERP5/Document/{CategoryMembershipDivergenceTester.py => CategoryMembershipEquivalenceTester.py} (92%)
 rename product/ERP5/Document/{DateTimeDivergenceTester.py => DateTimeEquivalenceTester.py} (93%)
 rename product/ERP5/Document/{FloatDivergenceTester.py => FloatEquivalenceTester.py} (95%)
 rename product/ERP5/Document/{NetConvertedQuantityDivergenceTester.py => NetConvertedQuantityEquivalenceTester.py} (89%)
 rename product/ERP5/Document/{StringDivergenceTester.py => StringEquivalenceTester.py} (92%)
 rename product/ERP5/Document/{VariationDivergenceTester.py => VariationEquivalenceTester.py} (94%)
 create mode 100644 product/ERP5/PropertySheet/EquivalenceTester.py
 create mode 100644 product/ERP5/interfaces/equivalence_tester.py
 rename product/ERP5/mixin/{divergence_tester.py => equivalence_tester.py} (94%)

diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/aggregate_tester.xml
index 3ddb3f0fb0..cc15f5c4eb 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/aggregate_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/aggregate_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_application_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_application_tester.xml
index fe709aee18..72e27bfcee 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_application_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_application_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_contribution_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_contribution_tester.xml
index 4a35449214..360e2e7e76 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_contribution_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/base_contribution_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_mode_divergence_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_mode_divergence_tester.xml
index 719465ba91..b0c53fd6ef 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_mode_divergence_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_mode_divergence_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_tester.xml
index d8358137ca..65f5aaef05 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/delivery_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/description_tester.xml
index 0de8c50cfa..af9c23e4d8 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/description_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/description_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_account_tester.xml
index cfb1198ed8..95496deeaf 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_administration_tester.xml
index 44bc1381a3..2a70eeaf5d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_decision_tester.xml
index bea9eee22a..3ca21bab4d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_function_tester.xml
index c6f6bf3629..41463db672 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_payment_tester.xml
index a3e9cb3cc9..a6bb4f0a7e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_project_tester.xml
index 8807e05273..8b81b5acf5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_section_tester.xml
index e950cfeb68..9ac8fc89a6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_tester.xml
index 3c196ac82d..6708c4cc53 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/incoterm_tester.xml
index b2decced0e..b0b8511c31 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/incoterm_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/incoterm_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_currency_tester.xml
index 290fb93195..cff8b7fc9b 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_currency_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_currency_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_tester.xml
index 804761bdb4..e086703876 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/quantity_tester.xml
index df8462b282..dcbf51b176 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/resource_tester.xml
index f572545b07..cc6e0879af 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_account_tester.xml
index 5c03e6446d..8da17cde84 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_administration_tester.xml
index 0208b65573..e53405ca1b 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_decision_tester.xml
index 6cbd782ef5..3a2afa68f0 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_function_tester.xml
index 86ea4c90b8..7204c56c61 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_payment_tester.xml
index 2d7776e015..5ec326ba17 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_project_tester.xml
index af97684f5c..5cc000aed2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_section_tester.xml
index 4db51be8a0..f20698fde5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_tester.xml
index a439f6d8b7..6278c96121 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/start_date_tester.xml
index 46a49cad74..44ac81533e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/stop_date_tester.xml
index 4a1167b3d5..980514fff4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/variation_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/variation_tester.xml
index 4cedcefced..6c8203d8ee 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/variation_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_root_simulation_rule/variation_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
+        <global name="VariationEquivalenceTester" module="Products.ERP5Type.Document.VariationEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/aggregate_tester.xml
index 71cc29897e..8358a2552f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/aggregate_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/aggregate_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_application_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_application_tester.xml
index 871213809f..221bfca96c 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_application_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_application_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_contribution_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_contribution_tester.xml
index 91669dcd9e..466288701f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_contribution_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/base_contribution_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/delivery_mode_divergence_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/delivery_mode_divergence_tester.xml
index 719465ba91..b0c53fd6ef 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/delivery_mode_divergence_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/delivery_mode_divergence_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/description_tester.xml
index 709484c506..e8d4b0b380 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/description_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/description_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_account_tester.xml
index c95e07e481..4c9b8eca66 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_administration_tester.xml
index 7f862c2c72..1bae67b804 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_decision_tester.xml
index 3deb7089da..7e4082d82d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_function_tester.xml
index 7549f4265f..5283b00c44 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_payment_tester.xml
index 7a7dddc10d..99127c7cde 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_project_tester.xml
index 5352601f43..f2d891b46f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_section_tester.xml
index db74f573d7..e7f3393dc9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_tester.xml
index 8ceac2bb77..3551d24fe3 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/incoterm_tester.xml
index b2decced0e..b0b8511c31 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/incoterm_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/incoterm_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_currency_tester.xml
index ee3915c8b9..08484d7d82 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_currency_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_currency_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_tester.xml
index 804761bdb4..e086703876 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/quantity_tester.xml
index 91bc42df6a..6bc1bb7b9a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/resource_tester.xml
index fb2433449e..eab9ad11a1 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_account_tester.xml
index 8891440869..0a878a959a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_administration_tester.xml
index 116c9ee5d7..ac9585ab72 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_decision_tester.xml
index d9d2410416..f383e0626f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_function_tester.xml
index 08ca7aa283..ef0ef1d137 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_payment_tester.xml
index 437988be1e..f7a8d1a8e9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_project_tester.xml
index 324a15f7e9..6c302df0b2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_section_tester.xml
index a9eb20c9fe..01663b5bd0 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_tester.xml
index ca8b9fe144..eb1f75d39e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/start_date_tester.xml
index 157d847c7b..cfac71a118 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/stop_date_tester.xml
index 9749397cb0..95547dc3c1 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/variation_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/variation_tester.xml
index cc4812add6..4e0f21a9f4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/variation_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_delivery_simulation_rule/variation_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
+        <global name="VariationEquivalenceTester" module="Products.ERP5Type.Document.VariationEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/aggregate_tester.xml
index 3ddb3f0fb0..cc15f5c4eb 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/aggregate_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/aggregate_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_application_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_application_tester.xml
index fe709aee18..72e27bfcee 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_application_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_application_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_contribution_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_contribution_tester.xml
index 91669dcd9e..466288701f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_contribution_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/base_contribution_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/delivery_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/delivery_tester.xml
index d8358137ca..65f5aaef05 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/delivery_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/delivery_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/description_tester.xml
index 0de8c50cfa..af9c23e4d8 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/description_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/description_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_account_tester.xml
index cfb1198ed8..95496deeaf 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_administration_tester.xml
index 44bc1381a3..2a70eeaf5d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_decision_tester.xml
index bea9eee22a..3ca21bab4d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_function_tester.xml
index c6f6bf3629..41463db672 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_payment_tester.xml
index a3e9cb3cc9..a6bb4f0a7e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_project_tester.xml
index 8807e05273..8b81b5acf5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_section_tester.xml
index e950cfeb68..9ac8fc89a6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_tester.xml
index 3c196ac82d..6708c4cc53 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/incoterm_tester.xml
index b2decced0e..b0b8511c31 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/incoterm_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/incoterm_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_currency_tester.xml
index ee3915c8b9..08484d7d82 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_currency_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_currency_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_tester.xml
index 804761bdb4..e086703876 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/quantity_tester.xml
index df8462b282..dcbf51b176 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/resource_tester.xml
index f572545b07..cc6e0879af 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_account_tester.xml
index 5c03e6446d..8da17cde84 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_administration_tester.xml
index 0208b65573..e53405ca1b 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_decision_tester.xml
index 6cbd782ef5..3a2afa68f0 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_function_tester.xml
index 86ea4c90b8..7204c56c61 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_payment_tester.xml
index 2d7776e015..5ec326ba17 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_project_tester.xml
index af97684f5c..5cc000aed2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_section_tester.xml
index 4db51be8a0..f20698fde5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_tester.xml
index a439f6d8b7..6278c96121 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/start_date_tester.xml
index 46a49cad74..44ac81533e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/stop_date_tester.xml
index 4a1167b3d5..980514fff4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/variation_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/variation_tester.xml
index 4cedcefced..6c8203d8ee 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/variation_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_root_simulation_rule/variation_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
+        <global name="VariationEquivalenceTester" module="Products.ERP5Type.Document.VariationEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/aggregate_tester.xml
index 71cc29897e..8358a2552f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/aggregate_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/aggregate_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_application_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_application_tester.xml
index 5f9db3567f..a3ee2f92f5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_application_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_application_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_contribution_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_contribution_tester.xml
index 91669dcd9e..466288701f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_contribution_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/base_contribution_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/delivery_mode_divergence_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/delivery_mode_divergence_tester.xml
index 719465ba91..b0c53fd6ef 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/delivery_mode_divergence_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/delivery_mode_divergence_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/description_tester.xml
index 709484c506..e8d4b0b380 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/description_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/description_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_account_tester.xml
index c95e07e481..4c9b8eca66 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_administration_tester.xml
index 7f862c2c72..1bae67b804 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_decision_tester.xml
index 3deb7089da..7e4082d82d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_function_tester.xml
index 7549f4265f..5283b00c44 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_payment_tester.xml
index 7a7dddc10d..99127c7cde 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_project_tester.xml
index 5352601f43..f2d891b46f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_section_tester.xml
index db74f573d7..e7f3393dc9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_tester.xml
index 8ceac2bb77..3551d24fe3 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/incoterm_tester.xml
index b2decced0e..b0b8511c31 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/incoterm_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/incoterm_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_currency_tester.xml
index ee3915c8b9..08484d7d82 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_currency_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_currency_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_tester.xml
index 804761bdb4..e086703876 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/quantity_tester.xml
index 91bc42df6a..6bc1bb7b9a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/resource_tester.xml
index ab14bc8e9d..e73a0aed2e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_account_tester.xml
index 8891440869..0a878a959a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_administration_tester.xml
index 116c9ee5d7..ac9585ab72 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_decision_tester.xml
index d9d2410416..f383e0626f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_function_tester.xml
index 08ca7aa283..ef0ef1d137 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_payment_tester.xml
index 437988be1e..f7a8d1a8e9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_project_tester.xml
index 324a15f7e9..6c302df0b2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_section_tester.xml
index a9eb20c9fe..01663b5bd0 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_tester.xml
index ca8b9fe144..eb1f75d39e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/start_date_tester.xml
index 157d847c7b..cfac71a118 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/stop_date_tester.xml
index 9749397cb0..95547dc3c1 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/variation_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/variation_tester.xml
index 5912dd068c..aee44e7e91 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/variation_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_simulation_rule/variation_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
+        <global name="VariationEquivalenceTester" module="Products.ERP5Type.Document.VariationEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_administration_tester.xml
index ec6effb317..7889a72ba7 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_decision_tester.xml
index f4edac4f19..ae51e86c39 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_function_tester.xml
index a220d6e474..2263051bad 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_payment_tester.xml
index 5238a91617..a36e91236c 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_project_tester.xml
index 5d0adf9c66..6e9e980d4e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_section_tester.xml
index 7c3615d889..5c57fd6a6c 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_tester.xml
index 9627fdb094..365ef8a82f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_total_asset_price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_total_asset_price_tester.xml
index 75e55c03c3..24ad64dbd5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_total_asset_price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/destination_total_asset_price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/price_tester.xml
index b877d302cd..f746bcc6a2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/quantity_tester.xml
index b34e71defe..39165a4de2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/resource_tester.xml
index f4fa8e2d8b..39a4b53f83 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_administration_tester.xml
index 20a5eb3bf3..ca97af38cd 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_decision_tester.xml
index c4ea13bac9..cd5e1ded43 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_function_tester.xml
index adc176aad3..1f569097c2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_payment_tester.xml
index 0491ea1860..60cb9bd629 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_project_tester.xml
index 7f5683c094..1c6e5d416b 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_section_tester.xml
index e589aa4558..ae85c1c59a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_tester.xml
index e945dc99f6..066e777881 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_total_asset_price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_total_asset_price_tester.xml
index 49d9e39edf..6b0573bfdb 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_total_asset_price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/source_total_asset_price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/start_date_tester.xml
index cdb5c01668..d20b9c82f5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/stop_date_tester.xml
index fcf0dd2c6f..286948702a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_invoice_transaction_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/aggregate_tester.xml
index 3ddb3f0fb0..cc15f5c4eb 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/aggregate_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/aggregate_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/base_contribution_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/base_contribution_tester.xml
index e7a6be822a..e9a2c79c3f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/base_contribution_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/base_contribution_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_mode_divergence_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_mode_divergence_tester.xml
index 719465ba91..b0c53fd6ef 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_mode_divergence_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_mode_divergence_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_tester.xml
index d8358137ca..65f5aaef05 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/delivery_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/description_tester.xml
index 0de8c50cfa..af9c23e4d8 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/description_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/description_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_account_tester.xml
index cfb1198ed8..95496deeaf 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_administration_tester.xml
index 44bc1381a3..2a70eeaf5d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_decision_tester.xml
index bea9eee22a..3ca21bab4d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_function_tester.xml
index c6f6bf3629..41463db672 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_payment_tester.xml
index a3e9cb3cc9..a6bb4f0a7e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_project_tester.xml
index 8807e05273..8b81b5acf5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_section_tester.xml
index e950cfeb68..9ac8fc89a6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_tester.xml
index 3c196ac82d..6708c4cc53 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/incoterm_tester.xml
index 8e44ea774c..44446a01cd 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/incoterm_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/incoterm_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_currency_tester.xml
index 57ac00c3d8..1d15e1f993 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_currency_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_currency_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_tester.xml
index fac056871a..da05d7edf7 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_tester.xml
index df8462b282..dcbf51b176 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_unit_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_unit_tester.xml
index c59a06cf8c..1a760ca9b4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_unit_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/quantity_unit_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/resource_tester.xml
index f572545b07..cc6e0879af 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_account_tester.xml
index 5c03e6446d..8da17cde84 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_administration_tester.xml
index 0208b65573..e53405ca1b 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_decision_tester.xml
index 6cbd782ef5..3a2afa68f0 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_function_tester.xml
index 86ea4c90b8..7204c56c61 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_payment_tester.xml
index 2d7776e015..5ec326ba17 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_project_tester.xml
index af97684f5c..5cc000aed2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_section_tester.xml
index 4db51be8a0..f20698fde5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_tester.xml
index a439f6d8b7..6278c96121 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/start_date_tester.xml
index 46a49cad74..44ac81533e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/stop_date_tester.xml
index 4a1167b3d5..980514fff4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/variation_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/variation_tester.xml
index eef30caaae..c66db326a6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/variation_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_order_root_simulation_rule/variation_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="VariationDivergenceTester" module="Products.ERP5Type.Document.VariationDivergenceTester"/>
+        <global name="VariationEquivalenceTester" module="Products.ERP5Type.Document.VariationEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_payment_tester.xml
index 7a7dddc10d..99127c7cde 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_project_tester.xml
index 8807e05273..8b81b5acf5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_section_tester.xml
index db74f573d7..e7f3393dc9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_tester.xml
index b035477442..3e05c44142 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/payment_mode_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/payment_mode_tester.xml
index 5be24c2dc2..c5155907b8 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/payment_mode_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/payment_mode_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/price_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/price_tester.xml
index 804761bdb4..e086703876 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/price_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/price_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
+        <global name="FloatEquivalenceTester" module="Products.ERP5Type.Document.FloatEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/quantity_tester.xml
index 91bc42df6a..6bc1bb7b9a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/resource_tester.xml
index fb2433449e..eab9ad11a1 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_payment_tester.xml
index 2d7776e015..5ec326ba17 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_project_tester.xml
index af97684f5c..5cc000aed2 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_section_tester.xml
index 4db51be8a0..f20698fde5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_tester.xml
index 472b3ff0e9..57ca39454a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/start_date_tester.xml
index 46a49cad74..44ac81533e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/stop_date_tester.xml
index 4a1167b3d5..980514fff4 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_payment_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/aggregate_tester.xml
index 71cc29897e..8358a2552f 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/aggregate_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/aggregate_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_application_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_application_tester.xml
index 5f9db3567f..a3ee2f92f5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_application_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_application_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_contribution_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_contribution_tester.xml
index 3710d21db4..0a8d23fa6d 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_contribution_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/base_contribution_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/delivery_mode_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/delivery_mode_tester.xml
index e055f7b24f..c57fa2f938 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/delivery_mode_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/delivery_mode_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/description_tester.xml
index 1e8485574e..ff0af6e831 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/description_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/description_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_account_tester.xml
index c95e07e481..4c9b8eca66 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_administration_tester.xml
index 92ac107f2d..37ff93ec43 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_decision_tester.xml
index 95ab627b42..40fc1e0d62 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_function_tester.xml
index 7549f4265f..5283b00c44 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_payment_tester.xml
index 294cf5b5ee..f3739755ac 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_project_tester.xml
index 7c5c1d67d6..171625131c 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_section_tester.xml
index db74f573d7..e7f3393dc9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_tester.xml
index 8ceac2bb77..3551d24fe3 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/destination_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/incoterm_tester.xml
index a286dad565..14286f37e5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/incoterm_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/incoterm_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/price_currency_tester.xml
index 35d65aa3b1..02e07aaf87 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/price_currency_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/price_currency_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/quantity_tester.xml
index 91bc42df6a..6bc1bb7b9a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/quantity_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/quantity_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="NetConvertedQuantityEquivalenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/reference_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/reference_tester.xml
index df6cbcb636..d02db2207c 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/reference_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/reference_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <global name="StringEquivalenceTester" module="Products.ERP5Type.Document.StringEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/resource_tester.xml
index fb2433449e..eab9ad11a1 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/resource_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/resource_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_account_tester.xml
index 8891440869..0a878a959a 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_account_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_account_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_administration_tester.xml
index 15c034d819..c878b99b7e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_administration_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_administration_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_decision_tester.xml
index 9fcb72c6cd..c01bb037f9 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_decision_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_decision_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_function_tester.xml
index 08ca7aa283..ef0ef1d137 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_function_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_function_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_payment_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_payment_tester.xml
index 2b262fd2bd..6e872532fb 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_payment_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_payment_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_project_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_project_tester.xml
index b76872dbaa..bb7defaa73 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_project_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_project_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_section_tester.xml
index a9eb20c9fe..01663b5bd0 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_section_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_section_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_tester.xml
index ca8b9fe144..eb1f75d39e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/source_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <global name="CategoryMembershipEquivalenceTester" module="Products.ERP5Type.Document.CategoryMembershipEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/start_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/start_date_tester.xml
index 7d635e4ce5..beb0b81462 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/start_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/stop_date_tester.xml
index f31151e04e..927bfe07d3 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/stop_date_tester.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_simulation_rule/stop_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <global name="DateTimeEquivalenceTester" module="Products.ERP5Type.Document.DateTimeEquivalenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml
index fd44a6db71..26f8d128f0 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml
@@ -46,7 +46,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addCategoryMembershipDivergenceTester</string> </value>
+            <value> <string>addCategoryMembershipEquivalenceTester</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml
index b7dca69848..5c0b283b74 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addDateTimeDivergenceTester</string> </value>
+            <value> <string>addDateTimeEquivalenceTester</string> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml
index 69ed36d3db..d6fda8dafa 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addFloatDivergenceTester</string> </value>
+            <value> <string>addFloatEquivalenceTester</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
index 36b422dccb..70acde5922 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
@@ -46,7 +46,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addNetConvertedQuantityDivergenceTester</string> </value>
+            <value> <string>addNetConvertedQuantityEquivalenceTester</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml
index 7b949a4c3d..bc2ca6a7a0 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addStringDivergenceTester</string> </value>
+            <value> <string>addStringEquivalenceTester</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml
index 40c98fb24b..bbced5190c 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml
@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addVariationDivergenceTester</string> </value>
+            <value> <string>addVariationEquivalenceTester</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
diff --git a/product/ERP5/Document/CategoryMembershipDivergenceTester.py b/product/ERP5/Document/CategoryMembershipEquivalenceTester.py
similarity index 92%
rename from product/ERP5/Document/CategoryMembershipDivergenceTester.py
rename to product/ERP5/Document/CategoryMembershipEquivalenceTester.py
index 44987e0b45..4a8b2cce2a 100644
--- a/product/ERP5/Document/CategoryMembershipDivergenceTester.py
+++ b/product/ERP5/Document/CategoryMembershipEquivalenceTester.py
@@ -31,16 +31,16 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.divergence_tester import DivergenceTesterMixin
+from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 
-class CategoryMembershipDivergenceTester(Predicate, DivergenceTesterMixin):
+class CategoryMembershipEquivalenceTester(Predicate, EquivalenceTesterMixin):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for a specific category.
   """
-  meta_type = 'ERP5 Category Membership Divergence Tester'
-  portal_type = 'Category Membership Divergence Tester'
+  meta_type = 'ERP5 Category Membership Equivalence Tester'
+  portal_type = 'Category Membership Equivalence Tester'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security
@@ -52,12 +52,12 @@ class CategoryMembershipDivergenceTester(Predicate, DivergenceTesterMixin):
                       , PropertySheet.XMLObject
                       , PropertySheet.CategoryCore
                       , PropertySheet.DublinCore
-                      , PropertySheet.DivergenceTester
+                      , PropertySheet.EquivalenceTester
                       , PropertySheet.SolverSelection
                      )
 
   # Declarative interfaces
-  zope.interface.implements( interfaces.IDivergenceTester, )
+  zope.interface.implements( interfaces.IEquivalenceTester, )
 
   def _compare(self, prevision_movement, decision_movement):
     """
diff --git a/product/ERP5/Document/DateTimeDivergenceTester.py b/product/ERP5/Document/DateTimeEquivalenceTester.py
similarity index 93%
rename from product/ERP5/Document/DateTimeDivergenceTester.py
rename to product/ERP5/Document/DateTimeEquivalenceTester.py
index f18f006930..1a6f314012 100644
--- a/product/ERP5/Document/DateTimeDivergenceTester.py
+++ b/product/ERP5/Document/DateTimeEquivalenceTester.py
@@ -32,16 +32,16 @@ from DateTime import DateTime
 
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.divergence_tester import DivergenceTesterMixin
+from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 
-class DateTimeDivergenceTester(Predicate, DivergenceTesterMixin):
+class DateTimeEquivalenceTester(Predicate, EquivalenceTesterMixin):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for some specific properties.
   """
-  meta_type = 'ERP5 DateTime Divergence Tester'
-  portal_type = 'DateTime Divergence Tester'
+  meta_type = 'ERP5 DateTime Equivalence Tester'
+  portal_type = 'DateTime Equivalence Tester'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security
@@ -54,12 +54,12 @@ class DateTimeDivergenceTester(Predicate, DivergenceTesterMixin):
     PropertySheet.XMLObject,
     PropertySheet.CategoryCore,
     PropertySheet.DublinCore,
-    PropertySheet.DivergenceTester,
+    PropertySheet.EquivalenceTester,
     PropertySheet.SolverSelection
     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IDivergenceTester,)
+  zope.interface.implements(interfaces.IEquivalenceTester,)
 
   def _compare(self, prevision_movement, decision_movement):
     """
diff --git a/product/ERP5/Document/FloatDivergenceTester.py b/product/ERP5/Document/FloatEquivalenceTester.py
similarity index 95%
rename from product/ERP5/Document/FloatDivergenceTester.py
rename to product/ERP5/Document/FloatEquivalenceTester.py
index ed20c584b1..61c423c917 100644
--- a/product/ERP5/Document/FloatDivergenceTester.py
+++ b/product/ERP5/Document/FloatEquivalenceTester.py
@@ -33,16 +33,16 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.divergence_tester import DivergenceTesterMixin
+from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 
-class FloatDivergenceTester(Predicate, DivergenceTesterMixin):
+class FloatEquivalenceTester(Predicate, EquivalenceTesterMixin):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for some specific properties.
   """
-  meta_type = 'ERP5 Float Divergence Tester'
-  portal_type = 'Float Divergence Tester'
+  meta_type = 'ERP5 Float Equivalence Tester'
+  portal_type = 'Float Equivalence Tester'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security
@@ -54,12 +54,12 @@ class FloatDivergenceTester(Predicate, DivergenceTesterMixin):
                       , PropertySheet.XMLObject
                       , PropertySheet.CategoryCore
                       , PropertySheet.DublinCore
-                      , PropertySheet.DivergenceTester
+                      , PropertySheet.EquivalenceTester
                       , PropertySheet.SolverSelection
                      )
 
   # Declarative interfaces
-  zope.interface.implements( interfaces.IDivergenceTester, )
+  zope.interface.implements( interfaces.IEquivalenceTester, )
 
   def _compare(self, prevision_movement, decision_movement):
     """
diff --git a/product/ERP5/Document/NetConvertedQuantityDivergenceTester.py b/product/ERP5/Document/NetConvertedQuantityEquivalenceTester.py
similarity index 89%
rename from product/ERP5/Document/NetConvertedQuantityDivergenceTester.py
rename to product/ERP5/Document/NetConvertedQuantityEquivalenceTester.py
index a805cd081d..684b382729 100644
--- a/product/ERP5/Document/NetConvertedQuantityDivergenceTester.py
+++ b/product/ERP5/Document/NetConvertedQuantityEquivalenceTester.py
@@ -28,17 +28,17 @@
 
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5.Document.FloatDivergenceTester import FloatDivergenceTester
+from Products.ERP5.Document.FloatEquivalenceTester import FloatEquivalenceTester
 from Products.ERP5Type import Permissions
 
-class NetConvertedQuantityDivergenceTester(FloatDivergenceTester):
+class NetConvertedQuantityEquivalenceTester(FloatEquivalenceTester):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for some specific properties.
   """
-  meta_type = 'ERP5 Net Converted Quantity Divergence Tester'
-  portal_type = 'Net Converted Quantity Divergence Tester'
+  meta_type = 'ERP5 Net Converted Quantity Equivalence Tester'
+  portal_type = 'Net Converted Quantity Equivalence Tester'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security
diff --git a/product/ERP5/Document/StringDivergenceTester.py b/product/ERP5/Document/StringEquivalenceTester.py
similarity index 92%
rename from product/ERP5/Document/StringDivergenceTester.py
rename to product/ERP5/Document/StringEquivalenceTester.py
index 4daa3286e7..b4a8a0427c 100644
--- a/product/ERP5/Document/StringDivergenceTester.py
+++ b/product/ERP5/Document/StringEquivalenceTester.py
@@ -33,16 +33,16 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.divergence_tester import DivergenceTesterMixin
+from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 
-class StringDivergenceTester(Predicate, DivergenceTesterMixin):
+class StringEquivalenceTester(Predicate, EquivalenceTesterMixin):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for a specific property.
   """
-  meta_type = 'ERP5 String Divergence Tester'
-  portal_type = 'String Divergence Tester'
+  meta_type = 'ERP5 String Equivalence Tester'
+  portal_type = 'String Equivalence Tester'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security
@@ -54,12 +54,12 @@ class StringDivergenceTester(Predicate, DivergenceTesterMixin):
                       , PropertySheet.XMLObject
                       , PropertySheet.CategoryCore
                       , PropertySheet.DublinCore
-                      , PropertySheet.DivergenceTester
+                      , PropertySheet.EquivalenceTester
                       , PropertySheet.SolverSelection
                      )
 
   # Declarative interfaces
-  zope.interface.implements( interfaces.IDivergenceTester, )
+  zope.interface.implements( interfaces.IEquivalenceTester, )
 
 
   def _compare(self, prevision_movement, decision_movement):
diff --git a/product/ERP5/Document/VariationDivergenceTester.py b/product/ERP5/Document/VariationEquivalenceTester.py
similarity index 94%
rename from product/ERP5/Document/VariationDivergenceTester.py
rename to product/ERP5/Document/VariationEquivalenceTester.py
index 9f5e269f73..10898818bf 100644
--- a/product/ERP5/Document/VariationDivergenceTester.py
+++ b/product/ERP5/Document/VariationEquivalenceTester.py
@@ -31,16 +31,16 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.divergence_tester import DivergenceTesterMixin
+from Products.ERP5.mixin.equivalence_tester import EquivalenceTesterMixin
 
-class VariationDivergenceTester(Predicate, DivergenceTesterMixin):
+class VariationEquivalenceTester(Predicate, EquivalenceTesterMixin):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for a specific property.
   """
-  meta_type = 'ERP5 Dict Divergence Tester'
-  portal_type = 'Dict Divergence Tester'
+  meta_type = 'ERP5 Dict Equivalence Tester'
+  portal_type = 'Dict Equivalence Tester'
   add_permission = Permissions.AddPortalContent
 
   # Declarative security
@@ -52,12 +52,12 @@ class VariationDivergenceTester(Predicate, DivergenceTesterMixin):
                       , PropertySheet.XMLObject
                       , PropertySheet.CategoryCore
                       , PropertySheet.DublinCore
-                      , PropertySheet.DivergenceTester
+                      , PropertySheet.EquivalenceTester
                       , PropertySheet.SolverSelection
                      )
 
   # Declarative interfaces
-  zope.interface.implements( interfaces.IDivergenceTester, )
+  zope.interface.implements( interfaces.IEquivalenceTester, )
 
   def _compare(self, prevision_movement, decision_movement):
     """
diff --git a/product/ERP5/PropertySheet/DivergenceTester.py b/product/ERP5/PropertySheet/DivergenceTester.py
index 9530dc3e81..354d9f2588 100644
--- a/product/ERP5/PropertySheet/DivergenceTester.py
+++ b/product/ERP5/PropertySheet/DivergenceTester.py
@@ -39,19 +39,4 @@ class DivergenceTester:
        'type'        : 'lines',
        'default'     : (),
        'mode'        : 'w' },
-    {  'id'          : 'divergence_provider',
-       'description' : 'Defines whether a divergence tester acts as a divergence provider.',
-       'type'        : 'boolean',
-       'default'     : 1,
-       'mode'        : 'rw' },
-    {  'id'          : 'matching_provider',
-       'description' : 'Defines whether a divergence tester acts as a matching provider.',
-       'type'        : 'boolean',
-       'default'     : 0,
-       'mode'        : 'rw' },
-    {  'id'          : 'updating_provider',
-       'description' : 'Defines whether a divergence tester acts as a updating provider.',
-       'type'        : 'boolean',
-       'default'     : 1,
-       'mode'        : 'rw' },
   )
diff --git a/product/ERP5/PropertySheet/EquivalenceTester.py b/product/ERP5/PropertySheet/EquivalenceTester.py
new file mode 100644
index 0000000000..c4714ae75b
--- /dev/null
+++ b/product/ERP5/PropertySheet/EquivalenceTester.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+
+class EquivalenceTester:
+  """
+  Equivalence Tester are used for the equivalence testers.
+  """
+
+  _properties = (
+    {  'id'          : 'tested_property',
+       'description' : 'Property used to Test',
+       'type'        : 'lines',
+       'default'     : (),
+       'mode'        : 'w' },
+    {  'id'          : 'divergence_provider',
+       'description' : 'Defines whether a equivalence tester acts as a divergence provider.',
+       'type'        : 'boolean',
+       'default'     : 1,
+       'mode'        : 'rw' },
+    {  'id'          : 'matching_provider',
+       'description' : 'Defines whether a equivalence tester acts as a matching provider.',
+       'type'        : 'boolean',
+       'default'     : 0,
+       'mode'        : 'rw' },
+    {  'id'          : 'updating_provider',
+       'description' : 'Defines whether a equivalence tester acts as a updating provider.',
+       'type'        : 'boolean',
+       'default'     : 1,
+       'mode'        : 'rw' },
+  )
diff --git a/product/ERP5/interfaces/equivalence_tester.py b/product/ERP5/interfaces/equivalence_tester.py
new file mode 100644
index 0000000000..ebf89af8e8
--- /dev/null
+++ b/product/ERP5/interfaces/equivalence_tester.py
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006-2009 Nexedi SA and Contributors. All Rights Reserved.
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
+#                    Rafael Monnerat <rafael@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+"""
+Products.ERP5.interfaces.equivalence_tester
+"""
+
+from zope.interface import Interface
+
+class IEquivalenceTester(Interface):
+  """
+  Equivalence Tester interface specification
+
+  All equivalence testers in ERP5 must implement IEquivalenceTester.
+  IEquivalenceTester provides methods to test simulation movements
+  equivalence with related delivery movements. A list of
+  explanation messages can be generated if needed, and used
+  to help users understand why a given delivery line and its related
+  simulation movements are divergent.
+
+  IEquivalenceTester also provides methods to match movements
+  each other, based on comparison and hash keys. Movement matching
+  is required by Rules to decide which simulation movements should
+  be updated, deleted, or compensated.
+
+  IEquivalenceTester provides helper methods to copy or update properties
+  between movements, from simulation to deliveries or from deliveries to
+  simulation.
+  """
+
+  # since we aldeary have test() in Predicate class, we use a different
+  # method name to test a equivalence.
+  def testEquivalence(simulation_movement):
+    """
+    Tests if simulation_movement is divergent. Returns False (0)
+    or True (1).
+
+    If decision_movement is a simulation movement, use
+    the recorded properties instead of the native ones.
+
+    simulation_movement -- a simulation movement
+    """
+
+  def explain(simulation_movement):
+    """
+    Returns a single message which explain the nature of
+    the equivalence of simulation_movement with its related
+    delivery movement.
+
+    If decision_movement is a simulation movement, use
+    the recorded properties instead of the native ones.
+
+    simulation_movement -- a simulation movement
+
+    NOTE: this approach is incompatible with previous
+    API which was returning a list.
+
+    NOTE: should we provide compatibility here ?
+    """
+
+  def generateHashKey(movement):
+    """
+    Returns a hash key which can be used to optimise the
+    matching algorithm between movements. The purpose
+    of this hash key is to reduce the size of lists of
+    movements which need to be compared using the compare
+    method (quadratic complexity).
+
+    If decision_movement is a simulation movement, use
+    the recorded properties instead of the native ones.
+    """
+
+  def compare(prevision_movement, decision_movement):
+    """
+    Returns True if prevision_movement and delivery_movement
+    match. Returns False else. The method is asymmetric and
+    the order of parameter matters. For example, a sourcing
+    rule may use a tester which makes sure that movements are
+    delivered no sooner than 2 weeks before production but
+    no later than the production date.
+
+    If decision_movement is a simulation movement, use
+    the recorded properties instead of the native ones.
+
+    This method is used in three cases:
+    * an applied rule containted movement vs. a generated movement list
+    * a delivery containted movement vs. a generated movement list
+    * a delivery containted movement vs. an applied rule containted movement
+    """
+
+  def getUpdatablePropertyDict(prevision_movement, decision_movement):
+    """
+    Returns a list of properties to update on decision_movement
+    prevision_movement so that next call to compare returns True.
+
+    prevision_movement -- a simulation movement (prevision)
+
+    decision_movement -- a delivery movement (decision)
+    """
+
+  def update(prevision_movement, decision_movement):
+    """
+    Updates decision_movement with properties from
+    prevision_movement so that next call to
+    compare returns True. This method is normally
+    invoked to copy properties from simulation movements
+    to delivery movements. It is also invoked to copy
+    properties from temp simulation movements of
+    Aggregated Amount Lists to pre-existing simulation
+    movements.
+
+    If decision_movement is a simulation movement, then
+    do not update recorded properties.
+
+    prevision_movement -- a simulation movement (prevision)
+
+    decision_movement -- a delivery movement (decision)
+
+    NOTE: recorded (forced) properties are not updated by
+    expand.
+
+    NOTE2: it is still unknown how to update properties from
+    a simulation movement to the relevant level of
+    delivery / line / cell.
+    """
+
+  def accept(simulation_movement):
+    """
+    Copies the properties handled by the equivalence tester
+    from the related delivery movement to simulation_movement.
+
+    NOTE: the future existence of this method is still unknown
+    because it is likely to be implemented in TargetSolver
+    instead.
+    """
+
+  def adopt(simulation_movement):
+    """
+    Copies the properties handled by the equivalence tester
+    from simulation_movement to the related delivery movement
+
+    NOTE: the future existence of this method is still unknown
+    because it is likely to be implemented in TargetSolver
+    instead.
+    """
diff --git a/product/ERP5/mixin/divergence_tester.py b/product/ERP5/mixin/equivalence_tester.py
similarity index 94%
rename from product/ERP5/mixin/divergence_tester.py
rename to product/ERP5/mixin/equivalence_tester.py
index cd7e86387a..63710fe98d 100644
--- a/product/ERP5/mixin/divergence_tester.py
+++ b/product/ERP5/mixin/equivalence_tester.py
@@ -31,20 +31,20 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, interfaces
 from Products.ERP5Type.DivergenceMessage import DivergenceMessage
 
-class DivergenceTesterMixin:
+class EquivalenceTesterMixin:
   """
   Provides generic methods and helper methods to implement
-  IDivergenceTester
+  IEquivalenceTester
   """
   # Declarative security
   security = ClassSecurityInfo()
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IDivergenceTester,)
+  zope.interface.implements(interfaces.IEquivalenceTester,)
 
-  # Implementation of IDivergenceTester
-  def testDivergence(self, simulation_movement):
+  # Implementation of IEquivalenceTester
+  def testEquivalence(self, simulation_movement):
     """
     Tests if simulation_movement is divergent. Returns False (0)
     or True (1).
@@ -59,7 +59,7 @@ class DivergenceTesterMixin:
   def explain(self, simulation_movement):
     """
     Returns a single message which explain the nature of
-    the divergence of simulation_movement with its related
+    the equivalence of simulation_movement with its related
     delivery movement.
 
     If decision_movement is a simulation movement, use
@@ -175,7 +175,7 @@ class DivergenceTesterMixin:
 
   def accept(self, simulation_movement):
     """
-    Copies the properties handled by the divergence tester
+    Copies the properties handled by the equivalence tester
     from the related delivery movement to simulation_movement.
 
     NOTE: the future existence of this method is still unknown
@@ -186,7 +186,7 @@ class DivergenceTesterMixin:
 
   def adopt(self, simulation_movement):
     """
-    Copies the properties handled by the divergence tester
+    Copies the properties handled by the equivalence tester
     from simulation_movement to the related delivery movement
 
     NOTE: the future existence of this method is still unknown
-- 
2.30.9