diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/configuration.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/configuration.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/configuration.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/view.xml
similarity index 100%
rename from bt5/erp5_simulation/ActionTemplateItem/portal_types/Adoption%20Solver/view.xml
rename to bt5/erp5_simulation/ActionTemplateItem/portal_types/Adopt%20Solver/view.xml
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Adoption%20Solver/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Adoption%20Solver/configuration.xml
deleted file mode 100644
index 4c964274bc47a91404890d8aa391201dadb38698..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Adoption%20Solver/configuration.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_view</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_view</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>configuration</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Action Information</string> </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>2.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Configuration</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/Solver_viewConfiguration</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Adoption%20Solver/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Adoption%20Solver/view.xml
deleted file mode 100644
index f4a6ec433a2d26ee6181ac5a4761afd049238835..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Resource%20Adoption%20Solver/view.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_view</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_view</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>view</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Action Information</string> </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>View</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/TargetSolver_view</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index ee9a77afedf04f29ae10781fbac14348d2b10734..9d12d11259b1fc503e138771ddda17f3466c1ea2 100644
--- a/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_simulation/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -49,7 +49,7 @@
</portal_type>
<portal_type id="Solver Process">
<item>Accept Solver</item>
- <item>Adoption Solver</item>
+ <item>Adopt Solver</item>
<item>Production Reduction Solver</item>
<item>Quantity Split Solver</item>
<item>Solver Decision</item>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adoption%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adopt%20Solver.xml
similarity index 97%
rename from bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adoption%20Solver.xml
rename to bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adopt%20Solver.xml
index 387026d6f31d9398813bdfee08a398c191c4d768..6edbc16d3c79ea5d7454a1d97f4d56b398114c02 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adoption%20Solver.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Adopt%20Solver.xml
@@ -41,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Adoption Solver</string> </value>
+ <value> <string>Adopt Solver</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Adoption%20Solver.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Adoption%20Solver.xml
deleted file mode 100644
index 415cc15953306894d711659592f0dab89c9ae8e9..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Resource%20Adoption%20Solver.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="SolverTypeInformation" module="Products.ERP5Type.Document.SolverTypeInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>configuration_form_id</string> </key>
- <value> <string>Solver_viewConfiguration</string> </value>
- </item>
- <item>
- <key> <string>configuration_property_list</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>delivery_solver</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The resource adoption solver resets the resource value of the delivery movement to the resource value of simulation. It eventually splits the movement and triggers rebuild in case multiple resources exist in the simulation.</string> </value>
- </item>
- <item>
- <key> <string>factory</string> </key>
- <value> <string>addAdoptSolver</string> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>target_solver</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Resource Adoption Solver</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>line_exclusive</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>line_grouping</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Solver Type</string> </value>
- </item>
- <item>
- <key> <string>solver_action_title</string> </key>
- <value> <string>Replace Resource</string> </value>
- </item>
- <item>
- <key> <string>tested_property</string> </key>
- <value> <string>resource</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index b9b171cbf2d7babf36018b78c39b3b330b17f452..fec13b5871ee3f7c15fdd391ae5585372ce32d62 100644
--- a/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_simulation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -4,7 +4,7 @@
<workflow>solver_workflow</workflow>
</chain>
<chain>
- <type>Adoption Solver</type>
+ <type>Adopt Solver</type>
<workflow>solver_workflow</workflow>
</chain>
<chain>
diff --git a/bt5/erp5_simulation/bt/template_action_path_list b/bt5/erp5_simulation/bt/template_action_path_list
index c8db0e17c72f552caad34de572f4687970fb1a05..8678c56b596d9b2a14cf75db4c65182d24dfce83 100644
--- a/bt5/erp5_simulation/bt/template_action_path_list
+++ b/bt5/erp5_simulation/bt/template_action_path_list
@@ -1,7 +1,7 @@
Accept Solver | configuration
Accept Solver | view
-Adoption Solver | configuration
-Adoption Solver | view
+Adopt Solver | configuration
+Adopt Solver | view
Category Membership Divergence Tester | configuration
Category Membership Divergence Tester | predicate
Category Membership Divergence Tester | view
diff --git a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
index c41d476e02b7ad1c44169383ebde2d9b62fbb7d5..aaa2b2fa25edcbf326c56c99ae4e5ee7dfdb675c 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_allowed_content_type_list
@@ -35,7 +35,7 @@ Payment Rule | Net Converted Quantity Divergence Tester
Payment Rule | String Divergence Tester
Payment Rule | Variation Divergence Tester
Solver Process | Accept Solver
-Solver Process | Adoption Solver
+Solver Process | Adopt Solver
Solver Process | Production Reduction Solver
Solver Process | Quantity Split Solver
Solver Process | Solver Decision
diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list
index d477fb1081149e80773c6f473389c733bf143678..1cf2c15c9f3f729984f3c638391ffdb15aec949d 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_id_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_id_list
@@ -1,5 +1,5 @@
Accept Solver
-Adoption Solver
+Adopt Solver
Category Membership Divergence Tester
DateTime Divergence Tester
Float Divergence Tester
diff --git a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
index 5260d9bf6b95f65ff572fa5f0e412d78e865ac5b..81a7c1042c20b4ae3fe9c8c306b32fe0021b4067 100644
--- a/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_simulation/bt/template_portal_type_workflow_chain_list
@@ -1,5 +1,5 @@
Accept Solver | solver_workflow
-Adoption Solver | solver_workflow
+Adopt Solver | solver_workflow
Category Membership Divergence Tester | edit_workflow
DateTime Divergence Tester | edit_workflow
Float Divergence Tester | edit_workflow