diff --git a/addons/website_twitter/__openerp__.py b/addons/website_twitter/__openerp__.py
index dab7463d0df..188f1da237c 100644
--- a/addons/website_twitter/__openerp__.py
+++ b/addons/website_twitter/__openerp__.py
@@ -12,9 +12,9 @@ Display best tweets
     'depends': ['website'],
     'data': [
         'security/ir.model.access.csv',
-        'data/twitter_data.xml',
-        'views/twitter_view.xml',
-        'views/twitter_snippet.xml'
+        'data/website_twitter_data.xml',
+        'views/website_twitter_settings_views.xml',
+        'views/website_twitter_snippet_templates.xml'
     ],
     'demo': [],
     'qweb': [],
diff --git a/addons/website_twitter/data/twitter_data.xml b/addons/website_twitter/data/website_twitter_data.xml
similarity index 100%
rename from addons/website_twitter/data/twitter_data.xml
rename to addons/website_twitter/data/website_twitter_data.xml
diff --git a/addons/website_twitter/models/__init__.py b/addons/website_twitter/models/__init__.py
index 0556d68f235..a5916ba9a3b 100644
--- a/addons/website_twitter/models/__init__.py
+++ b/addons/website_twitter/models/__init__.py
@@ -1,2 +1,2 @@
-import twitter
-import twitter_config
+import website_twitter
+import website_twitter_config
diff --git a/addons/website_twitter/models/twitter.py b/addons/website_twitter/models/website_twitter.py
similarity index 100%
rename from addons/website_twitter/models/twitter.py
rename to addons/website_twitter/models/website_twitter.py
diff --git a/addons/website_twitter/models/twitter_config.py b/addons/website_twitter/models/website_twitter_config.py
similarity index 100%
rename from addons/website_twitter/models/twitter_config.py
rename to addons/website_twitter/models/website_twitter_config.py
diff --git a/addons/website_twitter/views/twitter_view.xml b/addons/website_twitter/views/website_twitter_settings_views.xml
similarity index 100%
rename from addons/website_twitter/views/twitter_view.xml
rename to addons/website_twitter/views/website_twitter_settings_views.xml
diff --git a/addons/website_twitter/views/twitter_snippet.xml b/addons/website_twitter/views/website_twitter_snippet_templates.xml
similarity index 100%
rename from addons/website_twitter/views/twitter_snippet.xml
rename to addons/website_twitter/views/website_twitter_snippet_templates.xml