diff --git a/msg/BatteryStatus.msg b/msg/BatteryStatus.msg
index 00d2efef4c..c726051ff9 100644
--- a/msg/BatteryStatus.msg
+++ b/msg/BatteryStatus.msg
@@ -50,7 +50,7 @@ uint8 BATTERY_FAULT_INCOMPATIBLE_VOLTAGE = 6 # Vehicle voltage is not compatible
 uint8 BATTERY_FAULT_INCOMPATIBLE_FIRMWARE = 7 # Battery firmware is not compatible with current autopilot firmware
 uint8 BATTERY_FAULT_INCOMPATIBLE_MODEL = 8 # Battery model is not supported by the system
 uint8 BATTERY_FAULT_HARDWARE_FAILURE = 9 # hardware problem
-uint8 BATTERY_WARNING_OVER_TEMPERATURE = 10 # Over-temperature
+uint8 BATTERY_FAULT_FAILED_TO_ARM = 10 # Battery had a problem while arming
 uint8 BATTERY_FAULT_COUNT = 11 # Counter - keep it as last element!
 
 uint16 faults		# Smart battery supply status/fault flags (bitmask) for health indication.
diff --git a/src/lib/events/enums.json b/src/lib/events/enums.json
index 8e86170951..7076bea8a3 100644
--- a/src/lib/events/enums.json
+++ b/src/lib/events/enums.json
@@ -631,7 +631,7 @@
                             "description": "Battery reported over-current"
                         },
                         "4": {
-                            "name": "fault_temperature",
+                            "name": "over_temperature",
                             "description": "Battery has reached a critical temperature which can result in a critical failure"
                         },
                         "5": {
@@ -655,8 +655,8 @@
                             "description": "Battery reported an hardware problem"
                         },
                         "10": {
-                            "name": "over_temperature",
-                            "description": "Battery is over-heating"
+                            "name": "failed_to_arm",
+                            "description": "Battery failed to arm"
                         }
                     }
                 },
diff --git a/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp b/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
index c5e8015413..f244f10066 100644
--- a/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
+++ b/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
@@ -53,7 +53,7 @@ static constexpr const char *battery_fault_reason_str(battery_fault_reason_t bat
 
 	case battery_fault_reason_t::over_current: return "over current";
 
-	case battery_fault_reason_t::fault_temperature: return "critical temperature";
+	case battery_fault_reason_t::over_temperature: return "over temperature";
 
 	case battery_fault_reason_t::under_temperature: return "under temperature";
 
@@ -65,7 +65,7 @@ static constexpr const char *battery_fault_reason_str(battery_fault_reason_t bat
 
 	case battery_fault_reason_t::hardware_fault: return "hardware fault";
 
-	case battery_fault_reason_t::over_temperature: return "near temperature limit";
+	case battery_fault_reason_t::failed_to_arm: return "failed to arm";
 
 	}