diff --git a/addons/web_tour/__init__.py b/addons/web_tour/__init__.py
index bff786c0885..81fc81d29c9 100644
--- a/addons/web_tour/__init__.py
+++ b/addons/web_tour/__init__.py
@@ -1 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import models
diff --git a/addons/web_tour/__openerp__.py b/addons/web_tour/__openerp__.py
index fba1156ee81..dddb71a9ef9 100644
--- a/addons/web_tour/__openerp__.py
+++ b/addons/web_tour/__openerp__.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 {
     'name': 'Tours',
     'category': 'Hidden',
@@ -10,8 +12,8 @@ Odoo Web tours.
     'version': '0.1',
     'depends': ['web'],
     'data': [
-        'assets.xml',
-        'views/tour.xml'
+        'views/tour_templates.xml',
+        'views/tour_views.xml'
     ],
     'qweb': [
         "static/src/xml/*.xml",
diff --git a/addons/web_tour/models/__init__.py b/addons/web_tour/models/__init__.py
index f93c7ee23b5..9d82e7c6391 100644
--- a/addons/web_tour/models/__init__.py
+++ b/addons/web_tour/models/__init__.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import ir_http
 import ir_ui_menu
 import tour
diff --git a/addons/web_tour/models/ir_http.py b/addons/web_tour/models/ir_http.py
index 38c2c876d46..16adba3430d 100644
--- a/addons/web_tour/models/ir_http.py
+++ b/addons/web_tour/models/ir_http.py
@@ -1,5 +1,9 @@
-from openerp import models
-from openerp.http import request
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+from odoo.http import request
+
 
 class Http(models.AbstractModel):
     _inherit = 'ir.http'
diff --git a/addons/web_tour/assets.xml b/addons/web_tour/views/tour_templates.xml
similarity index 97%
rename from addons/web_tour/assets.xml
rename to addons/web_tour/views/tour_templates.xml
index 8dd7749e03c..a18a17d9fa3 100644
--- a/addons/web_tour/assets.xml
+++ b/addons/web_tour/views/tour_templates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data>
         <template id="assets_common" name="tours assets" inherit_id="web.assets_common">
             <xpath expr="." position="inside">
@@ -17,4 +17,4 @@
             </xpath>
         </template>
     </data>
-</openerp>
+</odoo>
diff --git a/addons/web_tour/views/tour.xml b/addons/web_tour/views/tour_views.xml
similarity index 96%
rename from addons/web_tour/views/tour.xml
rename to addons/web_tour/views/tour_views.xml
index 74dc1d2bc2c..06bb183d584 100644
--- a/addons/web_tour/views/tour.xml
+++ b/addons/web_tour/views/tour_views.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
+<odoo>
         <record id="edit_tour_list" model="ir.ui.view">
             <field name="model">web_tour.tour</field>
             <field name="arch" type="xml">
@@ -28,5 +26,4 @@
             <field name="search_view_id" ref="edit_tour_search"/>
         </record>
         <menuitem action="edit_tour_action" id="menu_tour_action" parent="base.next_id_2" sequence="5"/>
-    </data>
-</openerp>
+</odoo>