Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -116,11 +116,11 @@
     {
         if ( TRUE == getRinsebackCompleted() )
         {
-            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK );  // No escalation after rinseback because no blood in blood line
+            activateAlarmNoData( ALARM_ID_HD_TREATMENT_STOPPED_AFTER_RINSEBACK );  // No escalation after rinseback because no blood in blood line
         }
         else
         {
-            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+            activateAlarmNoData( ALARM_ID_HD_TREATMENT_STOPPED_BY_USER );
         }
         // coming back to stop state via non-alarm path, so no audio - just want alarm for its options
         signalAlarmSilence( ALARM_SILENCE_CMD_CANCEL );
@@ -401,12 +401,12 @@
     {
         if ( ++bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
         {
-            activateAlarmNoData( ALARM_ID_BLOOD_SITTING_WARNING );
+            activateAlarmNoData( ALARM_ID_HD_BLOOD_SITTING_WARNING );
         }
         if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
         {
             // Activate the alarm
-            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
+            activateAlarmNoData( ALARM_ID_HD_TREATMENT_STOPPED_NO_RINSEBACK );
         }
     }
     else