Index: dialin/common/msg_defs.py
===================================================================
diff -u -rf4ac9d2d75508ce99de083ec0aa32b057aab3a38 -r4fc17d66100edef4aa6a18ae93ae5b45a75213e6
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision f4ac9d2d75508ce99de083ec0aa32b057aab3a38)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 4fc17d66100edef4aa6a18ae93ae5b45a75213e6)
@@ -74,8 +74,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_UI_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
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -r77f757df822e74058abe3e146f6a8d4c3678e049 -r4fc17d66100edef4aa6a18ae93ae5b45a75213e6
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 77f757df822e74058abe3e146f6a8d4c3678e049)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 4fc17d66100edef4aa6a18ae93ae5b45a75213e6)
@@ -1383,7 +1383,7 @@
         cmd = integer_to_bytearray(cmnd)
         payload = cmd
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_UI_START_TREATMENT.value,
+                                              message_id=MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Sending start treatment command request.")
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r641f6cb4d7b26d132ab353b279a421f8603a354c -r4fc17d66100edef4aa6a18ae93ae5b45a75213e6
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 641f6cb4d7b26d132ab353b279a421f8603a354c)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 4fc17d66100edef4aa6a18ae93ae5b45a75213e6)
@@ -218,7 +218,7 @@
         if self.can_interface is not None:
             channel_id = DenaliChannels.ui_to_hd_ch_id
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_UI_START_TREATMENT.value,
+                                                                       MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value,
                                                                        self._handler_ui_start_treatment)
             self.can_interface.register_receiving_publication_function(channel_id,
                                                                        MsgIds.MSG_ID_UI_PRE_TREATMENT_UF_REQUEST.value,
@@ -487,7 +487,7 @@
         payload += integer_to_bytearray(reason)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE.value,
+                                              message_id=MsgIds.MSG_ID_UI_INITIATE_TREATMENT_RESPONSE.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)