diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 928f8d94d5c..50ea749bff1 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -10,7 +10,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_meeting_read" model="ir.values">
         <field name="name">action_crm_meeting_read</field>
@@ -28,7 +28,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_meeting_unread" model="ir.values">
         <field name="name">action_crm_meeting_unread</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f018a355579..bca64f863cf 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -9,7 +9,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_crm_lead_unread" model="ir.values">
             <field name="name">action_crm_lead_unread</field>
@@ -27,7 +27,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_crm_lead_read" model="ir.values">
             <field name="name">action_crm_lead_read</field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2f885e09b61..4b6352bb86e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -9,7 +9,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_phonecall_unread" model="ir.values">
         <field name="name">action_crm_phonecall_unread</field>
@@ -27,7 +27,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_phonecall_read" model="ir.values">
         <field name="name">action_crm_phonecall_read</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e2ff2e67e87..36bdbef75b2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -65,7 +65,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_event_unread" model="ir.values">
             <field name="name">action_event_event_unread</field>
@@ -83,7 +83,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_event_read" model="ir.values">
             <field name="name">action_event_event_read</field>
@@ -387,7 +387,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_registration_unread" model="ir.values">
             <field name="name">action_event_registration_unread</field>
@@ -405,7 +405,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_registration_read" model="ir.values">
             <field name="name">action_event_registration_read</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5a2e0603b88..92ebebc5d5c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,7 +8,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_holidays_unread" model="ir.values">
             <field name="name">action_holidays_unread</field>
@@ -26,7 +26,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_holidays_read" model="ir.values">
             <field name="name">action_holidays_read</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 098a8aec210..838bda35db7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,7 +42,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_applicant_unread" model="ir.values">
         <field name="name">action_project_unread</field>
@@ -60,7 +60,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_applicant_read" model="ir.values">
         <field name="name">action_project_read</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ff8ac943a67..466472d7324 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -27,7 +27,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_unread" model="ir.values">
             <field name="name">action_project_unread</field>
@@ -45,7 +45,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_read" model="ir.values">
             <field name="name">action_project_read</field>
@@ -354,7 +354,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_task_unread" model="ir.values">
             <field name="name">action_project_task_unread</field>
@@ -372,7 +372,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_task_read" model="ir.values">
             <field name="name">action_project_task_read</field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fea22c519a8..1683256673b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -11,7 +11,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_issue_unread" model="ir.values">
             <field name="name">action_project_issue_unread</field>
@@ -29,7 +29,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_issue_read" model="ir.values">
             <field name="name">action_project_issue_read</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 53f27245e7e..e020092eb40 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -118,7 +118,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_purchase_order_unread" model="ir.values">
             <field name="name">action_purchase_order_unread</field>
@@ -136,7 +136,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_purchase_order_read" model="ir.values">
             <field name="name">action_purchase_order_read</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 651454ef73d..0c71a1961b4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -77,7 +77,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_sale_order_unread" model="ir.values">
             <field name="name">action_sale_order_unread</field>
@@ -95,7 +95,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_sale_order_read" model="ir.values">
             <field name="name">action_sale_order_read</field>