Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r78e44d106a46d3ba649f5b71ad89a8cdaf557d52 -r80fcb3eb82c20209b38471842307f7c0536547be
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 78e44d106a46d3ba649f5b71ad89a8cdaf557d52)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 80fcb3eb82c20209b38471842307f7c0536547be)
@@ -52,7 +52,7 @@
 #define DIALYSATE_TEMP_UPPER_SAFETY_TIMEOUT_MS          ( 300 * MS_PER_SECOND )     ///< Dialysate temperature upper bound timeout in milliseconds.
 #define DIALYSATE_TEMP_LOWER_SAFETY_LIMIT_C             33.0F                       ///< Dialysate lower bound safety temperature limit in C.
 #define DIALYSATE_TEMP_LOWER_SAFETY_TIMEOUT_MS          ( 300 * MS_PER_SECOND )     ///< Dialysate temperature lower bound timeout in milliseconds.
-#define DIALYSATE_TEMP_CLEAR_TIMEOUT_MS                 ( 30 * MS_PER_SECOND )      ///< Dialysate temperature clear persistence timeout.
+#define DIALYSATE_TEMP_CLEAR_TIMEOUT_MS                 ( 10 * MS_PER_SECOND )      ///< Dialysate temperature clear persistence timeout.
 #define DG_DATA_FRESHNESS_TIMEOUT_MS                    ( 3 * MS_PER_SECOND )       ///< DG data freshness timeout (in ms).
 
 
@@ -180,13 +180,9 @@
     lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0F;
     lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0F;
 
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_LOW_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_SAFETY_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_LOW_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_LOWER_SAFETY_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
 
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
-
     initPersistentAlarm( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
@@ -1198,7 +1194,7 @@
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_HIGH_SAFETY_RANGE, isTDiTempAboveHighSafety, dgDialysateTemp, DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C );
 
         // Per PRS 377
-        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) )
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE ) )
         {
             isTDiTempAboveDialysateTarget = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
         }
@@ -1211,7 +1207,7 @@
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_LOW_SAFETY_RANGE,  isTDiTempAboveLowSafety,  dgDialysateTemp, DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C );
 
         // Per PRS 124
-        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) )
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE ) )
         {
             isTDiTempBelowDialysateTarget = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
         }