Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r96006d22aa13f0287e2697a7cac7604201633263 -r5e0cad779f1af6c6fc4d1bfa85d07b50bf4d29cc
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 96006d22aa13f0287e2697a7cac7604201633263)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 5e0cad779f1af6c6fc4d1bfa85d07b50bf4d29cc)
@@ -207,7 +207,7 @@
                                                                        MsgIds.MSG_ID_UI_START_TREATMENT.value,
                                                                        self._handler_ui_start_treatment)
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_UI_PRE_TREATMENT_UF_REQUEST.value,
+                                                                       MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value,
                                                                        self._handler_ui_pre_treatment_uf_request)
             self.can_interface.register_receiving_publication_function(channel_id,
                                                                        MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value,
@@ -463,7 +463,7 @@
         payload += float_to_bytearray(volume)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_PRE_TREATMENT_UF_RESPONSE.value,
+                                              message_id=MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -1499,7 +1499,7 @@
         payload = float_to_bytearray(vCumulative)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_HEPARIN_DATA.value,
+                                              message_id=MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)