Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0b606b5cbf2df52ea9845544155eae947ca4b8ee -r9e14f8c931ea3f2afdedc92de71bd497868a4176
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0b606b5cbf2df52ea9845544155eae947ca4b8ee)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9e14f8c931ea3f2afdedc92de71bd497868a4176)
@@ -184,9 +184,9 @@
     { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
     { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
     { MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,                             &testEnableVenousBubbleAlarm },
-    { MSG_ID_TD_BATTERY_REMAINING_CAPACITY,                             &testBatteryRemainingCapacityOverride },
-    { MSG_ID_TD_BATTERY_STATUS,                                         &testBatteryStatusOverride },
-    { MSG_ID_TD_BATTERY_CHARGER_STATUS,                                 &testBatteryChargerStatusOverride },
+    { MSG_ID_TD_BATTERY_REMAINING_CAPACITY_OVERRIDE_REQUEST,            &testBatteryRemainingCapacityOverride },
+    { MSG_ID_TD_BATTERY_STATUS_OVERRIDE_REQUEST,                        &testBatteryStatusOverride },
+    { MSG_ID_TD_BATTERY_CHARGER_STATUS_OVERRIDE_REQUEST,                &testBatteryChargerStatusOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))