diff --git a/order_point.py b/order_point.py
index 332378e945..dc9e431483 100644
--- a/order_point.py
+++ b/order_point.py
@@ -1,10 +1,10 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
-from trytond.wizard import Wizard, WizardOSV
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.wizard import Wizard
 
 
-class OrderPoint(OSV):
+class OrderPoint(ModelSQL, ModelView):
     """
     Order Point: Provide a way to define a supply policy for each
     product on each locations. Order points on warehouse are
diff --git a/packing.py b/packing.py
index c659b1bf48..6a47d9f092 100644
--- a/packing.py
+++ b/packing.py
@@ -1,9 +1,9 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
+from trytond.model import ModelView, ModelSQL
 
 
-class PackingInternal(OSV):
+class PackingInternal(ModelSQL, ModelView):
     _name = 'stock.packing.internal'
 
     def generate_internal_packing(self, cursor, user, context=None):
diff --git a/product.py b/product.py
index 630e911e26..e1d2a41691 100644
--- a/product.py
+++ b/product.py
@@ -1,9 +1,10 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelView, ModelSQL, fields
 import datetime
 
 
-class Product(OSV):
+class Product(ModelSQL, ModelView):
     _name = "product.product"
 
     order_points = fields.One2Many(
diff --git a/purchase_request.py b/purchase_request.py
index fc458c8f9d..2aa45696ec 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -1,11 +1,11 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
-from trytond.wizard import Wizard, WizardOSV
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.wizard import Wizard
 import datetime
 
 
-class PurchaseRequest(OSV):
+class PurchaseRequest(ModelSQL, ModelView):
     'Purchase Request'
     _name = 'purchase.request'
     _description = __doc__
@@ -430,7 +430,7 @@ class PurchaseRequest(OSV):
 PurchaseRequest()
 
 
-class CreatePurchaseAskTerm(WizardOSV):
+class CreatePurchaseAskTerm(ModelView):
     'Create Purchase Ask Term'
     _name = 'purchase.request.create_purchase.ask_term'
     _description = __doc__
@@ -441,7 +441,7 @@ class CreatePurchaseAskTerm(WizardOSV):
 
 CreatePurchaseAskTerm()
 
-class CreatePurchaseAskParty(WizardOSV):
+class CreatePurchaseAskParty(ModelView):
     'Create Purchase Ask Party'
     _name = 'purchase.request.create_purchase.ask_party'
     _description = __doc__