diff --git a/Tools/Replay/LR_MsgHandler.cpp b/Tools/Replay/LR_MsgHandler.cpp
index e5b0a49809..2e6274011a 100644
--- a/Tools/Replay/LR_MsgHandler.cpp
+++ b/Tools/Replay/LR_MsgHandler.cpp
@@ -116,17 +116,14 @@ void LR_MsgHandler_BARO::process_message(uint8_t *msg)
 }
 
 
-#define DATA_ARMED                          10
-#define DATA_DISARMED                       11
-
 void LR_MsgHandler_Event::process_message(uint8_t *msg)
 {
     uint8_t id = require_field_uint8_t(msg, "Id");
-    if (id == DATA_ARMED) {
+    if ((LogEvent)id == LogEvent::ARMED) {
         hal.util->set_soft_armed(true);
         printf("Armed at %lu\n", 
                (unsigned long)AP_HAL::millis());
-    } else if (id == DATA_DISARMED) {
+    } else if ((LogEvent)id == LogEvent::DISARMED) {
         hal.util->set_soft_armed(false);
         printf("Disarmed at %lu\n", 
                (unsigned long)AP_HAL::millis());