diff --git a/mistral/services/action_heartbeat_checker.py b/mistral/services/action_heartbeat_checker.py
index f1ce6a666..94190df54 100644
--- a/mistral/services/action_heartbeat_checker.py
+++ b/mistral/services/action_heartbeat_checker.py
@@ -88,7 +88,7 @@ def _loop():
             handle_expired_actions()
         except Exception:
             LOG.exception(
-                'Action execution checker iteration failed'
+                'Action heartbeat checker iteration failed'
                 ' due to an unexpected exception.'
             )
 
@@ -109,14 +109,14 @@ def start():
     enabled = interval and max_missed
 
     if not enabled:
-        LOG.info("Action heartbeat reporting is disabled.")
+        LOG.info("Action heartbeats are disabled.")
 
         return
 
     wait_time = interval * max_missed
 
     LOG.debug(
-        "First run of action execution checker, wait before "
+        "First run of action heartbeat checker, wait before "
         "checking to make sure executors have time to send "
         "heartbeats. ({} seconds)".format(wait_time)
     )
diff --git a/mistral/services/action_heartbeat_sender.py b/mistral/services/action_heartbeat_sender.py
index 693a11136..00b7e819d 100644
--- a/mistral/services/action_heartbeat_sender.py
+++ b/mistral/services/action_heartbeat_sender.py
@@ -50,7 +50,7 @@ def remove_action(action_ex_id):
 
 
 def send_action_heartbeats():
-    LOG.debug('Running heartbeat reporter...')
+    LOG.debug('Running heartbeat sender...')
 
     global _running_actions