diff --git a/addons/website/__init__.py b/addons/website/__init__.py
index 9cea13339d9..8461d8a38b0 100644
--- a/addons/website/__init__.py
+++ b/addons/website/__init__.py
@@ -1,3 +1,6 @@
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import controllers
 import models
 import tests
diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index 9e542574c07..e20b12a0b63 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -1,4 +1,6 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 {
     'name': 'Website Builder',
     'category': 'Website',
@@ -14,19 +16,20 @@ Odoo Website CMS
     'depends': ['web', 'web_editor', 'web_planner'],
     'installable': True,
     'data': [
-        'data/data.xml',
+        'data/website_data.xml',
         'data/web_planner_data.xml',
         'security/ir.model.access.csv',
-        'security/ir_ui_view.xml',
+        'security/website_security.xml',
+
         'views/website_templates.xml',
-        'views/website_views.xml',
+        'views/website_navbar_templates.xml',
         'views/snippets.xml',
-        'views/res_config.xml',
-        'views/ir_actions.xml',
-        'views/website_backend_navbar.xml',
+        'views/website_views.xml',
+        'views/res_config_views.xml',
+        'views/ir_actions_views.xml',
     ],
     'demo': [
-        'data/demo.xml',
+        'data/website_demo.xml',
     ],
     'qweb': ['static/src/xml/website.backend.xml'],
     'application': True,
diff --git a/addons/website/data/data.xml b/addons/website/data/website_data.xml
similarity index 100%
rename from addons/website/data/data.xml
rename to addons/website/data/website_data.xml
diff --git a/addons/website/data/demo.xml b/addons/website/data/website_demo.xml
similarity index 100%
rename from addons/website/data/demo.xml
rename to addons/website/data/website_demo.xml
diff --git a/addons/website/security/ir_ui_view.xml b/addons/website/security/website_security.xml
similarity index 100%
rename from addons/website/security/ir_ui_view.xml
rename to addons/website/security/website_security.xml
diff --git a/addons/website/views/ir_actions.xml b/addons/website/views/ir_actions_views.xml
similarity index 100%
rename from addons/website/views/ir_actions.xml
rename to addons/website/views/ir_actions_views.xml
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config_views.xml
similarity index 100%
rename from addons/website/views/res_config.xml
rename to addons/website/views/res_config_views.xml
diff --git a/addons/website/views/website_backend_navbar.xml b/addons/website/views/website_navbar_templates.xml
similarity index 100%
rename from addons/website/views/website_backend_navbar.xml
rename to addons/website/views/website_navbar_templates.xml