diff --git a/model/base_settings.py b/model/base_settings.py
index 764dc852702d632098a16106f50d9f88a5c1dea9_bW9kZWwvYmFzZV9zZXR0aW5ncy5weQ==..6c855abad76284c9867d1f5e401e0cc807ab80fd_bW9kZWwvYmFzZV9zZXR0aW5ncy5weQ== 100644
--- a/model/base_settings.py
+++ b/model/base_settings.py
@@ -1,8 +1,8 @@
-from openerp.osv import fields
-from openerp.osv import orm
+from openerp import fields
+from openerp import models
 from openerp import api
 
 
 _SAML_UID_AND_PASS_SETTING = 'auth_saml.allow_saml.uid_and_internal_password'
 
 
@@ -3,10 +3,10 @@
 from openerp import api
 
 
 _SAML_UID_AND_PASS_SETTING = 'auth_saml.allow_saml.uid_and_internal_password'
 
 
-class base_settings(orm.TransientModel):
+class base_settings(models.TransientModel):
     """Inherit from base.config.settings to add a setting. This is only here
     for easier access; the setting is not actually stored by this (transient)
     collection. Instead, it is kept in sync with the
@@ -17,10 +17,8 @@
 
     _inherit = 'base.config.settings'
 
-    _columns = {
-        'allow_saml_uid_and_internal_password': fields.boolean(
-            (
-                'Allow SAML users to posess an Odoo password (warning: '
-                'decreases security)'
-            ),
+    allow_saml_uid_and_internal_password = fields.Boolean(
+        (
+            'Allow SAML users to posess an Odoo password (warning: '
+            'decreases security)'
         ),
@@ -26,5 +24,5 @@
         ),
-    }
+    )
 
     # take care to name the function with another name to not clash with column
     @api.model
diff --git a/model/saml_token.py b/model/saml_token.py
index 764dc852702d632098a16106f50d9f88a5c1dea9_bW9kZWwvc2FtbF90b2tlbi5weQ==..6c855abad76284c9867d1f5e401e0cc807ab80fd_bW9kZWwvc2FtbF90b2tlbi5weQ== 100644
--- a/model/saml_token.py
+++ b/model/saml_token.py
@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
 __author__ = 'faide'
 
-
 import logging
@@ -5,6 +4,7 @@
 import logging
-from openerp.osv import osv, fields
+from openerp import fields
+from openerp import models
 
 _logger = logging.getLogger(__name__)
 
 
@@ -7,8 +7,8 @@
 
 _logger = logging.getLogger(__name__)
 
 
-class saml_token(osv.Model):
+class saml_token(models.Model):
     _name = "auth_saml.token"
     _rec_name = "user_id"
 
@@ -12,20 +12,18 @@
     _name = "auth_saml.token"
     _rec_name = "user_id"
 
-    _columns = {
-        'saml_provider_id': fields.many2one(
-            'auth.saml.provider',
-            string='SAML Provider that issued the token',
-        ),
-        'user_id': fields.many2one(
-            'res.users',
-            string="User",
-            # we want the token to be destroyed if the corresponding res.users
-            # is deleted
-            ondelete="cascade"
-        ),
-        'saml_access_token': fields.char(
-            'Current SAML token for this user',
-            help="The current SAML token in use",
-        ),
-    }
+    saml_provider_id = fields.Many2one(
+        'auth.saml.provider',
+        string='SAML Provider that issued the token',
+    )
+    user_id = fields.Many2one(
+        'res.users',
+        string="User",
+        # we want the token to be destroyed if the corresponding res.users
+        # is deleted
+        ondelete="cascade"
+    )
+    saml_access_token = fields.Char(
+        'Current SAML token for this user',
+        help="The current SAML token in use",
+    )