diff --git a/__init__.py b/__init__.py
index e69de29bb2d..67dee8c60db 100644
--- a/__init__.py
+++ b/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
diff --git a/__openerp__.py b/__openerp__.py
index c9ef94a8e84..08b1b8c344a 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Website Form Builder',
     'category': 'Website',
diff --git a/data/mail_mail_data.xml b/data/mail_mail_data.xml
index eb3295eb87e..f97b1b8cbfc 100644
--- a/data/mail_mail_data.xml
+++ b/data/mail_mail_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-  <data>
     <record id="mail.model_mail_mail" model="ir.model">
       <field name="website_form_default_field_id" ref="mail.field_mail_mail_body_html" />
       <field name="website_form_access">True</field>
@@ -17,5 +16,4 @@
         'attachment_ids',
         ]"/>
     </function>
-  </data>
 </odoo>
diff --git a/tests/__init__.py b/tests/__init__.py
index a928df55654..d379f89ca3c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import test_website_form_editor
\ No newline at end of file
diff --git a/tests/test_website_form_editor.py b/tests/test_website_form_editor.py
index aa9004d3092..a15147158ed 100644
--- a/tests/test_website_form_editor.py
+++ b/tests/test_website_form_editor.py
@@ -1,7 +1,12 @@
-import openerp.tests
-@openerp.tests.common.at_install(False)
-@openerp.tests.common.post_install(True)
-class TestWebsiteFormEditor(openerp.tests.HttpCase):
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+# -*- coding: utf-8 -*-
+
+import odoo.tests
+
+
+@odoo.tests.common.at_install(False)
+@odoo.tests.common.post_install(True)
+class TestWebsiteFormEditor(odoo.tests.HttpCase):
     def test_tour(self):
         self.phantom_js("/", "odoo.__DEBUG__.services['web.Tour'].run('website_form_editor_tour', 'test')", "odoo.__DEBUG__.services['web.Tour'].tours.website_form_editor_tour", login="admin")
         self.phantom_js("/", "odoo.__DEBUG__.services['web.Tour'].run('website_form_editor_tour_submit', 'test')", "odoo.__DEBUG__.services['web.Tour'].tours.website_form_editor_tour_submit")
diff --git a/views/ir_model_views.xml b/views/ir_model_views.xml
index 1b0606167a7..78f065db45c 100644
--- a/views/ir_model_views.xml
+++ b/views/ir_model_views.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <record id="ir_model_view" model="ir.ui.view">
diff --git a/views/snippets.xml b/views/snippets.xml
index 6abd232dc60..706ad9bd13e 100644
--- a/views/snippets.xml
+++ b/views/snippets.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
 
         <template id="s_website_form" name="Form Builder">
             <form action="/website_form/" method="post" class="s_website_form form-horizontal container-fluid mt32" enctype="multipart/form-data">
@@ -95,5 +94,4 @@
             </xpath>
         </template>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/views/website_form_editor_templates.xml b/views/website_form_editor_templates.xml
index 4cf99c9f4a0..ab027b828bc 100644
--- a/views/website_form_editor_templates.xml
+++ b/views/website_form_editor_templates.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
 
         <template id="assets_editor" name="Website Form Editor Assets Editor" inherit_id="website.assets_editor">
             <xpath expr="." position="inside">
@@ -14,5 +13,4 @@
             </xpath>
         </template>
 
-    </data>
-</openerp>
\ No newline at end of file
+</odoo>
\ No newline at end of file