diff --git a/account_payment_mode/README.rst b/account_payment_mode/README.rst
index ac0f3a6e4..e5e261973 100644
--- a/account_payment_mode/README.rst
+++ b/account_payment_mode/README.rst
@@ -20,7 +20,7 @@ This module doesn't add any feature, but it is used by several other modules.
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/173/9.0
+   :target: https://runbot.odoo-community.org/runbot/173/10.0
 
 Bug Tracker
 ===========
diff --git a/account_payment_mode/__manifest__.py b/account_payment_mode/__manifest__.py
index 199c4fea2..31c881ef0 100644
--- a/account_payment_mode/__manifest__.py
+++ b/account_payment_mode/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'Account Payment Mode',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'license': 'AGPL-3',
     'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/bank-payment',
@@ -19,5 +19,5 @@
         'views/account_journal.xml',
     ],
     'demo': ['demo/payment_demo.xml'],
-    'installable': False,
+    'installable': True,
 }
diff --git a/account_payment_mode/demo/payment_demo.xml b/account_payment_mode/demo/payment_demo.xml
index a00c13b34..29b4c2685 100644
--- a/account_payment_mode/demo/payment_demo.xml
+++ b/account_payment_mode/demo/payment_demo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
+<odoo noupdate="1">
 
 <record id="bank_fiducial" model="res.bank">
     <field name="name">Fiducial Banque</field>
@@ -106,5 +105,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_mode/models/account_journal.py b/account_payment_mode/models/account_journal.py
index 6ba0b3626..7e555678a 100644
--- a/account_payment_mode/models/account_journal.py
+++ b/account_payment_mode/models/account_journal.py
@@ -2,7 +2,7 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class AccountJournal(models.Model):
diff --git a/account_payment_mode/models/account_payment_method.py b/account_payment_mode/models/account_payment_method.py
index 748027a4d..6a976e4a6 100644
--- a/account_payment_mode/models/account_payment_method.py
+++ b/account_payment_mode/models/account_payment_method.py
@@ -2,7 +2,7 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class AccountPaymentMethod(models.Model):
diff --git a/account_payment_mode/models/account_payment_mode.py b/account_payment_mode/models/account_payment_mode.py
index a1d2e60eb..878a686e0 100644
--- a/account_payment_mode/models/account_payment_mode.py
+++ b/account_payment_mode/models/account_payment_mode.py
@@ -2,8 +2,8 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import ValidationError
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 
 class AccountPaymentMode(models.Model):
diff --git a/account_payment_mode/models/res_partner_bank.py b/account_payment_mode/models/res_partner_bank.py
index 4e9b0a2a5..fa4ff05f8 100644
--- a/account_payment_mode/models/res_partner_bank.py
+++ b/account_payment_mode/models/res_partner_bank.py
@@ -2,7 +2,7 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class ResPartnerBank(models.Model):
diff --git a/account_payment_mode/views/account_journal.xml b/account_payment_mode/views/account_journal.xml
index b7873ba5d..b3816ba6f 100644
--- a/account_payment_mode/views/account_journal.xml
+++ b/account_payment_mode/views/account_journal.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
 
 <!-- FIX of the 'account' module: on the form view of a bank journal,
 allow to link to an existing bank account -->
@@ -25,5 +24,4 @@ allow to link to an existing bank account -->
     </field>
 </record>
 
-</data>
 </odoo>
diff --git a/account_payment_mode/views/account_payment_method.xml b/account_payment_mode/views/account_payment_method.xml
index f467f01f6..0602e8bc2 100644
--- a/account_payment_mode/views/account_payment_method.xml
+++ b/account_payment_mode/views/account_payment_method.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
 
 <!-- The object account.payment.method is defined in the account module
 but there are no view for this object in the account module... so we define it
@@ -59,5 +58,4 @@ here. I hate the objects that don't have a view... -->
             parent="account.account_management_menu"
             sequence="30" />
 
-</data>
 </odoo>
diff --git a/account_payment_mode/views/account_payment_mode.xml b/account_payment_mode/views/account_payment_mode.xml
index aa67cb2ec..845641479 100644
--- a/account_payment_mode/views/account_payment_mode.xml
+++ b/account_payment_mode/views/account_payment_mode.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 <record id="account_payment_mode_form" model="ir.ui.view">
     <field name="name">account.payment.mode.form</field>
@@ -68,5 +67,4 @@
             parent="account.account_management_menu"
             sequence="25" />
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_mode/views/res_partner.xml b/account_payment_mode/views/res_partner.xml
index b4e308840..9aef62a24 100644
--- a/account_payment_mode/views/res_partner.xml
+++ b/account_payment_mode/views/res_partner.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 
 <!-- Avoid creation of bank accounts linked to contacts.
@@ -19,5 +18,4 @@ which prevents the selection of a contact -->
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_mode/views/res_partner_bank.xml b/account_payment_mode/views/res_partner_bank.xml
index ebdc48ec2..6ccd79778 100644
--- a/account_payment_mode/views/res_partner_bank.xml
+++ b/account_payment_mode/views/res_partner_bank.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 <!-- Show acc_type on res.partner.bank in order to be able to
 detect wrong IBANs -->
@@ -41,5 +40,4 @@ detect wrong IBANs -->
 </record>
 
 
-</data>
-</openerp>
+</odoo>