Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r70b000b9a49b56f1e5d41aebddf4ed97a01faa0b -r9690fa47c23a2d76f62f385b553db7e565e18a1e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 70b000b9a49b56f1e5d41aebddf4ed97a01faa0b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9690fa47c23a2d76f62f385b553db7e565e18a1e)
@@ -1434,26 +1434,26 @@
 
 /***********************************************************************//**
  * @brief
- * The broadcastBloodLeakState function constructs an HD blood leak state msg to \n
+ * The broadcastBloodLeakStatus function constructs an HD blood leak state msg to \n
  * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: blood leak state msg constructed and queued
  * @param state blood leak state
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state )
+BOOL broadcastBloodLeakStatus( BLOOD_LEAK_STATES_T status )
 {
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
-    U32 leakState = (U32)state;
+    U32 leakStatus = (U32)status;
 
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_STATE;
     msg.hdr.payloadLen = sizeof( U32 );
 
-    memcpy( payloadPtr, &leakState, sizeof( U32 ) );
+    memcpy( payloadPtr, &leakStatus, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
@@ -4278,11 +4278,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBloodLeakStatePublishIntervalOverride( (U32)( payload.state.u32 ) );
+            result = testSetBloodLeakStatusPublishIntervalOverride( (U32)( payload.state.u32 ) );
         }
         else
         {
-            result = testResetBloodLeakStatePublishIntervalOverride();
+            result = testResetBloodLeakStatusPublishIntervalOverride();
         }
     }
 
@@ -4292,14 +4292,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetBloodLeakStateDetectorOverrideRequest function handles a request to
- * override the blood leak detector state.
+ * The handleSetBloodLeakStatusDetectorOverrideRequest function handles a request to
+ * override the blood leak detector status.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetBloodLeakStateDetectorOverrideRequest( MESSAGE_T *message )
+void handleSetBloodLeakStatusDetectorOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -4310,11 +4310,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBloodLeakStateOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) );
+            result = testSetBloodLeakStatusOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) );
         }
         else
         {
-            result = testResetBloodLeakStateOverride();
+            result = testResetBloodLeakStatusOverride();
         }
     }