Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -re5d6674fbf4b6ddd8057385babac0a085ce18f42 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision e5d6674fbf4b6ddd8057385babac0a085ce18f42)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -423,7 +423,7 @@
 
     if ( elapsedPrimeTimeInSecs > MAX_PRIME_TIME )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_PRIME_OUT_OF_TIME, elapsedPrimeTimeInSecs, MAX_PRIME_TIME );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_PRIME_OUT_OF_TIME, elapsedPrimeTimeInSecs, MAX_PRIME_TIME );
     }
 
     if ( ++primeStatusBroadcastTimerCounter >= PRIME_DATA_PUB_INTERVAL )
@@ -783,7 +783,7 @@
 
     if ( TRUE == didTimeout( primeDialysateDialyzerStartTime, primeDialysateDialyzerTimeLimit + STEADY_VOLUME_TIME_DEADLINE_MS ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT, primeDialysateDialyzerTimeLimit );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_DIALYSATE_DIALYZER_TIME_OUT, primeDialysateDialyzerTimeLimit );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -850,7 +850,7 @@
     // TODO: Rework alarm and timeout logic here. PRIME_SALINE_DIALYZER_TIME_OUT_COUNT may not be reached.
     if ( TRUE == didTimeout( primeSalineDialyzerStartTime, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT );  // Trigger HD prime saline dialyzer time out alarm.
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_SALINE_DIALYZER_TIME_OUT, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT );  // Trigger HD prime saline dialyzer time out alarm.
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -947,7 +947,7 @@
 
     if ( TRUE == didTimeout( primeDialysateBypassStartTime, PRIME_DIALYSATE_BYPASS_TIME_LIMIT + STEADY_VOLUME_TIME_DEADLINE_MS ) )  // allocate 55 seconds for the steady state logic to do its job before timing out
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )