diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index 4383016a5c9..c6c8e4d6c3f 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -196,7 +196,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_email_smtp_server_tree_all">
-            <field name="name">Smtp Server</field>
+            <field name="name">Outgoing Servers</field>
             <field name="res_model">email.smtp_server</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
@@ -207,7 +207,7 @@
 
         <menuitem name="Email" id="menu_config_email" parent="base.menu_lunch_survey_root" sequence="20"/>
 
-        <menuitem name="Smtp Server" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
+        <menuitem name="Outgoing Servers" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
 
     </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1563b66bf4f..f03d8f91a72 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -93,7 +93,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_email_server_tree">
-            <field name="name">Email Servers</field>
+            <field name="name">Incomming Servers</field>
             <field name="res_model">email.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -102,10 +102,10 @@
         </record>
 
         <menuitem
-            parent="emails.menu_email_message_tools"
+            parent="emails.menu_config_email"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
-            name="Email Servers"
+            name="Incomming Servers"
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 2ca21a3031c..18c6098050e 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -777,7 +777,7 @@ marketing_campaign_workitem()
 class email_template(osv.osv):
     _inherit = "email.template"
     _defaults = {
-        'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
+        'model_id': lambda obj, cr, uid, context: context.get('object_id',False),
     }
 
     # TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 89b459b8896..a8bdbe518c4 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -266,7 +266,7 @@
                     <field name="type"/>
                     <group colspan='2' col='1'>
                         <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
-                               context="{'default_object_name':object_id}" />
+                               context="{'default_model_id':object_id}" />
                         <group attrs="{'invisible':[('type','!=','report')]}" >
                             <field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}"/>
                             <field name="report_directory_id" attrs="{'required':[('type','=','report')]}" />