Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r3378a1eeb73e1e46f3cdd8571c8a20602bce439e -re9cc9eadcf846737bbc4e900db22f4c2a06ad922
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 3378a1eeb73e1e46f3cdd8571c8a20602bce439e)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922)
@@ -219,13 +219,13 @@
  * @details Outputs: none
  * @return the current blood leak state.
  *************************************************************************/
-BLOOD_LEAK_STATE_T getBloodLeakState( void )
+BLOOD_LEAK_STATES_T getBloodLeakState( void )
 {
-    BLOOD_LEAK_STATE_T result = (BLOOD_LEAK_STATE_T)bloodLeakState.data;
+    BLOOD_LEAK_STATES_T result = (BLOOD_LEAK_STATES_T)bloodLeakState.data;
 
     if ( OVERRIDE_KEY == bloodLeakState.override )
     {
-        result = (BLOOD_LEAK_STATE_T)bloodLeakState.ovData;
+        result = (BLOOD_LEAK_STATES_T)bloodLeakState.ovData;
     }
 
     return result;
@@ -263,7 +263,7 @@
     // Publish blood leak state on interval
     if ( ++bloodLeakStatePublicationTimerCounter >= getPublishBloodLeakStateInterval() )
     {
-        BLOOD_LEAK_STATE_T state = getBloodLeakState();
+        BLOOD_LEAK_STATES_T state = getBloodLeakState();
 
         broadcastBloodLeakState( state );
         bloodLeakStatePublicationTimerCounter = 0;
@@ -432,7 +432,7 @@
  * @param state override blood leak detector with this
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATE_T state )
+BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state )
 {
     BOOL result = FALSE;
 
Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r3378a1eeb73e1e46f3cdd8571c8a20602bce439e -re9cc9eadcf846737bbc4e900db22f4c2a06ad922
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 3378a1eeb73e1e46f3cdd8571c8a20602bce439e)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922)
@@ -49,7 +49,7 @@
     BLOOD_LEAK_SELF_TEST_STATE,             ///< Self-test state
     BLOOD_LEAK_NORMAL_STATE,                ///< Normal state
     NUM_OF_BLOOD_LEAK_STATES                ///< Number of blood leak detector states
-} BLOOD_LEAK_STATE_T;
+} BLOOD_LEAK_STATES_T;
 
 // ********** public function prototypes **********
 
@@ -59,7 +59,7 @@
 void execBloodLeak( void );
 
 BLOOD_LEAK_STATUS_T getBloodLeakStatus( void );
-BLOOD_LEAK_STATE_T getBloodLeakState( void );
+BLOOD_LEAK_STATES_T getBloodLeakState( void );
 
 BOOL testSetBloodLeakStatusPublishIntervalOverride( U32 value );
 BOOL testResetBloodLeakStatusPublishIntervalOverride( void );
@@ -68,7 +68,7 @@
 
 BOOL testSetBloodLeakStatePublishIntervalOverride( U32 value );
 BOOL testResetBloodLeakStatePublishIntervalOverride( void );
-BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATE_T state );
+BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state );
 BOOL testResetBloodLeakStateOverride( void );
 
 /**@}*/
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rb8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52 -re9cc9eadcf846737bbc4e900db22f4c2a06ad922
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision b8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922)
@@ -82,7 +82,7 @@
 #define FPGA_AIRTRAP_LEVEL_HIGH_MASK    0x0004                  ///< Bit mask for air trap upper level sensor.
 
 #define FPGA_FLUID_LEAK_STATE_MASK      0x0040                  ///< Bit mask for fluid leak detector.
-#define FPGA_BLOOD_LEAK_STATE_MASK      0x1000                  ///< Bit mask for blood leak detector.
+#define FPGA_BLOOD_LEAK_STATUS_MASK     0x1000                  ///< Bit mask for blood leak detector.
 #define FPGA_BLOOD_LEAK_ZERO_STATE_MASK 0x2000                  ///< Bit mask for blood leak detector zero.
 
 #define FPGA_ADA_INPUT_STATUS_MASK      0x0001                  ///< Bit mask for arterial air bubble detector input status.
@@ -1512,7 +1512,7 @@
  *************************************************************************/
 BOOL noFPGABloodLeakDetected( void )
 {
-    U16 noFPGABloodLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_BLOOD_LEAK_STATE_MASK;
+    U16 noFPGABloodLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_BLOOD_LEAK_STATUS_MASK;
 
     return ( 0 == noFPGABloodLeakDetected ? FALSE : TRUE );
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rb8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52 -re9cc9eadcf846737bbc4e900db22f4c2a06ad922
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922)
@@ -1405,6 +1405,35 @@
 
 /***********************************************************************//**
  * @brief
+ * The broadcastFluidLeakState function constructs an HD fluid leak state msg to \n
+ * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: fluid leak state msg constructed and queued
+ * @param state fluid leak state
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U32 leakState = (U32)state;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_FLUID_LEAK_STATE;
+    msg.hdr.payloadLen = sizeof( U32 );
+
+    memcpy( payloadPtr, &leakState, 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 );
+
+    return result;
+}
+
+/***********************************************************************//**
+ * @brief
  * The broadcastBloodLeakStatus function constructs an HD blood leak status msg to \n
  * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -1441,7 +1470,7 @@
  * @param state blood leak state
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastBloodLeakState( BLOOD_LEAK_STATE_T state )
+BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -4374,7 +4403,7 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBloodLeakStateOverride( ( BLOOD_LEAK_STATE_T)( payload.state.u32 ) );
+            result = testSetBloodLeakStateOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) );
         }
         else
         {
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rb8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52 -re9cc9eadcf846737bbc4e900db22f4c2a06ad922
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision b8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922)
@@ -285,7 +285,7 @@
 BOOL broadcastBloodLeakStatus( BLOOD_LEAK_STATUS_T status );
 
 // MSG_ID_HD_BLOOD_LEAK_STATE
-BOOL broadcastBloodLeakState( BLOOD_LEAK_STATE_T state );
+BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state );
 
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );