Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r1e8be8e6cfe034e1f91b6a8842da2c243ec01171 -reea2857548dfde4f092983ede2c2bd1d1453fa12
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 1e8be8e6cfe034e1f91b6a8842da2c243ec01171)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision eea2857548dfde4f092983ede2c2bd1d1453fa12)
@@ -681,7 +681,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_TIMEOUT );
+            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_SEND_TIMEOUT );
         }
 
         state = BLOOD_LEAK_INIT_STATE;
@@ -711,7 +711,7 @@
         clearFPGABloodLeakZero();
         clearFPGABloodLeakSelfTest();
         // Get ready for the next state.
-        state                               = BLOOD_LEAK_PREP_FOR_SELF_TEST_CMD_STATE;
+        state                                   = BLOOD_LEAK_PREP_FOR_SELF_TEST_CMD_STATE;
         bloodLeakGPIOCmd.cmdStartTimeMS         = getMSTimerCount();
         bloodLeakGPIOCmd.cmdWaitBtwnZeroSTestMS = getMSTimerCount();
     }
@@ -722,7 +722,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_TIMEOUT );
+            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT );
         }
         // Get back to init state
         state = BLOOD_LEAK_INIT_STATE;
@@ -768,7 +768,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE );
+            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_SEND_TIMEOUT );
         }
         // Self test command failed
         state = BLOOD_LEAK_INIT_STATE;
@@ -805,7 +805,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE );
+            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT );
         }
         // Self test failed due to timeout
         state                   = BLOOD_LEAK_INIT_STATE;