Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rc28337436dce61c9ecc295d191c44628e089bf33 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c28337436dce61c9ecc295d191c44628e089bf33)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -607,7 +607,7 @@
     // Trigger user stop alarm at any time in treatment mode when user presses stop button
     if ( TRUE == stop )
     {
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        activateAlarmNoData( ALARM_ID_HD_TREATMENT_STOPPED_BY_USER );
     }
 
     // Check if resume treatment blocked by alarm
@@ -785,7 +785,7 @@
         treatmentEndTimeStamp = getRTCTimestamp();
         stopDialysis();
         transitionToTreatmentEnd();
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_END_OF_TREATMENT_WARNING, presTreatmentTimeSecs );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_END_OF_TREATMENT_WARNING, presTreatmentTimeSecs );
         result = TREATMENT_END_STATE;
     }
     // Otherwise, execute state machine for treatment dialysis sub-mode