Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rc28337436dce61c9ecc295d191c44628e089bf33 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision c28337436dce61c9ecc295d191c44628e089bf33)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -353,7 +353,7 @@
     else if ( rinsebackTimerCtr > MAX_RINSEBACK_TIME )
     {
         signalGoToTreatmentStopped();
-        activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
+        activateAlarmNoData( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
     }
 
     return result;
@@ -395,7 +395,7 @@
     // Check for empty saline bag
     if ( TRUE == isSalineBagEmpty() )
     {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_EMPTY_SALINE_BAG, getMeasuredArterialPressure() );
+        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_EMPTY_SALINE_BAG, getMeasuredArterialPressure() );
         setupForRinsebackStopOrPause();
         result = RINSEBACK_PAUSED_STATE;
     }
@@ -449,7 +449,7 @@
     if ( rinsebackTimerCtr > MAX_RINSEBACK_TIME )
     {
         signalGoToTreatmentStopped();
-        activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
+        activateAlarmNoData( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
     }
     else if ( TRUE == resumeRinsebackRequested )
     {
@@ -482,7 +482,7 @@
     if ( ( rinsebackTimerCtr > MAX_RINSEBACK_TIME ) && ( getRinsebackVolume() < rinsebackTargetVolume_mL ) )
     {
         signalGoToTreatmentStopped();
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM, rinsebackTimerCtr, MAX_RINSEBACK_TIME );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM, rinsebackTimerCtr, MAX_RINSEBACK_TIME );
     }
     else if ( TRUE == recircRequested )
     {
@@ -538,7 +538,7 @@
     // Check for empty saline bag
     if ( TRUE == isSalineBagEmpty() )
     {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_EMPTY_SALINE_BAG, getMeasuredArterialPressure() );
+        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_EMPTY_SALINE_BAG, getMeasuredArterialPressure() );
         targetRinsebackVolumePlusAdditional_mL = getRinsebackVolume();
         result = RINSEBACK_STOP_STATE;
     }