diff --git a/addons/website_hr/__openerp__.py b/addons/website_hr/__openerp__.py
index 1d9b8dd1b8f..e310de149d2 100644
--- a/addons/website_hr/__openerp__.py
+++ b/addons/website_hr/__openerp__.py
@@ -10,14 +10,14 @@ Our Team Page
         """,
     'depends': ['website', 'hr'],
     'demo': [
-        'data/website_hr_demo.xml',
+        'data/hr_employee_demo.xml',
     ],
     'data': [
         'data/website_hr_data.xml',
-        'views/website_hr.xml',
-        'views/website_hr_view.xml',
+        'views/website_hr_templates.xml',
+        'views/hr_employee_views.xml',
         'security/ir.model.access.csv',
-        'security/website_hr.xml',
+        'security/hr_employee_security.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_hr/data/website_hr_demo.xml b/addons/website_hr/data/hr_employee_demo.xml
similarity index 100%
rename from addons/website_hr/data/website_hr_demo.xml
rename to addons/website_hr/data/hr_employee_demo.xml
diff --git a/addons/website_hr/models/__init__.py b/addons/website_hr/models/__init__.py
index 89d0dfb41dc..8c8bdf99050 100644
--- a/addons/website_hr/models/__init__.py
+++ b/addons/website_hr/models/__init__.py
@@ -1 +1,2 @@
-import hr
+# -*- coding: utf-8 -*-
+import hr_employee
diff --git a/addons/website_hr/models/hr.py b/addons/website_hr/models/hr_employee.py
similarity index 100%
rename from addons/website_hr/models/hr.py
rename to addons/website_hr/models/hr_employee.py
diff --git a/addons/website_hr/security/website_hr.xml b/addons/website_hr/security/hr_employee_security.xml
similarity index 100%
rename from addons/website_hr/security/website_hr.xml
rename to addons/website_hr/security/hr_employee_security.xml
diff --git a/addons/website_hr/views/website_hr_view.xml b/addons/website_hr/views/hr_employee_views.xml
similarity index 100%
rename from addons/website_hr/views/website_hr_view.xml
rename to addons/website_hr/views/hr_employee_views.xml
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr_templates.xml
similarity index 100%
rename from addons/website_hr/views/website_hr.xml
rename to addons/website_hr/views/website_hr_templates.xml