diff --git a/addons/website_portal/__openerp__.py b/addons/website_portal/__openerp__.py
index 20cbfaf99d2..ae53ba0da3d 100644
--- a/addons/website_portal/__openerp__.py
+++ b/addons/website_portal/__openerp__.py
@@ -10,6 +10,6 @@ Allows your customers to manage their account from a beautiful web interface.
         'website',
     ],
     'data': [
-        'views/templates.xml',
+        'views/website_portal_templates.xml',
     ],
 }
diff --git a/addons/website_portal/views/templates.xml b/addons/website_portal/views/website_portal_templates.xml
similarity index 100%
rename from addons/website_portal/views/templates.xml
rename to addons/website_portal/views/website_portal_templates.xml
diff --git a/addons/website_portal_sale/__openerp__.py b/addons/website_portal_sale/__openerp__.py
index efd132e5bc8..7505963a917 100644
--- a/addons/website_portal_sale/__openerp__.py
+++ b/addons/website_portal_sale/__openerp__.py
@@ -12,10 +12,10 @@ Add your sales document in the frontend portal. Your customers will be able to c
         'website_payment',
     ],
     'data': [
-        'views/templates.xml',
+        'views/website_portal_sale_templates.xml',
     ],
     'demo': [
-        'data/demo.xml'
+        'data/sale_demo.xml'
     ],
     'installable': True,
 }
diff --git a/addons/website_portal_sale/data/demo.xml b/addons/website_portal_sale/data/sale_demo.xml
similarity index 100%
rename from addons/website_portal_sale/data/demo.xml
rename to addons/website_portal_sale/data/sale_demo.xml
diff --git a/addons/website_portal_sale/views/templates.xml b/addons/website_portal_sale/views/website_portal_sale_templates.xml
similarity index 100%
rename from addons/website_portal_sale/views/templates.xml
rename to addons/website_portal_sale/views/website_portal_sale_templates.xml