diff --git a/addons/website_customer/__openerp__.py b/addons/website_customer/__openerp__.py
index 422a60a61ef..d51129e12bb 100644
--- a/addons/website_customer/__openerp__.py
+++ b/addons/website_customer/__openerp__.py
@@ -17,11 +17,11 @@ Odoo Customer References
         'website_google_map',
     ],
     'demo': [
-        'website_customer_demo.xml',
+        'data/res_partner_demo.xml',
     ],
     'data': [
-        'views/website_customer.xml',
-        'views/website_customer_view.xml',
+        'views/website_customer_templates.xml',
+        'views/res_partner_views.xml',
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
     ],
diff --git a/addons/website_customer/website_customer_demo.xml b/addons/website_customer/data/res_partner_demo.xml
similarity index 100%
rename from addons/website_customer/website_customer_demo.xml
rename to addons/website_customer/data/res_partner_demo.xml
diff --git a/addons/website_customer/models/__init__.py b/addons/website_customer/models/__init__.py
index e130830196d..1e3dc5a9c2b 100644
--- a/addons/website_customer/models/__init__.py
+++ b/addons/website_customer/models/__init__.py
@@ -1 +1,4 @@
-import website_customer
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import res_partner
diff --git a/addons/website_customer/models/website_customer.py b/addons/website_customer/models/res_partner.py
similarity index 100%
rename from addons/website_customer/models/website_customer.py
rename to addons/website_customer/models/res_partner.py
diff --git a/addons/website_customer/views/website_customer_view.xml b/addons/website_customer/views/res_partner_views.xml
similarity index 100%
rename from addons/website_customer/views/website_customer_view.xml
rename to addons/website_customer/views/res_partner_views.xml
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer_templates.xml
similarity index 100%
rename from addons/website_customer/views/website_customer.xml
rename to addons/website_customer/views/website_customer_templates.xml