diff --git a/addons/website_partner/__openerp__.py b/addons/website_partner/__openerp__.py
index 0a2d7d0aa85..ba1085829fe 100644
--- a/addons/website_partner/__openerp__.py
+++ b/addons/website_partner/__openerp__.py
@@ -9,11 +9,11 @@
     'description': """Base module holding website-related stuff for partner model""",
     'depends': ['website'],
     'data': [
-        'views/res_partner_view.xml',
-        'views/website_partner_view.xml',
-        'data/website_data.xml',
+        'views/res_partner_views.xml',
+        'views/website_partner_templates.xml',
+        'data/website_partner_data.xml',
     ],
-    'demo': ['data/demo.xml'],
+    'demo': ['data/website_partner_demo.xml'],
     'qweb': [
     ],
     'installable': True,
diff --git a/addons/website_partner/data/website_data.xml b/addons/website_partner/data/website_partner_data.xml
similarity index 100%
rename from addons/website_partner/data/website_data.xml
rename to addons/website_partner/data/website_partner_data.xml
diff --git a/addons/website_partner/data/demo.xml b/addons/website_partner/data/website_partner_demo.xml
similarity index 100%
rename from addons/website_partner/data/demo.xml
rename to addons/website_partner/data/website_partner_demo.xml
diff --git a/addons/website_partner/views/res_partner_view.xml b/addons/website_partner/views/res_partner_views.xml
similarity index 100%
rename from addons/website_partner/views/res_partner_view.xml
rename to addons/website_partner/views/res_partner_views.xml
diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_templates.xml
similarity index 100%
rename from addons/website_partner/views/website_partner_view.xml
rename to addons/website_partner/views/website_partner_templates.xml