Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -rf884f35638cad1f29601c1418e942185c5f1489b
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f884f35638cad1f29601c1418e942185c5f1489b)
@@ -200,7 +200,7 @@
     alarmStatus.noRinseback = FALSE;
     alarmStatus.noEndTreatment = FALSE;
     alarmStatus.noDialRecirc = FALSE;
-    alarmStatus.usrACKRequired = FALSE;
+    alarmStatus.ok = FALSE;
 
     alarmAudioTestToneRequested = FALSE;
     alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START;
@@ -488,8 +488,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 );
             }
@@ -1073,8 +1073,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 ) ) )
     {
@@ -1097,7 +1097,7 @@
     alarmStatus.noResume = noResume;
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
-    alarmStatus.usrACKRequired = usrAckReq;
+    alarmStatus.ok = usrAckReq;
     alarmStatus.noMinimize = noMinimize;
 }
 
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r8948f660dc5440db9e6cb7705457ed71d2b13248 -rf884f35638cad1f29601c1418e942185c5f1489b
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 8948f660dc5440db9e6cb7705457ed71d2b13248)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision f884f35638cad1f29601c1418e942185c5f1489b)
@@ -72,7 +72,7 @@
     BOOL                noRinseback;                                ///< Rinseback may not be initiated at this time
     BOOL                noEndTreatment;                             ///< Ending the treatment is not an option at this time
     BOOL                noDialRecirc;                               ///< No dialysate re-circulation allowed at this time
-    BOOL                usrACKRequired;                             ///< The user must acknowledge top alarm
+    BOOL                ok;                                         ///< Display OK button instead of other options
     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 -r36923cf573ee2ae49ddaaf001068934c6bf88c6c -rf884f35638cad1f29601c1418e942185c5f1489b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f884f35638cad1f29601c1418e942185c5f1489b)
@@ -1806,7 +1806,7 @@
     payload.alarmsFlags |= ( almStatus.noResume                     ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME)          : 0 );
     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.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_OK_BUTTON_ONLY)     : 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 );