diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py
index 5038c7f6deb..8738a2836b8 100644
--- a/addons/website_crm_partner_assign/__openerp__.py
+++ b/addons/website_crm_partner_assign/__openerp__.py
@@ -15,10 +15,10 @@ Publish and Assign Partner
         'data/crm_partner_assign_data.xml',
         'security/ir.model.access.csv',
         'wizard/crm_forward_to_partner_view.xml',
-        'views/res_partner_view.xml',
-        'views/crm_lead_view.xml',
+        'views/res_partner_views.xml',
+        'views/crm_lead_views.xml',
         'views/partner_grade.xml',
-        'views/website_crm_partner_assign.xml',
+        'views/website_crm_partner_assign_templates.xml',
         'views/website_crm_portal_lead_templates.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
diff --git a/addons/website_crm_partner_assign/models/__init__.py b/addons/website_crm_partner_assign/models/__init__.py
index 398bdb89c3f..69c04bca59d 100644
--- a/addons/website_crm_partner_assign/models/__init__.py
+++ b/addons/website_crm_partner_assign/models/__init__.py
@@ -1,2 +1,2 @@
-import crm_partner_assign
+import crm_lead
 import res_partner
diff --git a/addons/website_crm_partner_assign/models/crm_partner_assign.py b/addons/website_crm_partner_assign/models/crm_lead.py
similarity index 100%
rename from addons/website_crm_partner_assign/models/crm_partner_assign.py
rename to addons/website_crm_partner_assign/models/crm_lead.py
diff --git a/addons/website_crm_partner_assign/views/crm_lead_view.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
similarity index 100%
rename from addons/website_crm_partner_assign/views/crm_lead_view.xml
rename to addons/website_crm_partner_assign/views/crm_lead_views.xml
diff --git a/addons/website_crm_partner_assign/views/res_partner_view.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml
similarity index 100%
rename from addons/website_crm_partner_assign/views/res_partner_view.xml
rename to addons/website_crm_partner_assign/views/res_partner_views.xml
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
similarity index 100%
rename from addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
rename to addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml