Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re3c5eb0fcb29840433e2c46086146ae683533104 -r97f231b6122d5c6d1215625bb3c3fa77f75ca0d8
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e3c5eb0fcb29840433e2c46086146ae683533104)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 97f231b6122d5c6d1215625bb3c3fa77f75ca0d8)
@@ -1447,15 +1447,15 @@
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
-                handleSetFluidLeakStateDetectorOverrideRequest( message );
+            case MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE:
+                handleSetFluidLeakStateOverrideRequest( message );
 
             case MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE:
                 handleSetBloodLeakDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BLOOD_LEAK_DATA_DETECTOR_OVERRIDE:
-                handleSetBloodLeakDataDetectorOverrideRequest( message );
+            case MSG_ID_HD_BLOOD_LEAK_DATA_OVERRIDE:
+                handleSetBloodLeakDataOverrideRequest( message );
 
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re3c5eb0fcb29840433e2c46086146ae683533104 -r97f231b6122d5c6d1215625bb3c3fa77f75ca0d8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e3c5eb0fcb29840433e2c46086146ae683533104)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 97f231b6122d5c6d1215625bb3c3fa77f75ca0d8)
@@ -4231,14 +4231,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetFluidLeakStateDetectorOverrideRequest function handles a request to
+ * The handleSetFluidLeakStateOverrideRequest function handles a request to
  * override the fluid leak detector state.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message )
+void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -4295,14 +4295,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetBloodLeakDataDetectorOverrideRequest function handles a request to
+ * The handleSetBloodLeakDataOverrideRequest function handles a request to
  * override the blood leak detector data.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetBloodLeakDataDetectorOverrideRequest( MESSAGE_T *message )
+void handleSetBloodLeakDataOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -re3c5eb0fcb29840433e2c46086146ae683533104 -r97f231b6122d5c6d1215625bb3c3fa77f75ca0d8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e3c5eb0fcb29840433e2c46086146ae683533104)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 97f231b6122d5c6d1215625bb3c3fa77f75ca0d8)
@@ -476,14 +476,14 @@
 // MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE
 void handleSetFluidLeakBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE
-void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message );
+// MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE
+void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE
 void handleSetBloodLeakDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_BLOOD_LEAK_DATA_DETECTOR_OVERRIDE
-void handleSetBloodLeakDataDetectorOverrideRequest( MESSAGE_T *message );
+// MSG_ID_HD_BLOOD_LEAK_DATA_OVERRIDE
+void handleSetBloodLeakDataOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );