diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
index b0ad4313b4f..b9ac29ec4c2 100644
--- a/addons/email_template/wizard/__init__.py
+++ b/addons/email_template/wizard/__init__.py
@@ -20,5 +20,5 @@
 #
 ##############################################################################
 import email_template_preview
-import email_compose_message
+import mail_compose_message
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
similarity index 100%
rename from addons/email_template/wizard/email_compose_message.py
rename to addons/email_template/wizard/mail_compose_message.py
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
index 7036af4f659..64406ac6b1e 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -20,6 +20,6 @@
 ##############################################################################
 
 #import hr_evaluation_mail
-import email_compose_message
+import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
similarity index 100%
rename from addons/hr_evaluation/wizard/email_compose_message.py
rename to addons/hr_evaluation/wizard/mail_compose_message.py
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 832130bd808..f5324d2b6aa 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import email_compose_message
+import mail_compose_message
 import project_task_delegate
 import project_task_reevaluate
 
diff --git a/addons/project/wizard/email_compose_message.py b/addons/project/wizard/mail_compose_message.py
similarity index 95%
rename from addons/project/wizard/email_compose_message.py
rename to addons/project/wizard/mail_compose_message.py
index 2eee75c22b1..82d67ea9b92 100644
--- a/addons/project/wizard/email_compose_message.py
+++ b/addons/project/wizard/mail_compose_message.py
@@ -23,7 +23,7 @@ from osv import osv
 from osv import fields
 from tools.translate import _
 
-class email_compose_message(osv.osv_memory):
+class mail_compose_message(osv.osv_memory):
     _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
@@ -34,7 +34,7 @@ class email_compose_message(osv.osv_memory):
 
         @return: Returns a dictionary
         '''
-        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
         if model == 'project.task' and resource_id:
             task_pool = self.pool.get('project.task')
             task_data = task_pool.browse(cr, uid, resource_id, context=context)
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 2a643f0fa5f..fcba1742d75 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -23,8 +23,7 @@ import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
 import project_scrum_postpone
-#import project_scrum_email
-import email_compose_message
+import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/mail_compose_message.py
similarity index 94%
rename from addons/project_scrum/wizard/email_compose_message.py
rename to addons/project_scrum/wizard/mail_compose_message.py
index d3d23f42c45..777ca03fa37 100644
--- a/addons/project_scrum/wizard/email_compose_message.py
+++ b/addons/project_scrum/wizard/mail_compose_message.py
@@ -23,7 +23,7 @@ from osv import osv
 from osv import fields
 from tools.translate import _
 
-class email_compose_message(osv.osv_memory):
+class mail_compose_message(osv.osv_memory):
     _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
@@ -36,7 +36,7 @@ class email_compose_message(osv.osv_memory):
         '''
         if context is None:
             context = {}
-        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
         if model == 'project.scrum.meeting' and resource_id:
             meeting_pool = self.pool.get('project.scrum.meeting')
             user_pool = self.pool.get('res.users')