diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index d6a080f418c..80062c61f22 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -12,15 +12,15 @@ Online Events
         """,
     'depends': ['website', 'website_partner', 'website_mail', 'event'],
     'data': [
-        'data/event_data.xml',
-        'views/website_event.xml',
-        'views/website_event_backend.xml',
+        'data/website_event_data.xml',
+        'views/website_event_templates.xml',
+        'views/website_event_views.xml',
         'security/ir.model.access.csv',
-        'security/website_event.xml',
+        'security/website_event_security.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [
-        'data/event_demo.xml'
+        'data/website_event_demo.xml'
     ],
     'installable': True,
     'application': True,
diff --git a/addons/website_event/data/event_data.xml b/addons/website_event/data/website_event_data.xml
similarity index 100%
rename from addons/website_event/data/event_data.xml
rename to addons/website_event/data/website_event_data.xml
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/website_event_demo.xml
similarity index 100%
rename from addons/website_event/data/event_demo.xml
rename to addons/website_event/data/website_event_demo.xml
diff --git a/addons/website_event/doc/changelog.rst b/addons/website_event/doc/changelog.rst
deleted file mode 100644
index ac212494c7e..00000000000
--- a/addons/website_event/doc/changelog.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _changelog:
-
-Changelog
-=========
-
-`trunk (saas-3)`
-----------------
-
- - created ``website_event``
diff --git a/addons/website_event/doc/index.rst b/addons/website_event/doc/index.rst
deleted file mode 100644
index 3edce4cc8f1..00000000000
--- a/addons/website_event/doc/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Website Event Module documentation topics
-'''''''''''''''''''''''''''''''''''''''''
-
-Changelog
-'''''''''
-
-.. toctree::
-   :maxdepth: 1
-
-   changelog.rst
diff --git a/addons/website_event/security/website_event.xml b/addons/website_event/security/website_event_security.xml
similarity index 100%
rename from addons/website_event/security/website_event.xml
rename to addons/website_event/security/website_event_security.xml
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event_templates.xml
similarity index 100%
rename from addons/website_event/views/website_event.xml
rename to addons/website_event/views/website_event_templates.xml
diff --git a/addons/website_event/views/website_event_backend.xml b/addons/website_event/views/website_event_views.xml
similarity index 100%
rename from addons/website_event/views/website_event_backend.xml
rename to addons/website_event/views/website_event_views.xml