Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e)
@@ -573,7 +573,7 @@
     }
 
     // Drain has started and DG goes to re-circ mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
@@ -632,7 +632,7 @@
     }
 
     // Drain has started and DG goes to generation idle mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e)
@@ -206,7 +206,7 @@
     alarmStatus.noEndTreatment = FALSE;
     alarmStatus.noNewTreatment = FALSE;
     alarmStatus.noDialRecirc = FALSE;
-    alarmStatus.usrACKRequired = FALSE;
+    alarmStatus.ok = FALSE;
 
     alarmAudioTestToneRequested = FALSE;
     alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START;
@@ -494,8 +494,8 @@
 
         if ( ALARM_USER_ACTION_ACK == action )
         {
-            // If user acknowledged top alarm, just clear that alarm
-            if ( TRUE == ALARM_TABLE[ a ].alarmUserAckRequired )
+            // // If user acknowledged alarm w/ clear only property, just clear that alarm
+            if ( TRUE == ALARM_TABLE[ a ].alarmClearOnly )
             {
                 clearAlarm( a );
             }
@@ -1091,8 +1091,8 @@
         noRinseback = TRUE;
     }
 
-    // If top alarm requires user ack or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags
-    if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmUserAckRequired ) ||
+    // If top alarm has clear only property or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags
+    if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmClearOnly ) ||
          ( ( FALSE == alarmStatus.noClear ) && ( noResume ) && ( noRinseback ) && ( noEndTreatment ) &&
            ( FALSE == alarmStatus.topAlarmConditionDetected ) ) )
     {
@@ -1116,7 +1116,7 @@
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
     alarmStatus.noNewTreatment |= noNewTreatment;
-    alarmStatus.usrACKRequired = usrAckReq;
+    alarmStatus.ok = usrAckReq;
     alarmStatus.noMinimize = noMinimize;
 }
 
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e)
@@ -73,7 +73,7 @@
     BOOL                noEndTreatment;                             ///< Ending the treatment is not an option at this time
     BOOL                noNewTreatment;                             ///< No new treatments may be started even if current treatment is ended
     BOOL                noDialRecirc;                               ///< No dialysate re-circulation allowed at this time
-    BOOL                usrACKRequired;                             ///< The user must acknowledge top alarm
+    BOOL                ok;                                         ///< The user must acknowledge top alarm
     BOOL                noMinimize;                                 ///< Prevent user from minimizing the alarm window
     BOOL                lampOn;                                     ///< The alarm lamp is on
 } COMP_ALARM_STATUS_T;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -raacf1e3077a81ea0e446bdbf988a3745e0cac305 -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision aacf1e3077a81ea0e446bdbf988a3745e0cac305)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e)
@@ -1804,7 +1804,7 @@
     payload.alarmsFlags |= ( almStatus.noRinseback                  ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK)       : 0 );
     payload.alarmsFlags |= ( almStatus.noEndTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT)   : 0 );
     payload.alarmsFlags |= ( almStatus.noNewTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT)   : 0 );
-    payload.alarmsFlags |= ( almStatus.usrACKRequired               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK)      : 0 );
+    payload.alarmsFlags |= ( almStatus.ok                           ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK)      : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsToEscalate             ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
     payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );