Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f -rf6b3070973f4211a2b3330426ffecc49055fd43a
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision f6b3070973f4211a2b3330426ffecc49055fd43a)
@@ -165,27 +165,23 @@
 # TDOpModes.MODE_PRET sub states
 @unique
 class TDPreTreatmentModesStates(DialinEnum):
-    TD_PRE_TREATMENT_WATER_SAMPLE_STATE         = 0             # Water sample state
-    TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE = 1             # Consumable self-tests state
-    TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE    = 2             # No cartridge self-tests state
-    TD_PRE_TREATMENT_CART_INSTALL_STATE         = 3             # Consumable and cartridge installation state
-    TD_PRE_TREATMENT_SELF_TEST_DRY_STATE        = 4             # Self-tests when the cartridge is dry state
-    TD_PRE_TREATMENT_PRIME_STATE                = 5             # Prime blood and dialysate circuits and run wet self-tests state
-    TD_PRE_TREATMENT_RECIRCULATE_STATE          = 6             # Re-circulate blood and dialysate circuits state
-    TD_PRE_TREATMENT_CONFIRM_RX_STATE           = 7             # User reviews and confirms prescription ( Confirm Rx )
-    TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE   = 8             # Patient connection state
-    NUM_OF_TD_PRE_TREATMENT_STATES              = 9             # Number of pre-treatment mode states
+    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE   = 0             # Tube set install state
+    TD_PRE_TREATMENT_SELF_TEST_DRY_STATE        = 1             # Self-tests when the cartridge is dry state
+    TD_PRE_TREATMENT_PRIME_STATE                = 2             # Prime blood and dialysate circuits and run wet self-tests state
+    TD_PRE_TREATMENT_RECIRCULATE_STATE          = 3             # Re-circulate blood and dialysate circuits state
+    TD_PRE_TREATMENT_CONFIRM_RX_STATE           = 4             # User reviews and confirms prescription ( Confirm Rx )
+    TD_PRE_TREATMENT_HEPARIN_SETUP_STATE        = 5             # Heparin setup state
+    TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE   = 6             # Patient connection state
+    NUM_OF_TD_PRE_TREATMENT_STATES              = 7             # Number of pre-treatment mode states
 
 TDPreTreatmentModesStates._str_list = {
     # Official Name :       Accepted strings
-    'TD_PRE_TREATMENT_WATER_SAMPLE_STATE': ['water sample'],
-    'TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE': ['self test consumable'],
-    'TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE': ['self test no cartridge'],
-    'TD_PRE_TREATMENT_CART_INSTALL_STATE': ['cartridge install'],
+    'TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE': ['tubing set install', 'cartridge install'],
     'TD_PRE_TREATMENT_SELF_TEST_DRY_STATE': ['self test dry', 'dry self test'], 
     'TD_PRE_TREATMENT_PRIME_STATE': ['prime', 'blood priming', 'priming'],
     'TD_PRE_TREATMENT_RECIRCULATE_STATE': ['recirculate'],
     'TD_PRE_TREATMENT_CONFIRM_RX_STATE': ['confirm rx', 'rx'],
+    'TD_PRE_TREATMENT_HEPARIN_SETUP_STATE': ['heparin setup'],
     'TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE': ['patient connect'],
     'NUM_OF_TD_PRE_TREATMENT_STATES': [],
 }
Index: leahi_dialin/td/proxies/ui_proxy.py
===================================================================
diff -u -r862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f -rf6b3070973f4211a2b3330426ffecc49055fd43a
--- leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f)
+++ leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision f6b3070973f4211a2b3330426ffecc49055fd43a)
@@ -575,33 +575,49 @@
                              can_interface = self.can_interface)
 
 
-    def cmd_send_ui_cartridge_install_confirm_response (self) -> None:
+    def cmd_send_ui_cartridge_install_confirm_request (self) -> None:
         """
-        Constructs and sends a UI response for confirming cartridge installation.
+        Constructs and sends a UI command for confirming cartridge installation.
 
         :return: none
         """
         cmd_generic_override(payload = None,
                              reset = None,
                              channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST,
-                             entity_name = 'UI Confirm Cartridge Installation response',
+                             entity_name = 'UI Confirm Cartridge Installation request',
                              override_text = 'N/A',
                              logger = self.logger,
                              can_interface = self.can_interface)
 
 
-    def cmd_send_ui_cartridge_removal_confirm_response (self) -> None:
+    def cmd_send_ui_cartridge_removal_confirm_request (self) -> None:
         """
-        Constructs and sends a UI response for confirming cartridge removal.
+        Constructs and sends a UI command for confirming cartridge removal.
 
         :return: none
         """
         cmd_generic_override(payload = None,
                              reset = None,
                              channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,
-                             entity_name = 'UI Confirm Cartridge Removal response',
+                             entity_name = 'UI Confirm Cartridge Removal request',
                              override_text = 'N/A',
                              logger = self.logger,
                              can_interface = self.can_interface)
+
+
+    def cmd_send_ui_patient_connect_confirm_request (self) -> None:
+        """
+        Constructs and sends a UI command for confirming patient is connected.
+
+        :return: none
+        """
+        cmd_generic_override(payload = None,
+                             reset = None,
+                             channel_id = CanChannels.ui_to_td_ch_id,
+                             msg_id = MsgIds.MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST,
+                             entity_name = 'UI Confirm Patient Connected request',
+                             override_text = 'N/A',
+                             logger = self.logger,
+                             can_interface = self.can_interface)