Index: leahi_dialin/td/proxies/ui_proxy.py
===================================================================
diff -u -r99a91733f7775005505b9f0671863392526cc1d4 -r27d9de42c0111c7f369cc335889fe6b988d09cc8
--- leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 99a91733f7775005505b9f0671863392526cc1d4)
+++ leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 27d9de42c0111c7f369cc335889fe6b988d09cc8)
@@ -21,8 +21,8 @@
 # Project imports
 from leahi_dialin.common.constants import ACCEPTED
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.msg_defs import RequestRejectReasons
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
@@ -53,7 +53,7 @@
                                                                        function = self._handler_tx_parameters_val_resp_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id,
-                                                                       message_id = MsgIds.MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.value,
+                                                                       message_id = MsgIds.MSG_ID_TD_TREATMENT_UF_VOLUME_VALIDATE_RESPONSE.value,
                                                                        function = self._handler_uf_val_resp_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id,
@@ -441,15 +441,16 @@
                              can_interface = self.can_interface)
 
 
-    def cmd_send_ui_initiate_treatment(self, modularity: int, accepted:int = ACCEPTED ) -> None:
+    def cmd_send_ui_initiate_treatment(self, modality: int=0, accepted:int = ACCEPTED ) -> None:
         """
         Constructs and sends a UI initiate treatment message.
 
-        :param accepted: (int) the acceptance value
+        :param modality: (int) The treatment modality, HD = 0, HDF = 1, HD with HDF cartridge = 2
+        :param accepted: (int) The acceptance value
         :return: none
         """
         payload = integer_to_bytearray(accepted)
-        payload += integer_to_bytearray(modularity)
+        payload += integer_to_bytearray(modality)
 
         cmd_generic_override(payload = payload,
                              reset = None,
@@ -474,7 +475,7 @@
         cmd_generic_override(payload = payload,
                              reset = None,
                              channel_id = CanChannels.ui_to_td_ch_id,
-                             msg_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,
+                             msg_id = MsgIds.MSG_ID_TD_VALIDATED_TREATMENT_PARAMS,
                              entity_name = 'UI Confirm Treatment Parameters',
                              override_text = 'N/A',
                              logger = self.logger,
@@ -516,7 +517,7 @@
         cmd_generic_override(payload = payload,
                              reset = None,
                              channel_id = CanChannels.ui_to_td_ch_id,
-                             msg_id = MsgIds.MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,
+                             msg_id = MsgIds.MSG_ID_UI_TREATMENT_UF_VOLUME_VALIDATE_REQUEST,
                              entity_name = 'Validate UI Ultrafiltration Volume',
                              override_text = 'N/A',
                              logger = self.logger,