diff --git a/addons/website_event_track/__openerp__.py b/addons/website_event_track/__openerp__.py
index 33faa56fcbb..f71f3fa7c6a 100644
--- a/addons/website_event_track/__openerp__.py
+++ b/addons/website_event_track/__openerp__.py
@@ -20,12 +20,12 @@ Adds support for:
         """,
     'depends': ['website_event'],
     'data': [
-        'data/event_data.xml',
-        'views/website_event.xml',
-        'views/event_backend.xml',
-        'data/event_track_tip_data.xml',
+        'data/website_event_track_data.xml',
+        'views/website_event_track_templates.xml',
+        'views/website_event_track_views.xml',
+        'data/website_event_track_tip_data.xml',
         'security/ir.model.access.csv',
-        'security/event.xml',
+        'security/website_event_track_security.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [
diff --git a/addons/website_event_track/controllers/__init__.py b/addons/website_event_track/controllers/__init__.py
index e7c003730cf..bbd183e955b 100644
--- a/addons/website_event_track/controllers/__init__.py
+++ b/addons/website_event_track/controllers/__init__.py
@@ -1 +1,3 @@
-import event
+# -*- coding: utf-8 -*-
+
+import main
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/main.py
similarity index 100%
rename from addons/website_event_track/controllers/event.py
rename to addons/website_event_track/controllers/main.py
diff --git a/addons/website_event_track/data/event_data.xml b/addons/website_event_track/data/website_event_track_data.xml
similarity index 100%
rename from addons/website_event_track/data/event_data.xml
rename to addons/website_event_track/data/website_event_track_data.xml
diff --git a/addons/website_event_track/data/event_track_tip_data.xml b/addons/website_event_track/data/website_event_track_tip_data.xml
similarity index 100%
rename from addons/website_event_track/data/event_track_tip_data.xml
rename to addons/website_event_track/data/website_event_track_tip_data.xml
diff --git a/addons/website_event_track/models/__init__.py b/addons/website_event_track/models/__init__.py
index e7c003730cf..cc0f7a9afdc 100644
--- a/addons/website_event_track/models/__init__.py
+++ b/addons/website_event_track/models/__init__.py
@@ -1 +1 @@
-import event
+import website_event_track
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/website_event_track.py
similarity index 100%
rename from addons/website_event_track/models/event.py
rename to addons/website_event_track/models/website_event_track.py
diff --git a/addons/website_event_track/security/event.xml b/addons/website_event_track/security/website_event_track_security.xml
similarity index 100%
rename from addons/website_event_track/security/event.xml
rename to addons/website_event_track/security/website_event_track_security.xml
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event_track_templates.xml
similarity index 100%
rename from addons/website_event_track/views/website_event.xml
rename to addons/website_event_track/views/website_event_track_templates.xml
diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/website_event_track_views.xml
similarity index 100%
rename from addons/website_event_track/views/event_backend.xml
rename to addons/website_event_track/views/website_event_track_views.xml