diff --git a/bi_sql_editor/README.rst b/bi_sql_editor/README.rst
index 2eb6b3fe..323987f2 100644
--- a/bi_sql_editor/README.rst
+++ b/bi_sql_editor/README.rst
@@ -108,7 +108,7 @@ To use this module, you need to:
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/143/8.0
+   :target: https://runbot.odoo-community.org/runbot/143/10.0
 
 Known issues / Roadmap
 ======================
diff --git a/bi_sql_editor/__init__.py b/bi_sql_editor/__init__.py
index e4f76a9e..d040fb36 100644
--- a/bi_sql_editor/__init__.py
+++ b/bi_sql_editor/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import models
 from .hooks import uninstall_hook
diff --git a/bi_sql_editor/__openerp__.py b/bi_sql_editor/__manifest__.py
similarity index 96%
rename from bi_sql_editor/__openerp__.py
rename to bi_sql_editor/__manifest__.py
index edd4bf5f..1df8d34a 100644
--- a/bi_sql_editor/__openerp__.py
+++ b/bi_sql_editor/__manifest__.py
@@ -6,7 +6,7 @@
 {
     'name': 'BI SQL Editor',
     'summary': "BI Views builder, based on Materialized or Normal SQL Views",
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'license': 'AGPL-3',
     'category': 'Reporting',
     'author': 'GRAP,Odoo Community Association (OCA)',
diff --git a/bi_sql_editor/demo/bi_sql_view_demo.xml b/bi_sql_editor/demo/bi_sql_view_demo.xml
index 7758110b..13c87d02 100644
--- a/bi_sql_editor/demo/bi_sql_view_demo.xml
+++ b/bi_sql_editor/demo/bi_sql_view_demo.xml
@@ -5,8 +5,7 @@ Copyright (C) 2014 - Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="incorrect_sql_view" model="bi.sql.view">
             <field name="name">Draft Incorrect SQL View</field>
@@ -55,5 +54,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
     <function model="bi.sql.view" name="button_create_ui" eval="([ref('module_sql_view')])"/>
 
-    </data>
 </odoo>
diff --git a/bi_sql_editor/demo/res_groups_demo.xml b/bi_sql_editor/demo/res_groups_demo.xml
index 0a3803c5..7771a95a 100644
--- a/bi_sql_editor/demo/res_groups_demo.xml
+++ b/bi_sql_editor/demo/res_groups_demo.xml
@@ -6,13 +6,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
 <odoo>
-    <data>
-        <record id="base.group_no_one" model="res.groups">
-            <field name="users" eval="[(4, ref('base.user_root'))]" />
-        </record>
+    <record id="base.group_no_one" model="res.groups">
+        <field name="users" eval="[(4, ref('base.user_root'))]" />
+    </record>
 
-        <record id="sql_request_abstract.group_sql_request_user" model="res.groups">
-            <field name="users" eval="[(4, ref('base.user_demo'))]" />
-        </record>
-    </data>
+    <record id="sql_request_abstract.group_sql_request_user" model="res.groups">
+        <field name="users" eval="[(4, ref('base.user_demo'))]" />
+    </record>
 </odoo>
diff --git a/bi_sql_editor/hooks.py b/bi_sql_editor/hooks.py
index 972135e9..701d3dbd 100644
--- a/bi_sql_editor/hooks.py
+++ b/bi_sql_editor/hooks.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # Copyright 2015-2017 Onestein (<http://www.onestein.eu>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import SUPERUSER_ID
-from openerp.api import Environment
+from odoo import SUPERUSER_ID
+from odoo.api import Environment
 
 
 def uninstall_hook(cr, registry):
diff --git a/bi_sql_editor/models/__init__.py b/bi_sql_editor/models/__init__.py
index 77e272b3..cc56bdca 100644
--- a/bi_sql_editor/models/__init__.py
+++ b/bi_sql_editor/models/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import bi_sql_view
 from . import bi_sql_view_field
diff --git a/bi_sql_editor/models/bi_sql_view.py b/bi_sql_editor/models/bi_sql_view.py
index bafa3d3e..f02d8a4e 100644
--- a/bi_sql_editor/models/bi_sql_view.py
+++ b/bi_sql_editor/models/bi_sql_view.py
@@ -7,8 +7,8 @@ import logging
 from datetime import datetime
 from psycopg2 import ProgrammingError
 
-from openerp import _, api, fields, models, SUPERUSER_ID
-from openerp.exceptions import Warning as UserError
+from odoo import _, api, fields, models, SUPERUSER_ID
+from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
 
diff --git a/bi_sql_editor/models/bi_sql_view_field.py b/bi_sql_editor/models/bi_sql_view_field.py
index 40ac2436..3e41de09 100644
--- a/bi_sql_editor/models/bi_sql_view_field.py
+++ b/bi_sql_editor/models/bi_sql_view_field.py
@@ -5,7 +5,7 @@
 
 import re
 
-from openerp import api, fields, models
+from odoo import api, fields, models
 
 
 class BiSQLViewField(models.Model):
diff --git a/bi_sql_editor/tests/test_bi_sql_view.py b/bi_sql_editor/tests/test_bi_sql_view.py
index 12af27cd..1ab6878c 100644
--- a/bi_sql_editor/tests/test_bi_sql_view.py
+++ b/bi_sql_editor/tests/test_bi_sql_view.py
@@ -2,8 +2,8 @@
 # Copyright 2017 Onestein (<http://www.onestein.eu>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp.tests.common import TransactionCase, at_install, post_install
-from openerp.exceptions import AccessError
+from odoo.tests.common import TransactionCase, at_install, post_install
+from odoo.exceptions import AccessError
 
 
 class TestBiSqlViewEditor(TransactionCase):
diff --git a/bi_sql_editor/views/action.xml b/bi_sql_editor/views/action.xml
index 31c1c0be..b984cbff 100644
--- a/bi_sql_editor/views/action.xml
+++ b/bi_sql_editor/views/action.xml
@@ -5,7 +5,7 @@ Copyright (C) 2017 - Today: GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<openerp><data>
+<odoo>
 
     <record id="action_bi_sql_view" model="ir.actions.act_window">
         <field name="name">SQL Views</field>
@@ -15,4 +15,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="view_mode">tree,form</field>
     </record>
 
-</data></openerp>
+</odoo>
diff --git a/bi_sql_editor/views/menu.xml b/bi_sql_editor/views/menu.xml
index 061f0d75..7a9bebe5 100644
--- a/bi_sql_editor/views/menu.xml
+++ b/bi_sql_editor/views/menu.xml
@@ -5,7 +5,7 @@ Copyright (C) 2017 - Today: GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<openerp><data>
+<odoo>
 
     <!-- Menu that will contain all the SQL report generated by this module -->
     <menuitem id="menu_bi_sql_editor"
@@ -17,4 +17,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
       parent="base.next_id_9"
       action="action_bi_sql_view"/>
 
-</data></openerp>
+</odoo>
diff --git a/bi_sql_editor/views/view_bi_sql_view.xml b/bi_sql_editor/views/view_bi_sql_view.xml
index 14aecd12..b4f13063 100644
--- a/bi_sql_editor/views/view_bi_sql_view.xml
+++ b/bi_sql_editor/views/view_bi_sql_view.xml
@@ -5,7 +5,7 @@ Copyright (C) 2017 - Today: GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<openerp><data>
+<odoo>
 
     <record id="view_bi_sql_view_tree" model="ir.ui.view">
         <field name="model">bi.sql.view</field>
@@ -126,4 +126,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         </field>
     </record>
 
-</data></openerp>
+</odoo>