diff --git a/addons/crm_project_issue/__init__.py b/addons/crm_project/__init__.py
similarity index 100%
rename from addons/crm_project_issue/__init__.py
rename to addons/crm_project/__init__.py
diff --git a/addons/crm_project_issue/__manifest__.py b/addons/crm_project/__manifest__.py
similarity index 57%
rename from addons/crm_project_issue/__manifest__.py
rename to addons/crm_project/__manifest__.py
index 879a0a0b00d..f4a96def000 100644
--- a/addons/crm_project_issue/__manifest__.py
+++ b/addons/crm_project/__manifest__.py
@@ -1,21 +1,21 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
-    'name': 'Lead to Issue',
-    'summary': 'Create Issues from Leads',
+    'name': 'Lead to Tasks',
+    'summary': 'Create Tasks from Leads',
     'sequence': '19',
     'category': 'Project',
     'complexity': 'easy',
     'description': """
-Lead to Issues
-==============
+Lead to Tasks
+=============
 
-Link module to map leads to issues
+Link module to map leads to tasks
         """,
     'data': [
         'security/ir.model.access.csv',
-        'wizard/crm_lead2projectissue_wizard_view.xml',
+        'wizard/crm_lead_convert2task_views.xml',
         'views/crm_lead_views.xml'
     ],
-    'depends': ['crm', 'project_issue'],
+    'depends': ['crm', 'project'],
 }
diff --git a/addons/crm_project_issue/i18n/af.po b/addons/crm_project/i18n/af.po
similarity index 100%
rename from addons/crm_project_issue/i18n/af.po
rename to addons/crm_project/i18n/af.po
diff --git a/addons/crm_project_issue/i18n/am.po b/addons/crm_project/i18n/am.po
similarity index 100%
rename from addons/crm_project_issue/i18n/am.po
rename to addons/crm_project/i18n/am.po
diff --git a/addons/crm_project_issue/i18n/ar.po b/addons/crm_project/i18n/ar.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ar.po
rename to addons/crm_project/i18n/ar.po
diff --git a/addons/crm_project_issue/i18n/bg.po b/addons/crm_project/i18n/bg.po
similarity index 100%
rename from addons/crm_project_issue/i18n/bg.po
rename to addons/crm_project/i18n/bg.po
diff --git a/addons/crm_project_issue/i18n/bs.po b/addons/crm_project/i18n/bs.po
similarity index 100%
rename from addons/crm_project_issue/i18n/bs.po
rename to addons/crm_project/i18n/bs.po
diff --git a/addons/crm_project_issue/i18n/ca.po b/addons/crm_project/i18n/ca.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ca.po
rename to addons/crm_project/i18n/ca.po
diff --git a/addons/crm_project_issue/i18n/crm_project_issue.pot b/addons/crm_project/i18n/crm_project_issue.pot
similarity index 100%
rename from addons/crm_project_issue/i18n/crm_project_issue.pot
rename to addons/crm_project/i18n/crm_project_issue.pot
diff --git a/addons/crm_project_issue/i18n/cs.po b/addons/crm_project/i18n/cs.po
similarity index 100%
rename from addons/crm_project_issue/i18n/cs.po
rename to addons/crm_project/i18n/cs.po
diff --git a/addons/crm_project_issue/i18n/da.po b/addons/crm_project/i18n/da.po
similarity index 100%
rename from addons/crm_project_issue/i18n/da.po
rename to addons/crm_project/i18n/da.po
diff --git a/addons/crm_project_issue/i18n/de.po b/addons/crm_project/i18n/de.po
similarity index 100%
rename from addons/crm_project_issue/i18n/de.po
rename to addons/crm_project/i18n/de.po
diff --git a/addons/crm_project_issue/i18n/el.po b/addons/crm_project/i18n/el.po
similarity index 100%
rename from addons/crm_project_issue/i18n/el.po
rename to addons/crm_project/i18n/el.po
diff --git a/addons/crm_project_issue/i18n/en_AU.po b/addons/crm_project/i18n/en_AU.po
similarity index 100%
rename from addons/crm_project_issue/i18n/en_AU.po
rename to addons/crm_project/i18n/en_AU.po
diff --git a/addons/crm_project_issue/i18n/en_GB.po b/addons/crm_project/i18n/en_GB.po
similarity index 100%
rename from addons/crm_project_issue/i18n/en_GB.po
rename to addons/crm_project/i18n/en_GB.po
diff --git a/addons/crm_project_issue/i18n/es.po b/addons/crm_project/i18n/es.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es.po
rename to addons/crm_project/i18n/es.po
diff --git a/addons/crm_project_issue/i18n/es_AR.po b/addons/crm_project/i18n/es_AR.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_AR.po
rename to addons/crm_project/i18n/es_AR.po
diff --git a/addons/crm_project_issue/i18n/es_BO.po b/addons/crm_project/i18n/es_BO.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_BO.po
rename to addons/crm_project/i18n/es_BO.po
diff --git a/addons/crm_project_issue/i18n/es_CL.po b/addons/crm_project/i18n/es_CL.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_CL.po
rename to addons/crm_project/i18n/es_CL.po
diff --git a/addons/crm_project_issue/i18n/es_CO.po b/addons/crm_project/i18n/es_CO.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_CO.po
rename to addons/crm_project/i18n/es_CO.po
diff --git a/addons/crm_project_issue/i18n/es_CR.po b/addons/crm_project/i18n/es_CR.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_CR.po
rename to addons/crm_project/i18n/es_CR.po
diff --git a/addons/crm_project_issue/i18n/es_DO.po b/addons/crm_project/i18n/es_DO.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_DO.po
rename to addons/crm_project/i18n/es_DO.po
diff --git a/addons/crm_project_issue/i18n/es_EC.po b/addons/crm_project/i18n/es_EC.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_EC.po
rename to addons/crm_project/i18n/es_EC.po
diff --git a/addons/crm_project_issue/i18n/es_PA.po b/addons/crm_project/i18n/es_PA.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_PA.po
rename to addons/crm_project/i18n/es_PA.po
diff --git a/addons/crm_project_issue/i18n/es_PE.po b/addons/crm_project/i18n/es_PE.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_PE.po
rename to addons/crm_project/i18n/es_PE.po
diff --git a/addons/crm_project_issue/i18n/es_PY.po b/addons/crm_project/i18n/es_PY.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_PY.po
rename to addons/crm_project/i18n/es_PY.po
diff --git a/addons/crm_project_issue/i18n/es_VE.po b/addons/crm_project/i18n/es_VE.po
similarity index 100%
rename from addons/crm_project_issue/i18n/es_VE.po
rename to addons/crm_project/i18n/es_VE.po
diff --git a/addons/crm_project_issue/i18n/et.po b/addons/crm_project/i18n/et.po
similarity index 100%
rename from addons/crm_project_issue/i18n/et.po
rename to addons/crm_project/i18n/et.po
diff --git a/addons/crm_project_issue/i18n/eu.po b/addons/crm_project/i18n/eu.po
similarity index 100%
rename from addons/crm_project_issue/i18n/eu.po
rename to addons/crm_project/i18n/eu.po
diff --git a/addons/crm_project_issue/i18n/fa.po b/addons/crm_project/i18n/fa.po
similarity index 100%
rename from addons/crm_project_issue/i18n/fa.po
rename to addons/crm_project/i18n/fa.po
diff --git a/addons/crm_project_issue/i18n/fi.po b/addons/crm_project/i18n/fi.po
similarity index 100%
rename from addons/crm_project_issue/i18n/fi.po
rename to addons/crm_project/i18n/fi.po
diff --git a/addons/crm_project_issue/i18n/fo.po b/addons/crm_project/i18n/fo.po
similarity index 100%
rename from addons/crm_project_issue/i18n/fo.po
rename to addons/crm_project/i18n/fo.po
diff --git a/addons/crm_project_issue/i18n/fr.po b/addons/crm_project/i18n/fr.po
similarity index 100%
rename from addons/crm_project_issue/i18n/fr.po
rename to addons/crm_project/i18n/fr.po
diff --git a/addons/crm_project_issue/i18n/fr_BE.po b/addons/crm_project/i18n/fr_BE.po
similarity index 100%
rename from addons/crm_project_issue/i18n/fr_BE.po
rename to addons/crm_project/i18n/fr_BE.po
diff --git a/addons/crm_project_issue/i18n/fr_CA.po b/addons/crm_project/i18n/fr_CA.po
similarity index 100%
rename from addons/crm_project_issue/i18n/fr_CA.po
rename to addons/crm_project/i18n/fr_CA.po
diff --git a/addons/crm_project_issue/i18n/gl.po b/addons/crm_project/i18n/gl.po
similarity index 100%
rename from addons/crm_project_issue/i18n/gl.po
rename to addons/crm_project/i18n/gl.po
diff --git a/addons/crm_project_issue/i18n/gu.po b/addons/crm_project/i18n/gu.po
similarity index 100%
rename from addons/crm_project_issue/i18n/gu.po
rename to addons/crm_project/i18n/gu.po
diff --git a/addons/crm_project_issue/i18n/he.po b/addons/crm_project/i18n/he.po
similarity index 100%
rename from addons/crm_project_issue/i18n/he.po
rename to addons/crm_project/i18n/he.po
diff --git a/addons/crm_project_issue/i18n/hi.po b/addons/crm_project/i18n/hi.po
similarity index 100%
rename from addons/crm_project_issue/i18n/hi.po
rename to addons/crm_project/i18n/hi.po
diff --git a/addons/crm_project_issue/i18n/hr.po b/addons/crm_project/i18n/hr.po
similarity index 100%
rename from addons/crm_project_issue/i18n/hr.po
rename to addons/crm_project/i18n/hr.po
diff --git a/addons/crm_project_issue/i18n/hu.po b/addons/crm_project/i18n/hu.po
similarity index 100%
rename from addons/crm_project_issue/i18n/hu.po
rename to addons/crm_project/i18n/hu.po
diff --git a/addons/crm_project_issue/i18n/hy.po b/addons/crm_project/i18n/hy.po
similarity index 100%
rename from addons/crm_project_issue/i18n/hy.po
rename to addons/crm_project/i18n/hy.po
diff --git a/addons/crm_project_issue/i18n/id.po b/addons/crm_project/i18n/id.po
similarity index 100%
rename from addons/crm_project_issue/i18n/id.po
rename to addons/crm_project/i18n/id.po
diff --git a/addons/crm_project_issue/i18n/is.po b/addons/crm_project/i18n/is.po
similarity index 100%
rename from addons/crm_project_issue/i18n/is.po
rename to addons/crm_project/i18n/is.po
diff --git a/addons/crm_project_issue/i18n/it.po b/addons/crm_project/i18n/it.po
similarity index 100%
rename from addons/crm_project_issue/i18n/it.po
rename to addons/crm_project/i18n/it.po
diff --git a/addons/crm_project_issue/i18n/ja.po b/addons/crm_project/i18n/ja.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ja.po
rename to addons/crm_project/i18n/ja.po
diff --git a/addons/crm_project_issue/i18n/ka.po b/addons/crm_project/i18n/ka.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ka.po
rename to addons/crm_project/i18n/ka.po
diff --git a/addons/crm_project_issue/i18n/kab.po b/addons/crm_project/i18n/kab.po
similarity index 100%
rename from addons/crm_project_issue/i18n/kab.po
rename to addons/crm_project/i18n/kab.po
diff --git a/addons/crm_project_issue/i18n/kk.po b/addons/crm_project/i18n/kk.po
similarity index 100%
rename from addons/crm_project_issue/i18n/kk.po
rename to addons/crm_project/i18n/kk.po
diff --git a/addons/crm_project_issue/i18n/ko.po b/addons/crm_project/i18n/ko.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ko.po
rename to addons/crm_project/i18n/ko.po
diff --git a/addons/crm_project_issue/i18n/ln.po b/addons/crm_project/i18n/ln.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ln.po
rename to addons/crm_project/i18n/ln.po
diff --git a/addons/crm_project_issue/i18n/lo.po b/addons/crm_project/i18n/lo.po
similarity index 100%
rename from addons/crm_project_issue/i18n/lo.po
rename to addons/crm_project/i18n/lo.po
diff --git a/addons/crm_project_issue/i18n/lt.po b/addons/crm_project/i18n/lt.po
similarity index 100%
rename from addons/crm_project_issue/i18n/lt.po
rename to addons/crm_project/i18n/lt.po
diff --git a/addons/crm_project_issue/i18n/lv.po b/addons/crm_project/i18n/lv.po
similarity index 100%
rename from addons/crm_project_issue/i18n/lv.po
rename to addons/crm_project/i18n/lv.po
diff --git a/addons/crm_project_issue/i18n/mk.po b/addons/crm_project/i18n/mk.po
similarity index 100%
rename from addons/crm_project_issue/i18n/mk.po
rename to addons/crm_project/i18n/mk.po
diff --git a/addons/crm_project_issue/i18n/ml_IN.po b/addons/crm_project/i18n/ml_IN.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ml_IN.po
rename to addons/crm_project/i18n/ml_IN.po
diff --git a/addons/crm_project_issue/i18n/mn.po b/addons/crm_project/i18n/mn.po
similarity index 100%
rename from addons/crm_project_issue/i18n/mn.po
rename to addons/crm_project/i18n/mn.po
diff --git a/addons/crm_project_issue/i18n/nb.po b/addons/crm_project/i18n/nb.po
similarity index 100%
rename from addons/crm_project_issue/i18n/nb.po
rename to addons/crm_project/i18n/nb.po
diff --git a/addons/crm_project_issue/i18n/nl.po b/addons/crm_project/i18n/nl.po
similarity index 100%
rename from addons/crm_project_issue/i18n/nl.po
rename to addons/crm_project/i18n/nl.po
diff --git a/addons/crm_project_issue/i18n/nl_BE.po b/addons/crm_project/i18n/nl_BE.po
similarity index 100%
rename from addons/crm_project_issue/i18n/nl_BE.po
rename to addons/crm_project/i18n/nl_BE.po
diff --git a/addons/crm_project_issue/i18n/pl.po b/addons/crm_project/i18n/pl.po
similarity index 100%
rename from addons/crm_project_issue/i18n/pl.po
rename to addons/crm_project/i18n/pl.po
diff --git a/addons/crm_project_issue/i18n/pt.po b/addons/crm_project/i18n/pt.po
similarity index 100%
rename from addons/crm_project_issue/i18n/pt.po
rename to addons/crm_project/i18n/pt.po
diff --git a/addons/crm_project_issue/i18n/pt_BR.po b/addons/crm_project/i18n/pt_BR.po
similarity index 100%
rename from addons/crm_project_issue/i18n/pt_BR.po
rename to addons/crm_project/i18n/pt_BR.po
diff --git a/addons/crm_project_issue/i18n/ro.po b/addons/crm_project/i18n/ro.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ro.po
rename to addons/crm_project/i18n/ro.po
diff --git a/addons/crm_project_issue/i18n/ru.po b/addons/crm_project/i18n/ru.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ru.po
rename to addons/crm_project/i18n/ru.po
diff --git a/addons/crm_project_issue/i18n/sk.po b/addons/crm_project/i18n/sk.po
similarity index 100%
rename from addons/crm_project_issue/i18n/sk.po
rename to addons/crm_project/i18n/sk.po
diff --git a/addons/crm_project_issue/i18n/sl.po b/addons/crm_project/i18n/sl.po
similarity index 100%
rename from addons/crm_project_issue/i18n/sl.po
rename to addons/crm_project/i18n/sl.po
diff --git a/addons/crm_project_issue/i18n/sq.po b/addons/crm_project/i18n/sq.po
similarity index 100%
rename from addons/crm_project_issue/i18n/sq.po
rename to addons/crm_project/i18n/sq.po
diff --git a/addons/crm_project_issue/i18n/sr.po b/addons/crm_project/i18n/sr.po
similarity index 100%
rename from addons/crm_project_issue/i18n/sr.po
rename to addons/crm_project/i18n/sr.po
diff --git a/addons/crm_project_issue/i18n/sr@latin.po b/addons/crm_project/i18n/sr@latin.po
similarity index 100%
rename from addons/crm_project_issue/i18n/sr@latin.po
rename to addons/crm_project/i18n/sr@latin.po
diff --git a/addons/crm_project_issue/i18n/sv.po b/addons/crm_project/i18n/sv.po
similarity index 100%
rename from addons/crm_project_issue/i18n/sv.po
rename to addons/crm_project/i18n/sv.po
diff --git a/addons/crm_project_issue/i18n/ta.po b/addons/crm_project/i18n/ta.po
similarity index 100%
rename from addons/crm_project_issue/i18n/ta.po
rename to addons/crm_project/i18n/ta.po
diff --git a/addons/crm_project_issue/i18n/th.po b/addons/crm_project/i18n/th.po
similarity index 100%
rename from addons/crm_project_issue/i18n/th.po
rename to addons/crm_project/i18n/th.po
diff --git a/addons/crm_project_issue/i18n/tr.po b/addons/crm_project/i18n/tr.po
similarity index 100%
rename from addons/crm_project_issue/i18n/tr.po
rename to addons/crm_project/i18n/tr.po
diff --git a/addons/crm_project_issue/i18n/uk.po b/addons/crm_project/i18n/uk.po
similarity index 100%
rename from addons/crm_project_issue/i18n/uk.po
rename to addons/crm_project/i18n/uk.po
diff --git a/addons/crm_project_issue/i18n/vi.po b/addons/crm_project/i18n/vi.po
similarity index 100%
rename from addons/crm_project_issue/i18n/vi.po
rename to addons/crm_project/i18n/vi.po
diff --git a/addons/crm_project_issue/i18n/zh_CN.po b/addons/crm_project/i18n/zh_CN.po
similarity index 100%
rename from addons/crm_project_issue/i18n/zh_CN.po
rename to addons/crm_project/i18n/zh_CN.po
diff --git a/addons/crm_project_issue/i18n/zh_TW.po b/addons/crm_project/i18n/zh_TW.po
similarity index 100%
rename from addons/crm_project_issue/i18n/zh_TW.po
rename to addons/crm_project/i18n/zh_TW.po
diff --git a/addons/crm_project_issue/security/ir.model.access.csv b/addons/crm_project/security/ir.model.access.csv
similarity index 100%
rename from addons/crm_project_issue/security/ir.model.access.csv
rename to addons/crm_project/security/ir.model.access.csv
diff --git a/addons/crm_project_issue/views/crm_lead_views.xml b/addons/crm_project/views/crm_lead_views.xml
similarity index 60%
rename from addons/crm_project_issue/views/crm_lead_views.xml
rename to addons/crm_project/views/crm_lead_views.xml
index 4ea470237c2..874c9afb997 100644
--- a/addons/crm_project_issue/views/crm_lead_views.xml
+++ b/addons/crm_project/views/crm_lead_views.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
 
-    <!-- inherit view of Lead Form : adding the "convert to issue" button -->
-    <record id="crm_case_form_view_leads_project_issue" model="ir.ui.view">
-        <field name="name">crm.lead.form.inherit.lead2projectissue</field>
+    <!-- inherit view of Lead Form : adding the "convert to task" button -->
+    <record id="crm_lead_view_form" model="ir.ui.view">
+        <field name="name">crm.lead.form</field>
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='toggle_active']" position="before">
-                    <button class="oe_stat_button" type="action" name="%(convert_lead2projectissue_wizard_action)d" icon="fa-bug" help="Convert to Issue">
+                    <button class="oe_stat_button" type="action" name="%(crm_lead_convert2task_action)d" icon="fa-bug" help="Convert to Task">
                         <div class="o_field_widget o_stat_info">
                             <span class="o_stat_text">Convert To</span>
-                            <span class="o_stat_text">Issue</span>
+                            <span class="o_stat_text">Task</span>
                         </div>
                     </button>
             </xpath>
diff --git a/addons/crm_project_issue/wizard/__init__.py b/addons/crm_project/wizard/__init__.py
similarity index 69%
rename from addons/crm_project_issue/wizard/__init__.py
rename to addons/crm_project/wizard/__init__.py
index 6ebdf03c7ab..1c10ad19d6b 100644
--- a/addons/crm_project_issue/wizard/__init__.py
+++ b/addons/crm_project/wizard/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import crm_lead2projectissue_wizard
+from . import crm_lead_convert2task
diff --git a/addons/crm_project_issue/wizard/crm_lead2projectissue_wizard.py b/addons/crm_project/wizard/crm_lead_convert2task.py
similarity index 63%
rename from addons/crm_project_issue/wizard/crm_lead2projectissue_wizard.py
rename to addons/crm_project/wizard/crm_lead_convert2task.py
index a382bf07128..2ada685b53d 100644
--- a/addons/crm_project_issue/wizard/crm_lead2projectissue_wizard.py
+++ b/addons/crm_project/wizard/crm_lead_convert2task.py
@@ -2,32 +2,32 @@
 from odoo import api, fields, models
 
 
-class CrmLeadToProjectIssueWizard(models.TransientModel):
-    """ wizard to convert a Lead into a Project Issue and move the Mail Thread """
+class CrmLeadConvert2Task(models.TransientModel):
+    """ wizard to convert a Lead into a Project task and move the Mail Thread """
 
-    _name = "crm.lead2projectissue.wizard"
+    _name = "crm.lead.convert2task"
     _inherit = 'crm.partner.binding'
 
     @api.model
     def default_get(self, fields):
-        result = super(CrmLeadToProjectIssueWizard, self).default_get(fields)
+        result = super(CrmLeadConvert2Task, self).default_get(fields)
         lead_id = self.env.context.get('active_id')
         if lead_id:
             result['lead_id'] = lead_id
         return result
 
     lead_id = fields.Many2one('crm.lead', string='Lead', domain=[('type', '=', 'lead')])
-    project_id = fields.Many2one('project.project', string='Project', domain=[('use_issues', '=', True)])
+    project_id = fields.Many2one('project.project', string='Project', domain=[('use_tasks', '=', True)])
 
     @api.multi
-    def action_lead_to_project_issue(self):
+    def action_lead_to_project_task(self):
         self.ensure_one()
         # get the lead to transform
         lead = self.lead_id
         partner_id = self._find_matching_partner()
         if not partner_id and (lead.partner_name or lead.contact_name):
             partner_id = lead.handle_partner_assignation()[lead.id]
-        # create new project.issue
+        # create new project.task
         vals = {
             "name": lead.name,
             "description": lead.description,
@@ -36,23 +36,23 @@ class CrmLeadToProjectIssueWizard(models.TransientModel):
             "partner_id": partner_id,
             "user_id": None
         }
-        issue = self.env['project.issue'].create(vals)
+        task = self.env['project.task'].create(vals)
         # move the mail thread
-        lead.message_change_thread(issue)
+        lead.message_change_thread(task)
         # move attachments
         attachments = self.env['ir.attachment'].search([('res_model', '=', 'crm.lead'), ('res_id', '=', lead.id)])
-        attachments.write({'res_model': 'project.issue', 'res_id': issue.id})
+        attachments.write({'res_model': 'project.task', 'res_id': task.id})
         # archive the lead
         lead.write({'active': False})
-        # return the action to go to the form view of the new Issue
-        view = self.env.ref('project_issue.project_issue_form_view')
+        # return the action to go to the form view of the new Task
+        view = self.env.ref('project.view_task_form2')
         return {
-            'name': 'Issue created',
+            'name': 'Task created',
             'view_type': 'form',
             'view_mode': 'form',
             'view_id': view.id,
-            'res_model': 'project.issue',
+            'res_model': 'project.task',
             'type': 'ir.actions.act_window',
-            'res_id': issue.id,
+            'res_id': task.id,
             'context': self.env.context
         }
diff --git a/addons/crm_project_issue/wizard/crm_lead2projectissue_wizard_view.xml b/addons/crm_project/wizard/crm_lead_convert2task_views.xml
similarity index 56%
rename from addons/crm_project_issue/wizard/crm_lead2projectissue_wizard_view.xml
rename to addons/crm_project/wizard/crm_lead_convert2task_views.xml
index 0405e9ac5cf..1984f8d4d79 100644
--- a/addons/crm_project_issue/wizard/crm_lead2projectissue_wizard_view.xml
+++ b/addons/crm_project/wizard/crm_lead_convert2task_views.xml
@@ -2,16 +2,16 @@
 <odoo>
 
     <!-- view of the Wizard Form --> 
-    <record id="view_crm_lead2projectissue_wizard" model="ir.ui.view">
-        <field name="name">crm.lead2projectissue.wizard.form</field>
-        <field name="model">crm.lead2projectissue.wizard</field>
+    <record id="crm_lead_convert2task_view_form" model="ir.ui.view">
+        <field name="name">crm.lead.convert2task.form</field>
+        <field name="model">crm.lead.convert2task</field>
         <field name="arch" type="xml">
-            <form string="Convert to Issue">
+            <form string="Convert to Task">
                 <group>
                     <field name="project_id"/>
                 </group>
                 <footer>
-                    <button type="object" name="action_lead_to_project_issue" string="Create Issue" class="btn-primary"/>
+                    <button type="object" name="action_lead_to_project_task" string="Create Task" class="btn-primary"/>
                     <button string="Cancel" class="btn-default" special="cancel"/>
                 </footer>
             </form>
@@ -19,9 +19,9 @@
     </record>
 
     <!-- action of converting, via wizard -->
-    <record id="convert_lead2projectissue_wizard_action" model="ir.actions.act_window">
-        <field name="name">Convert to Issue</field>
-        <field name="res_model">crm.lead2projectissue.wizard</field>
+    <record id="crm_lead_convert2task_action" model="ir.actions.act_window">
+        <field name="name">Convert to Task</field>
+        <field name="res_model">crm.lead.convert2task</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>