Index: dialin/dg/fluid_leak.py
===================================================================
diff -u -r11fe6dbcaf6a4667376b199a0be4e37518256771 -rba6d26ee1006f3fd215a5c11a078b20006a489d4
--- dialin/dg/fluid_leak.py	(.../fluid_leak.py)	(revision 11fe6dbcaf6a4667376b199a0be4e37518256771)
+++ dialin/dg/fluid_leak.py	(.../fluid_leak.py)	(revision ba6d26ee1006f3fd215a5c11a078b20006a489d4)
@@ -15,7 +15,7 @@
 ############################################################################
 import struct
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
-from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgIdsDialin
 from .constants import RESET, NO_RESET
 from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
@@ -90,7 +90,7 @@
         payload = rst + det
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_DETECTOR_STATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override fluid leak detector state value")
@@ -123,7 +123,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_BROADCAST_INTERVAL_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override HD fluid leak state broadcast interval")
Index: dialin/hd/fluid_leak.py
===================================================================
diff -u -r11fe6dbcaf6a4667376b199a0be4e37518256771 -rba6d26ee1006f3fd215a5c11a078b20006a489d4
--- dialin/hd/fluid_leak.py	(.../fluid_leak.py)	(revision 11fe6dbcaf6a4667376b199a0be4e37518256771)
+++ dialin/hd/fluid_leak.py	(.../fluid_leak.py)	(revision ba6d26ee1006f3fd215a5c11a078b20006a489d4)
@@ -90,7 +90,7 @@
         payload = rst + det
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_DETECTOR_STATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override fluid leak detector state value")
@@ -123,7 +123,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_BROADCAST_INTERVAL_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override HD fluid leak state broadcast interval")
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 -rba6d26ee1006f3fd215a5c11a078b20006a489d4
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision ba6d26ee1006f3fd215a5c11a078b20006a489d4)
@@ -61,7 +61,7 @@
             channel_id = DenaliChannels.ui_to_hd_ch_id
             self.can_interface.register_receiving_publication_function(channel_id,
                                                                        MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value,
-                                                                       self._handler_ui_start_treatment)
+                                                                       self._handler_ui_initiate_treatment)
             self.can_interface.register_receiving_publication_function(channel_id,
                                                                        MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value,
                                                                        self._handler_ui_pre_treatment_uf_request)
@@ -273,7 +273,7 @@
 
         self.cmd_send_uf_treatment_response(1, 0, uf_volume)
 
-    def _handler_ui_start_treatment(self, message):
+    def _handler_ui_initiate_treatment(self, message):
         """
         Handler function to start a treatment
 
@@ -296,9 +296,9 @@
             self.logger.debug("Starting treatment")
             self.cmd_send_hd_operation_mode(HDOpModes.MODE_TREA.value)
 
-        self.cmd_send_start_treatment_response(YES, 0)
+        self.cmd_initiate_treatment_response(YES, 0)
 
-    def cmd_send_start_treatment_response(self, response, reason):
+    def cmd_initiate_treatment_response(self, response, reason):
         """
         Sends a start treatment response message
 
@@ -311,7 +311,7 @@
         payload += integer_to_bytearray(reason)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=MsgIds.MSG_ID_UI_INITIATE_TREATMENT_RESPONSE.value,
+                                              message_id=MsgIds.MSG_ID_HD_INITIATE_TREATMENT_RESPONSE.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)