diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index 22fca0e045b..4097c774b6e 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -9,8 +9,8 @@
     'description': """Glue module holding mail improvements for website.""",
     'depends': ['website', 'mail'],
     'data': [
-        'views/website_mail.xml',
-        'data/mail_channels.xml',
+        'views/website_mail_templates.xml',
+        'data/mail_channel_data.xml',
     ],
     'qweb': [
         'static/src/xml/website_mail.xml'
diff --git a/addons/website_mail/data/mail_channels.xml b/addons/website_mail/data/mail_channel_data.xml
similarity index 100%
rename from addons/website_mail/data/mail_channels.xml
rename to addons/website_mail/data/mail_channel_data.xml
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail_templates.xml
similarity index 100%
rename from addons/website_mail/views/website_mail.xml
rename to addons/website_mail/views/website_mail_templates.xml