diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
index 61d6352cc270be0ba00e9d1670f96a00130b46d6..60948d3f06434de392e2822b187d573b00ed9c1a 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addSimulatedDeliveryBuilder</string> </value>
+            <value> <string>addOrderBuilder</string> </value>
         </item>
         <item>
             <key> <string>filter_content_types</string> </key>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 23696d23aec43da66cd4b6f2335384dbd87762a0..e517ae7abfeb03256eb2967ed960048ee4dadeb6 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-916
\ No newline at end of file
+917
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/DocumentTemplateItem/OrderBuilder.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/OrderBuilder.py
new file mode 100644
index 0000000000000000000000000000000000000000..e0a363deaf0cd208819c185291c018792d85b9a2
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/DocumentTemplateItem/OrderBuilder.py
@@ -0,0 +1,27 @@
+##############################################################################
+# 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 advised 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.
+#
+##############################################################################
+
+from Products.ERP5Legacy.OrderBuilder import OrderBuilder
diff --git a/bt5/erp5_simulation_legacy/DocumentTemplateItem/SimulatedDeliveryBuilder.py b/bt5/erp5_simulation_legacy/DocumentTemplateItem/SimulatedDeliveryBuilder.py
new file mode 100644
index 0000000000000000000000000000000000000000..6606405225d94cb416d33661d512a506c2937c8d
--- /dev/null
+++ b/bt5/erp5_simulation_legacy/DocumentTemplateItem/SimulatedDeliveryBuilder.py
@@ -0,0 +1,27 @@
+##############################################################################
+# 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 advised 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.
+#
+##############################################################################
+
+from Products.ERP5Legacy.Document.DeliveryBuilder import DeliveryBuilder as SimulatedDeliveryBuilder
diff --git a/bt5/erp5_simulation_legacy/bt/revision b/bt5/erp5_simulation_legacy/bt/revision
index 62f9457511f879886bb7728c986fe10b0ece6bcb..c7930257dfef505fd996e1d6f22f2f35149990d0 100644
--- a/bt5/erp5_simulation_legacy/bt/revision
+++ b/bt5/erp5_simulation_legacy/bt/revision
@@ -1 +1 @@
-6
\ No newline at end of file
+7
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/bt/template_document_id_list b/bt5/erp5_simulation_legacy/bt/template_document_id_list
index 25df69c41791f98dba3ad2c26bb9f603b06d2fe7..26d0c820570c5d8c571d186a6be8f79398a74d51 100644
--- a/bt5/erp5_simulation_legacy/bt/template_document_id_list
+++ b/bt5/erp5_simulation_legacy/bt/template_document_id_list
@@ -5,10 +5,12 @@ DeliverySimulationRule
 InvoiceRootSimulationRule
 InvoiceSimulationRule
 InvoiceTransactionSimulationRule
+OrderBuilder
 OrderRootSimulationRule
 PaymentSimulationRule
 ProductionOrderModelRootSimulationRule
 ProductionOrderRootSimulationRule
 RootAppliedRuleCausalityMovementGroup
+SimulatedDeliveryBuilder
 SimulationLegacyPatches
 TradeModelSimulationRule
\ No newline at end of file
diff --git a/product/ERP5/Document/OrderBuilder.py b/product/ERP5/Document/OrderBuilder.py
new file mode 100644
index 0000000000000000000000000000000000000000..b16fb5f9eaf21ac9028f94827468828c08a99d16
--- /dev/null
+++ b/product/ERP5/Document/OrderBuilder.py
@@ -0,0 +1,31 @@
+##############################################################################
+# 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 advised 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.
+#
+##############################################################################
+
+# BACK: Temporary document so that legacy code can have its own set of classes
+#       for builders, and still distinguish order builders from others
+#       Once legacy simulation is dropped, "Order Builder" portal type should
+#       should be changed to use SimulatedDeliveryBuilder class.
+from SimulatedDeliveryBuilder import SimulatedDeliveryBuilder as OrderBuilder
diff --git a/product/ERP5Legacy/Document/DeliveryBuilder.py b/product/ERP5Legacy/Document/DeliveryBuilder.py
index cec598ed18cde92fe085764fe0bd2e94cadc10a4..f3b8d8189ca0a54f27806a63b095dd02f50aa854 100644
--- a/product/ERP5Legacy/Document/DeliveryBuilder.py
+++ b/product/ERP5Legacy/Document/DeliveryBuilder.py
@@ -29,8 +29,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5Legacy.Document.OrderBuilder import OrderBuilder, \
-        SelectMethodError
+from Products.ERP5Legacy.OrderBuilder import OrderBuilder, SelectMethodError
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
 from Products.ERP5Type.CopySupport import CopyError, tryMethodCallWithTemporaryPermission
 
diff --git a/product/ERP5Legacy/Document/OrderBuilder.py b/product/ERP5Legacy/OrderBuilder.py
similarity index 100%
rename from product/ERP5Legacy/Document/OrderBuilder.py
rename to product/ERP5Legacy/OrderBuilder.py