Index: HDDefs.h
===================================================================
diff -u -r784c5b3c6cc5870ee6178613d7574bb419f4f525 -r0403b723df256aaa8886f2f4dba7d5754b4c32da
--- HDDefs.h	(.../HDDefs.h)	(revision 784c5b3c6cc5870ee6178613d7574bb419f4f525)
+++ HDDefs.h	(.../HDDefs.h)	(revision 0403b723df256aaa8886f2f4dba7d5754b4c32da)
@@ -221,7 +221,7 @@
 {
     DRY_SELF_TESTS_START_STATE = 0,                         ///< Dry self-tests starting state
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,               ///< Wait for door to close before executing self-tests
-    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,              ///< Bubble detectors dry self-test state
+    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,              ///< Used cartridge check dry self-test state
     DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE,                 ///< Occlusion sensors dry self-test state
     DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE,            ///< Pressure sensors dry self-test setup valves and pump state
     DRY_SELF_TESTS_PRESSURE_SENSORS_STATE,                  ///< Pressure sensors verify pressure readings state
@@ -309,8 +309,7 @@
 {
     HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0,                 ///< Patient disconnection state
     HD_POST_TREATMENT_DE_PRIME_STATE,                                  ///< De-prime disposable state
-    HD_POST_TREATMENT_UNLOAD_STATE,                                    ///< Disposable removal confirmation and verify cartridge removed state
-    HD_POST_TREATMENT_VERIFY_STATE,                                    ///< Verify doors closed, syringe removed, and syringe pump is homed state
+    HD_POST_TREATMENT_VERIFY_STATE,                                    ///< Verify cartridge removed, syringe removed, and reservoirs drained state
     NUM_OF_HD_POST_TREATMENT_STATES                                    ///< Number of post-treatment mode states
 };
 typedef enum HD_Post_Treatment_Mode_States HD_POST_TREATMENT_STATE_T;  ///< Type for HD post treatment mode states enumeration
Index: MsgDefs.h
===================================================================
diff -u -r01ed3842b4ee776b8d81a3b47a9cf0063469c97c -r0403b723df256aaa8886f2f4dba7d5754b4c32da
--- MsgDefs.h	(.../MsgDefs.h)	(revision 01ed3842b4ee776b8d81a3b47a9cf0063469c97c)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 0403b723df256aaa8886f2f4dba7d5754b4c32da)
@@ -85,8 +85,8 @@
     MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35,                              ///< UI request to validate new treatment parameter set
     MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36,                     ///< HD response to new treatment parameters set
     MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37,                               ///< DG heat disinfection publish data
-    MSG_ID_UI_START_TREATMENT = 0x38,                                   ///< UI user request to initiate a treatment
-    MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39,                          ///< HD response to user request to initiate a treatment
+    MSG_ID_UI_INITIATE_TREATMENT_REQUEST = 0x38,                        ///< UI user request to initiate a treatment
+    MSG_ID_HD_INITIATE_TREATMENT_RESPONSE = 0x39,                       ///< HD response to user request to initiate a treatment
     MSG_ID_HD_VALVES_DATA = 0x3A,                                       ///< HD broadcast of valves data
     MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B,                     ///< UI user confirmation of treatment parameters
     MSG_ID_UI_START_PRIME_REQUEST = 0x3C,                               ///< UI user has requested to start priming
@@ -129,15 +129,17 @@
     MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS = 0x61,                        ///< HD broadcast of no cartridge self-tests progress
     MSG_ID_UI_INSTALLATION_CONFIRM = 0x62,                              ///< UI disposable installation user confirmation
     MSG_ID_HD_DRY_SELF_TEST_PROGRESS = 0x63,                            ///< HD broadcast of dry self-tests progress
-    MSG_ID_UI_CONTINUE_TO_TREATMENT_REQUEST = 0x64,                     ///< UI user has requested to continue to treatment
-    MSG_ID_HD_CONTINUE_TO_TREATMENT_RESPONSE = 0x65,                    ///< HD response to user request to continue to treatment
+    MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST = 0x64,                  ///< UI user has requested to begin patient connection
+    MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE = 0x65,                 ///< HD response to user request to begin patient connection
     MSG_ID_UI_PATIENT_CONNECTION_CONFIRM = 0x66,                        ///< UI user has confirmed patient connection completed
     MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE = 0x67,               ///< HD response to user confirmation of patient connection
     MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM = 0x68,                        ///< UI user has confirmed consumable install
     MSG_ID_HD_SYRINGE_PUMP_DATA = 0x69,                                 ///< HD broadcast of syringe pump data
     MSG_ID_HD_FLUID_LEAK_STATE = 0x6A,                                  ///< HD broadcast of fluid leak state
     MSG_ID_DG_FLUID_LEAK_STATE = 0x6B,                                  ///< DG broadcast of fluid leak state
     MSG_ID_HD_BLOOD_LEAK_STATE = 0x6C,                                  ///< HD broadcast of blood leak state
+    MSG_ID_UI_START_TREATMENT_REQUEST = 0x71,                           ///< UI user has requested to start treatment
+    MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72,                          ///< HD response to user request to start treatment
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
@@ -331,6 +333,7 @@
     REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29,           ///< The user has not confirmed patient connection
     REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30,     ///< Heparin cannot be paused if not currently deliverying Heparin
     REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED = 31,                      ///< Heparin cannot be resumed if not paused
+    REQUEST_REJECT_REASON_DG_COMM_LOST = 32,                            ///< Treatment cannot initiate if DG comm is lost
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;       ///< Type for settings change rejection reason codes enumeration