diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGWizardBT5.xml b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/BusinessConfiguration_setupCustomerBT5.xml
similarity index 97%
rename from bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGWizardBT5.xml
rename to bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/BusinessConfiguration_setupCustomerBT5.xml
index 66ff2962d4065a81d675169a9dec83807eed772e..f0107e3caa87a13ae9321e9103d915cb02b5bd89 100644
--- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGWizardBT5.xml
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/BusinessConfiguration_setupCustomerBT5.xml
@@ -61,7 +61,7 @@ configuration_save.addConfigurationItem("Customer BT5 Configurator Item", \n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGWizardBT5</string> </value>
+            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator/bt/revision b/bt5/erp5_configurator/bt/revision
index f520b6ed4c0830e653ac02c1f8eec8c51d171997..1bc902939e155947506b04139b8b9dbfa10f3319 100644
--- a/bt5/erp5_configurator/bt/revision
+++ b/bt5/erp5_configurator/bt/revision
@@ -1 +1 @@
-530
\ No newline at end of file
+531
\ No newline at end of file
diff --git a/bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/30.xml b/bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/30.xml
index 7c85312689f55f000004766e7c5050b06030aec5..3b141e37ec97d6b984b1b12e392df8f643ff64be 100644
--- a/bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/30.xml
+++ b/bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/30.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_setupMaxmaDemoCustomerWizardBT5</string> </value>
+            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
diff --git a/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_setupMaxmaDemoCustomerWizardBT5.xml b/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_setupMaxmaDemoCustomerWizardBT5.xml
deleted file mode 100644
index d9230796c9188221c12a8b0c32433b1f9f9868d0..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_setupMaxmaDemoCustomerWizardBT5.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-configuration_save.addConfigurationItem("Customer BT5 Configurator Item", \n
-                                        # Define bt5 is is wrong. it should set title only.\n
-                                        bt5_title=\'_\'.join(context.getTitle().strip().lower().split()))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupMaxmaDemoCustomerWizardBT5</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Create a bt5 template that will contain customer configuration</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_maxma_demo/bt/revision b/bt5/erp5_configurator_maxma_demo/bt/revision
index aabe6ec3909c9d4871f8f89ef88ca3b6795ebd29..8fdd954df9831dfd29ceec0d74829b02f3f5d8c3 100644
--- a/bt5/erp5_configurator_maxma_demo/bt/revision
+++ b/bt5/erp5_configurator_maxma_demo/bt/revision
@@ -1 +1 @@
-21
+22
\ No newline at end of file
diff --git a/bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/30.xml b/bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/30.xml
index 417f2e7ae51272525e4dbe407be526fd08133714..72092e894244e5f9f47d33ee0dc9e741d0f13ec6 100644
--- a/bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/30.xml
+++ b/bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/30.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_setupRunMyDocWizardBT5</string> </value>
+            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
diff --git a/bt5/erp5_configurator_run_my_doc/SkinTemplateItem/portal_skins/erp5_configurator_run_my_doc/BusinessConfiguration_setupRunMyDocWizardBT5.xml b/bt5/erp5_configurator_run_my_doc/SkinTemplateItem/portal_skins/erp5_configurator_run_my_doc/BusinessConfiguration_setupRunMyDocWizardBT5.xml
deleted file mode 100644
index 77c24f6a4a503a2ba35e0d22286f92b23b74d063..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_run_my_doc/SkinTemplateItem/portal_skins/erp5_configurator_run_my_doc/BusinessConfiguration_setupRunMyDocWizardBT5.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-configuration_save.addConfigurationItem("Customer BT5 Configurator Item", \n
-                                        bt5_title=\'_\'.join(context.getTitle().strip().lower().split()))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupRunMyDocWizardBT5</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Create a bt5 template that will contain customer configuration</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_run_my_doc/bt/revision b/bt5/erp5_configurator_run_my_doc/bt/revision
index d8263ee9860594d2806b0dfd1bfd17528b0ba2a4..bf0d87ab1b2b0ec1a11a3973d2845b42413d9767 100644
--- a/bt5/erp5_configurator_run_my_doc/bt/revision
+++ b/bt5/erp5_configurator_run_my_doc/bt/revision
@@ -1 +1 @@
-2
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/30.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/30.xml
index 8d1820960ed04bc37db4b95c10075d9f7c57818c..c5b0743e4b1b3997fc138d92f35c2cde0af46ac1 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/30.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/30.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_setupCustomerWizardBT5</string> </value>
+            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/30.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/30.xml
index 5b547207291df8b1bdfc4ab5e6f5dc2a8091cea1..e7a6e32c97c64d00874dd3f032d325b57168e47b 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/30.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/30.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_setupCustomerWizardBT5</string> </value>
+            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
diff --git a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupCustomerWizardBT5.xml b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupCustomerWizardBT5.xml
deleted file mode 100644
index 1365532885918ac21ad9dca23d947e082731968d..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupCustomerWizardBT5.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-configuration_save.addConfigurationItem("Customer BT5 Configurator Item", \n
-                                        bt5_title=\'_\'.join(context.getTitle().strip().lower().split()))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupCustomerWizardBT5</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Create a bt5 template that will contain customer configuration</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_standard/bt/revision b/bt5/erp5_configurator_standard/bt/revision
index 282d20871cc15e3ba3484e25c322aba39a5a714c..8da60bbdfddc9864bfbdc58e21659d72465ec2e1 100644
--- a/bt5/erp5_configurator_standard/bt/revision
+++ b/bt5/erp5_configurator_standard/bt/revision
@@ -1 +1 @@
-612
+613
diff --git a/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow/30.xml b/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow/30.xml
index 44e4bd778cd6c417298d5da84334ca0a3c2403c9..fd32c5b05b79572f8ef5021d06306f6eb339a8e6 100644
--- a/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow/30.xml
+++ b/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow/30.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGWizardBT5</string> </value>
+            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
diff --git a/bt5/erp5_configurator_ung/bt/revision b/bt5/erp5_configurator_ung/bt/revision
index 59343b09ec765366a5b0ac04196385079acd864e..43c451e0c6da52ad30bb605a60c7cb34497f3d30 100644
--- a/bt5/erp5_configurator_ung/bt/revision
+++ b/bt5/erp5_configurator_ung/bt/revision
@@ -1 +1 @@
-53
+54
\ No newline at end of file