Index: MsgDefs.h
===================================================================
diff -u -r0bbbf45fed1ea9c21069f348c9540d385a89709b -rba259a85f9f9b80eae4fec4882a3f769416c942f
--- MsgDefs.h	(.../MsgDefs.h)	(revision 0bbbf45fed1ea9c21069f348c9540d385a89709b)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision ba259a85f9f9b80eae4fec4882a3f769416c942f)
@@ -114,8 +114,8 @@
     MSG_ID_DD_SERIAL_RESPONSE = 0x52,                                               ///< DD response to UI serial request
     MSG_ID_TD_TEMPERATURE_DATA = 0x53,                                              ///< TD Temperature broadcast data
     MSG_ID_TD_BATTERY_DATA = 0x54,                                                  ///< TD Battery broadcast data
-    MSG_ID_UI_ADJUST_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0x55,                     ///< UI adjust patient disconnect confirm request
-    MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0x56,                    ///< TD adjust patient disconnect confirm response
+    MSG_ID_UI_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0x55,                            ///< UI requests patient disconnect confirmation.
+    MSG_ID_TD_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0x56,                           ///< TD response to patient disconnect confirmation request.
     MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57,                                        ///< FP Concentrate Flush broadcast data
     MSG_ID_FP_GENP_DEF_DATA = 0x58,                                                 ///< FP Generate Permeate Defeatured broadcast data
     MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,                                              ///< FP Pre Generate Permeate Defeatured broadcast data
@@ -210,8 +210,8 @@
     MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2,                                  ///< TD response to pause/resume Heparin delivery request
     MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3,                                   ///< FFU signal TD update is available.
     MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4,                                   ///< FFU signal DD update is available.
-    MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5,                                       ///< TD request UI cancel.
-    MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6,                                  ///< UI confirmation result response
+    MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5,                               ///< TD request for generic UI confirmation.
+    MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6,                          ///< UI generic confirmation result to TD.
     MSG_ID_AVAILABLE_B7 = 0xB7,                                                     ///< Msg ID not used - available for use.
     MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8,                                     ///< UI vitals adjustment request
     MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE  = 0xB9,                                   ///< TD vitals adjustment response