diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py
index bb56cd27961..787e3f026ca 100644
--- a/addons/website_membership/__openerp__.py
+++ b/addons/website_membership/__openerp__.py
@@ -10,11 +10,11 @@ Website for browsing Associations, Groups and Memberships
 """,
     'depends': ['website_partner', 'website_google_map', 'association', 'website_sale'],
     'data': [
-        'views/website_membership.xml',
+        'views/website_membership_templates.xml',
         'security/ir.model.access.csv',
         'security/website_membership.xml',
     ],
-    'demo': ['demo/membership.xml'],
+    'demo': ['data/membership_demo.xml'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
 }
diff --git a/addons/website_membership/demo/membership.xml b/addons/website_membership/data/membership_demo.xml
similarity index 100%
rename from addons/website_membership/demo/membership.xml
rename to addons/website_membership/data/membership_demo.xml
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership_templates.xml
similarity index 100%
rename from addons/website_membership/views/website_membership.xml
rename to addons/website_membership/views/website_membership_templates.xml