diff --git a/order_point.py b/order_point.py
index c4cc1f33a5..278d5100d9 100644
--- a/order_point.py
+++ b/order_point.py
@@ -8,7 +8,7 @@ class OrderPoint(OSV):
     product on each locations. Order points on warehouse are
     conciderer by the supply scheduler to generate purchase requests.
     """
-    _name = 'supply.order_point'
+    _name = 'stock.order_point'
     _description = __doc__
 
     product = fields.Many2One(
diff --git a/order_point.xml b/order_point.xml
index 87c4d81220..e01bbce867 100644
--- a/order_point.xml
+++ b/order_point.xml
@@ -3,7 +3,7 @@
 <tryton>
     <data>
         <record model="ir.ui.view" id="order_point_view_form">
-            <field name="model">supply.order_point</field>
+            <field name="model">stock.order_point</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
@@ -23,7 +23,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="order_point_view_tree">
-            <field name="model">supply.order_point</field>
+            <field name="model">stock.order_point</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <![CDATA[
@@ -40,7 +40,7 @@
 
         <record model="ir.action.act_window" id="act_order_point_form">
             <field name="name">Order Points</field>
-            <field name="res_model">supply.order_point</field>
+            <field name="res_model">stock.order_point</field>
             <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_order_point_form_view1">
diff --git a/product.py b/product.py
index 631e633748..630e911e26 100644
--- a/product.py
+++ b/product.py
@@ -7,6 +7,6 @@ class Product(OSV):
     _name = "product.product"
 
     order_points = fields.One2Many(
-        'supply.order_point', 'product', 'Order Points')
+        'stock.order_point', 'product', 'Order Points')
 
 Product()
diff --git a/purchase_request.py b/purchase_request.py
index 8ac56b884b..a8ab617b56 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -7,7 +7,7 @@ import datetime
 # (uom, qty, product, ...).
 class PurchaseRequest(OSV):
     'Purchase Request'
-    _name = 'supply.purchase_request'
+    _name = 'stock.purchase_request'
     _description = __doc__
 
     product = fields.Many2One(
@@ -37,7 +37,7 @@ PurchaseRequest()
 
 
 class CreatePurchaseAsk(WizardOSV):
-    _name = 'supply.purchase_request.create_purchase.ask'
+    _name = 'stock.purchase_request.create_purchase.ask'
     party = fields.Many2One('relationship.party', 'Supplier', readonly=True)
     company = fields.Many2One('company.company', 'Company', readonly=True)
     payment_term = fields.Many2One(
@@ -47,7 +47,7 @@ CreatePurchaseAsk()
 
 class CreatePurchase(Wizard):
     'Create Purchase'
-    _name = 'supply.purchase_request.create_purchase'
+    _name = 'stock.purchase_request.create_purchase'
 
     states = {
 
@@ -70,7 +70,7 @@ class CreatePurchase(Wizard):
             'actions': ['_set_default'],
             'result': {
                 'type': 'form',
-                'object': 'supply.purchase_request.create_purchase.ask',
+                'object': 'stock.purchase_request.create_purchase.ask',
                 'state': [
                     ('end', 'Cancel', 'tryton-cancel'),
                     ('choice', 'Continue', 'tryton-ok', True),
@@ -116,7 +116,7 @@ class CreatePurchase(Wizard):
         return 'create'
 
     def _compute_purchase(self, cursor, user, data, context=None):
-        request_obj = self.pool.get('supply.purchase_request')
+        request_obj = self.pool.get('stock.purchase_request')
         requests = request_obj.browse(cursor, user, data['ids'], context=context)
         purchases = {}
         for request in requests:
@@ -157,7 +157,7 @@ class CreatePurchase(Wizard):
         return {}
 
     def _create_purchase(self, cursor, user, data, context=None):
-        request_obj = self.pool.get('supply.purchase_request')
+        request_obj = self.pool.get('stock.purchase_request')
         purchase_obj = self.pool.get('purchase.purchase')
         line_obj = self.pool.get('purchase.line')
         product_obj = self.pool.get('product.product')
diff --git a/purchase_request.xml b/purchase_request.xml
index d005dd7529..6f1a21cf5e 100644
--- a/purchase_request.xml
+++ b/purchase_request.xml
@@ -3,7 +3,7 @@
 <tryton>
     <data>
         <record model="ir.ui.view" id="purchase_request_view_form">
-            <field name="model">supply.purchase_request</field>
+            <field name="model">stock.purchase_request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
@@ -33,7 +33,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="purchase_request_view_tree">
-            <field name="model">supply.purchase_request</field>
+            <field name="model">stock.purchase_request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <![CDATA[
@@ -55,7 +55,7 @@
 
         <record model="ir.action.act_window" id="act_purchase_request_form">
             <field name="name">Purchase Requests</field>
-            <field name="res_model">supply.purchase_request</field>
+            <field name="res_model">stock.purchase_request</field>
             <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_purchase_request_form_view1">
@@ -74,7 +74,7 @@
 
 
         <record model="ir.ui.view" id="create_purchase.ask_form">
-            <field name="model">supply.purchase_request.create_purchase.ask</field>
+            <field name="model">stock.purchase_request.create_purchase.ask</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
@@ -91,11 +91,11 @@
         </record>
         <record model="ir.action.wizard" id="wizard_create_purchase">
             <field name="name">Create Purchase</field>
-            <field name="wiz_name">supply.purchase_request.create_purchase</field>
+            <field name="wiz_name">stock.purchase_request.create_purchase</field>
         </record>
         <record model="ir.action.keyword" id="create_purchase_keyword">
             <field name="keyword">form_action</field>
-            <field name="model">supply.purchase_request,0</field>
+            <field name="model">stock.purchase_request,0</field>
             <field name="action" ref="wizard_create_purchase"/>
         </record>
 
diff --git a/supply_schedule.py b/supply_schedule.py
index f26460dcd8..12cd7dc9a2 100644
--- a/supply_schedule.py
+++ b/supply_schedule.py
@@ -6,7 +6,7 @@ import datetime
 
 class GeneratePurchaseRequest(Wizard):
     'Generate Purchase Requests'
-    _name = 'supply.generate_purchase_request'
+    _name = 'stock.generate_purchase_request'
     states = {
         'init': {
             'result': {
@@ -23,8 +23,8 @@ class GeneratePurchaseRequest(Wizard):
         For each order point compute the purchase that must be create
         today to meet product outputs.
         """
-        order_point_obj = self.pool.get('supply.order_point')
-        purchase_request_obj = self.pool.get('supply.purchase_request')
+        order_point_obj = self.pool.get('stock.order_point')
+        purchase_request_obj = self.pool.get('stock.purchase_request')
         product_obj = self.pool.get('product.product')
         order_point_ids = order_point_obj.search(
             cursor, user, [], context=context)
@@ -76,7 +76,7 @@ class GeneratePurchaseRequest(Wizard):
         """
         # delete purchase request without a purchase line
         uom_obj = self.pool.get('product.uom')
-        request_obj = self.pool.get('supply.purchase_request')
+        request_obj = self.pool.get('stock.purchase_request')
         product_supplier_obj = self.pool.get('purchase.product_supplier')
         req_ids = request_obj.search(
             cursor, user, [('purchase_line', '=', False)], context=context)
diff --git a/supply_schedule.xml b/supply_schedule.xml
index efe8dcfee9..f25f6d8b2a 100644
--- a/supply_schedule.xml
+++ b/supply_schedule.xml
@@ -4,7 +4,7 @@
     <data>
         <record model="ir.action.wizard" id="act_generate_purchase_request">
             <field name="name">Generate Purchase Requests</field>
-            <field name="wiz_name">supply.generate_purchase_request</field>
+            <field name="wiz_name">stock.generate_purchase_request</field>
         </record>
         <menuitem parent="purchase.menu_purchase" action="act_generate_purchase_request"
                   id="menu_generate_purchase_request"/>