diff --git a/location.py b/location.py
index e96c4772d0..9e56f8275f 100644
--- a/location.py
+++ b/location.py
@@ -1,10 +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, fields
 
 
-class ProductLocation(OSV):
+class ProductLocation(ModelSQL, ModelView):
     '''
     Product Location defines the default storage location
         by warehouse for a product
@@ -28,7 +27,7 @@ class ProductLocation(OSV):
 ProductLocation()
 
 
-class PackingIn(OSV):
+class PackingIn(ModelSQL, ModelView):
     _name = 'stock.packing.in'
 
     def _get_inventory_moves(self, cursor, user, incoming_move, context=None):
diff --git a/product.py b/product.py
index 0c6c12ca48..89e8afc7ef 100644
--- a/product.py
+++ b/product.py
@@ -1,10 +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, fields
 
 
-class Product(OSV):
+class Product(ModelSQL, ModelView):
     _name = 'product.product'
 
     locations = fields.One2Many('stock.product.location', 'product',