diff --git a/bt5/erp5_bpm/ActionTemplateItem/portal_types/Delivery%20Builder/view_periodicity.xml b/bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Delivery%20Builder/view_periodicity.xml
similarity index 100%
rename from bt5/erp5_bpm/ActionTemplateItem/portal_types/Delivery%20Builder/view_periodicity.xml
rename to bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Delivery%20Builder/view_periodicity.xml
diff --git a/bt5/erp5_bpm/ActionTemplateItem/portal_types/Order%20Builder/view_periodicity.xml b/bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Order%20Builder/view_periodicity.xml
similarity index 100%
rename from bt5/erp5_bpm/ActionTemplateItem/portal_types/Order%20Builder/view_periodicity.xml
rename to bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Order%20Builder/view_periodicity.xml
diff --git a/bt5/erp5_bpm/DocumentTemplateItem/OrderBuilder.py b/bt5/erp5_bpm/DocumentTemplateItem/BPMDeliveryBuilder.py
similarity index 92%
rename from bt5/erp5_bpm/DocumentTemplateItem/OrderBuilder.py
rename to bt5/erp5_bpm/DocumentTemplateItem/BPMDeliveryBuilder.py
index b23d93c262430b52d42ff70595a6f6bbd117bc35..49789237c9713082a773970e9e6f1d95acc4c0fe 100644
--- a/bt5/erp5_bpm/DocumentTemplateItem/OrderBuilder.py
+++ b/bt5/erp5_bpm/DocumentTemplateItem/BPMDeliveryBuilder.py
@@ -30,7 +30,7 @@
 
 from Products.ERP5Type.Document.BPMBuilder import BPMBuilder
 
-class OrderBuilder(BPMBuilder):
+class BPMDeliveryBuilder(BPMBuilder):
   # CMF Type Definition
-  meta_type = 'ERP5 Order Builder'
-  portal_type = 'Order Builder'
+  meta_type = 'ERP5 BPM Delivery Builder'
+  portal_type = 'BPM Delivery Builder'
diff --git a/bt5/erp5_bpm/DocumentTemplateItem/DeliveryBuilder.py b/bt5/erp5_bpm/DocumentTemplateItem/BPMOrderBuilder.py
similarity index 93%
rename from bt5/erp5_bpm/DocumentTemplateItem/DeliveryBuilder.py
rename to bt5/erp5_bpm/DocumentTemplateItem/BPMOrderBuilder.py
index 62fd0f8a491889642a694c10723b9d3a8789b7b0..50bf09427440ef2a8bd8b5adc0180e3f6143e296 100644
--- a/bt5/erp5_bpm/DocumentTemplateItem/DeliveryBuilder.py
+++ b/bt5/erp5_bpm/DocumentTemplateItem/BPMOrderBuilder.py
@@ -30,7 +30,7 @@
 
 from Products.ERP5Type.Document.BPMBuilder import BPMBuilder
 
-class DeliveryBuilder(BPMBuilder):
+class BPMOrderBuilder(BPMBuilder):
   # CMF Type Definition
-  meta_type = 'ERP5 Delivery Builder'
-  portal_type = 'Delivery Builder'
+  meta_type = 'ERP5 BPM Order Builder'
+  portal_type = 'BPM Order Builder'
diff --git a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml
index d03e3ab75e1e4d3a26f71c4557212a1801e8f052..435bd912c3d69f08ff6bdbc7690e01771c940120 100644
--- a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml
+++ b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <global name="BPMDeliveryBuilder" module="Products.ERP5Type.Document.BPMDeliveryBuilder"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml
index 53073da249fc8c76754f6aa137aec3c9616757f7..d0d07ba014ba87357b57eee87daa449ab4dc0ed5 100644
--- a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml
+++ b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <global name="BPMDeliveryBuilder" module="Products.ERP5Type.Document.BPMDeliveryBuilder"/>
         <tuple/>
       </tuple>
     </pickle>
diff --git a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Delivery%20Builder.xml
similarity index 96%
rename from bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
rename to bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Delivery%20Builder.xml
index fc1cbabb5d36655f33ad30cefad1776e603855f8..c1bb32412511fe1a71056b9acd63da02ea52bd58 100644
--- a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
+++ b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Delivery%20Builder.xml
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Delivery Builder</string> </value>
+            <value> <string>ERP5 BPM Delivery Builder</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -106,7 +106,7 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addDeliveryBuilder</string> </value>
+            <value> <string>addBPMDeliveryBuilder</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
@@ -128,7 +128,7 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Delivery Builder</string> </value>
+            <value> <string>BPM Delivery Builder</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
diff --git a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Order%20Builder.xml b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Order%20Builder.xml
similarity index 95%
rename from bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
rename to bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Order%20Builder.xml
index 71e4a8c6776e0368e29a14c2a085b2c1f6dd9812..417cf6152dc92507adcf82aa4ab2c391da8a3723 100644
--- a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
+++ b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Order%20Builder.xml
@@ -49,7 +49,7 @@
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Order Builder</string> </value>
+            <value> <string>ERP5 BPM Order Builder</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -91,7 +91,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addOrderBuilder</string> </value>
+            <value> <string>addBPMOrderBuilder</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
@@ -113,7 +113,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Order Builder</string> </value>
+            <value> <string>BPM Order Builder</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
diff --git a/bt5/erp5_bpm/bt/revision b/bt5/erp5_bpm/bt/revision
index d3b981955773e59576c06a329282e9e01940b1ef..34251f6b242e79eb02dc1c4040ddbaa9fc924fce 100644
--- a/bt5/erp5_bpm/bt/revision
+++ b/bt5/erp5_bpm/bt/revision
@@ -1 +1 @@
-246
\ No newline at end of file
+247
\ No newline at end of file
diff --git a/bt5/erp5_bpm/bt/template_action_path_list b/bt5/erp5_bpm/bt/template_action_path_list
index b13b0b7cc6b37598f196392114a3a98784bfb461..8b981de3fc7cde69b062dd382b806170f0268840 100644
--- a/bt5/erp5_bpm/bt/template_action_path_list
+++ b/bt5/erp5_bpm/bt/template_action_path_list
@@ -1,3 +1,3 @@
-Delivery Builder | view_periodicity
+BPM Delivery Builder | view_periodicity
 Delivery Tool | view
-Order Builder | view_periodicity
\ No newline at end of file
+BPM Order Builder | view_periodicity
\ No newline at end of file
diff --git a/bt5/erp5_bpm/bt/template_document_id_list b/bt5/erp5_bpm/bt/template_document_id_list
index bb50cf04d2ff4b27beefcc4e55136db954abe36a..4fdbe5d5dadc0014c257c258800385eacc0b4dad 100644
--- a/bt5/erp5_bpm/bt/template_document_id_list
+++ b/bt5/erp5_bpm/bt/template_document_id_list
@@ -1,2 +1,2 @@
-OrderBuilder
-DeliveryBuilder
\ No newline at end of file
+BPMOrderBuilder
+BPMDeliveryBuilder
\ No newline at end of file
diff --git a/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a570d04344d57d938d3380dbf141384abfcc8baa 100644
--- a/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list
@@ -0,0 +1,2 @@
+Delivery Tool | BPM Delivery Builder
+Delivery Tool | BPM Order Builder
\ No newline at end of file
diff --git a/bt5/erp5_bpm/bt/template_portal_type_id_list b/bt5/erp5_bpm/bt/template_portal_type_id_list
index 65ac9ad3bb60eeedc6c4cc48b57294dbd5ad26d0..5aca5e5c89672f53654349b9c9d55e3e740b3e91 100644
--- a/bt5/erp5_bpm/bt/template_portal_type_id_list
+++ b/bt5/erp5_bpm/bt/template_portal_type_id_list
@@ -1,2 +1,2 @@
-Delivery Builder
-Order Builder
\ No newline at end of file
+BPM Delivery Builder
+BPM Order Builder
\ No newline at end of file