diff --git a/addons/account_cash_basis_base_account/account_partial_reconcile.py b/addons/account_cash_basis_base_account/account_partial_reconcile.py

index 6e51ac6..8a089e8 100644

--- a/addons/account_cash_basis_base_account/account_partial_reconcile.py

+++ b/addons/account_cash_basis_base_account/account_partial_reconcile.py

@@ -1,7 +1,7 @@

 # -*- coding: utf-8 -*-

 # Part of Odoo. See LICENSE file for full copyright and licensing details.

-from openerp import api, models

+from odoo import api, models

 class AccountPartialReconcileCashBasis(models.Model):

diff --git a/addons/account_cash_basis_base_account/account_tax.py b/addons/account_cash_basis_base_account/account_tax.py

index d8b6c4c..57a4276 100644

--- a/addons/account_cash_basis_base_account/account_tax.py

+++ b/addons/account_cash_basis_base_account/account_tax.py

@@ -1,6 +1,6 @@

 # -*- coding: utf-8 -*-

-from openerp import api, fields, models

+from odoo import api, fields, models

 class AccountTax(models.Model):

diff --git a/addons/hw_screen/controllers/main.py b/addons/hw_screen/controllers/main.py

index b8e59fb..935ac77 100644

--- a/addons/hw_screen/controllers/main.py

+++ b/addons/hw_screen/controllers/main.py

@@ -4,7 +4,7 @@

 from odoo import http

 from odoo.tools import config

 from odoo.addons.web.controllers import main as web

-from openerp.addons.hw_posbox_homepage.controllers import main as homepage

+from odoo.addons.hw_posbox_homepage.controllers import main as homepage

 import logging

 import netifaces as ni

diff --git a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py

index 6f93340..8cd06cc 100644

--- a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py

@@ -1,7 +1,7 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/l10n_fr/migrations/9.0.1.1/pre-set_tags_and_taxes_updatable.py b/addons/l10n_fr/migrations/9.0.1.1/pre-set_tags_and_taxes_updatable.py

index 586ae98..4cea1bd 100644

--- a/addons/l10n_fr/migrations/9.0.1.1/pre-set_tags_and_taxes_updatable.py

+++ b/addons/l10n_fr/migrations/9.0.1.1/pre-set_tags_and_taxes_updatable.py

@@ -1,7 +1,7 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

+    from odoo.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

     migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_fr')

diff --git a/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

index fa56fd0..7de1ed4 100644

--- a/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

index a37770d..c332938 100644

--- a/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,7 +1,7 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/l10n_no/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_no/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

index fa1694f..a84913b 100644

--- a/addons/l10n_no/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

+++ b/addons/l10n_no/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

@@ -1,7 +1,7 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

+    from odoo.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

     migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_no')

diff --git a/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

index fa56fd0..7de1ed4 100644

--- a/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/l10n_pl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_pl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

index b587dd4..9df0683 100644

--- a/addons/l10n_pl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

+++ b/addons/l10n_pl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

+    from odoo.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

     migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_pl')

diff --git a/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

index fa56fd0..7de1ed4 100644

--- a/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/l10n_sg/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_sg/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

index 8d963db..6b6f283 100644

--- a/addons/l10n_sg/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

+++ b/addons/l10n_sg/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

+    from odoo.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable

     migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_sg')

diff --git a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

index fa56fd0..7de1ed4 100644

--- a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

index fa56fd0..7de1ed4 100644

--- a/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

+++ b/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +1,6 @@

-from openerp.modules.registry import RegistryManager

+from odoo.modules.registry import RegistryManager

 def migrate(cr, version):

     registry = RegistryManager.get(cr.dbname)

-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes

+    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes

     migrate_tags_on_taxes(cr, registry)

diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py

index e67010c..a99a7e1 100644

--- a/addons/mass_mailing/models/mail_mail.py

+++ b/addons/mass_mailing/models/mail_mail.py

@@ -6,7 +6,7 @@ import werkzeug.urls

 from odoo import api, fields, models, tools

-from openerp.addons.link_tracker.models.link_tracker import URL_REGEX

+from odoo.addons.link_tracker.models.link_tracker import URL_REGEX

 class MailMail(models.Model):

diff --git a/addons/point_of_sale/tests/test_anglo_saxon.py b/addons/point_of_sale/tests/test_anglo_saxon.py

index b6d27af..68f836a 100644

--- a/addons/point_of_sale/tests/test_anglo_saxon.py

+++ b/addons/point_of_sale/tests/test_anglo_saxon.py

@@ -1,10 +1,10 @@

 # -*- coding: utf-8 -*-

-import openerp

+import odoo

 import time

-from openerp import fields

+from odoo import fields

-from openerp.tests import common

+from odoo.tests import common

 class TestAngloSaxonCommon(common.TransactionCase):

@@ -98,4 +98,4 @@ class TestAngloSaxonFlow(TestAngloSaxonCommon):

         aml_output = aml.filtered(lambda l: l.account_id.id == account_output.id)

         aml_expense = aml.filtered(lambda l: l.account_id.id == expense_account.id)

         self.assertEqual(aml_output.credit, self.product.standard_price, "Cost of Good Sold entry missing or mismatching")

-        self.assertEqual(aml_expense.debit, self.product.standard_price, "Cost of Good Sold entry missing or mismatching")

\ No newline at end of file

+        self.assertEqual(aml_expense.debit, self.product.standard_price, "Cost of Good Sold entry missing or mismatching")

diff --git a/addons/web/doc/module/18 b/addons/web/doc/module/18

index 6781c98..389ccbe 100644

--- a/addons/web/doc/module/18

+++ b/addons/web/doc/module/18

@@ -5,7 +5,7 @@ diff --git a/__init__.py b/__init__.py

 +++ b/__init__.py

 @@ -0,0 +1,13 @@

 +# __init__.py

-+from openerp.osv import orm, fields

++from odoo.osv import orm, fields

 +

 +

 +class Times(orm.Model):

diff --git a/odoo/addons/test_new_api/tests/test_one2many.py b/odoo/addons/test_new_api/tests/test_one2many.py

index 8531396..e0a2b41 100644

--- a/odoo/addons/test_new_api/tests/test_one2many.py

+++ b/odoo/addons/test_new_api/tests/test_one2many.py

@@ -1,5 +1,5 @@

 # -*- coding: utf-8 -*-

-from openerp.tests.common import TransactionCase

+from odoo.tests.common import TransactionCase

 class One2manyCase(TransactionCase):