diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index 44de0f8f10ccf19dda73d415aa2b4feb2a47b24d..9a80de72cbeaa4f643b9717391be810727ba4b6b 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -3967,9 +3967,9 @@ void Commander::data_link_check(bool &status_changed)
 		//if avoidance never started
 		if (_datalink_last_heartbeat_avoidance_system == 0
 		    && hrt_elapsed_time(&_datalink_last_heartbeat_avoidance_system) > _oa_boot_timeout.get() * 1_s) {
-			if (!_print_msg_once) {
+			if (!_print_avoidance_msg_once) {
 				mavlink_log_critical(&mavlink_log_pub, "Avoidance system not available!");
-				_print_msg_once = true;
+				_print_avoidance_msg_once = true;
 
 			}
 		}
@@ -3980,7 +3980,7 @@ void Commander::data_link_check(bool &status_changed)
 			_avoidance_system_lost = true;
 			mavlink_log_critical(&mavlink_log_pub, "Avoidance system lost");
 			status_flags.avoidance_system_valid = false;
-			_print_msg_once = false;
+			_print_avoidance_msg_once = false;
 		}
 
 		//if status changed
diff --git a/src/modules/commander/Commander.hpp b/src/modules/commander/Commander.hpp
index c0c8509fd6f2b55d1c2105ae2ee41ed401f27965..1c219624b62d810483ef2247ac4d3fe790e5936c 100644
--- a/src/modules/commander/Commander.hpp
+++ b/src/modules/commander/Commander.hpp
@@ -203,7 +203,7 @@ private:
 	systemlib::Hysteresis	_auto_disarm_landed{false};
 	systemlib::Hysteresis	_auto_disarm_killed{false};
 
-	bool _print_msg_once{false};
+	bool _print_avoidance_msg_once{false};
 
 	// Subscriptions
 	Subscription<estimator_status_s>		_estimator_status_sub{ORB_ID(estimator_status)};