Index: dialin/protocols/CAN.py
===================================================================
diff -u -ra7d070474341dfa2f6012fc0acb000e14f413979 -ref9b75f5db31f12a46fe9b509385fbd222cd2bf4
--- dialin/protocols/CAN.py	(.../CAN.py)	(revision a7d070474341dfa2f6012fc0acb000e14f413979)
+++ dialin/protocols/CAN.py	(.../CAN.py)	(revision ef9b75f5db31f12a46fe9b509385fbd222cd2bf4)
@@ -275,7 +275,7 @@
                 DenaliChannels.hd_sync_broadcast_ch_id  : None,
                 DenaliChannels.dg_to_ui_ch_id           : DenaliChannels.dialin_to_dg_ch_id,
                 DenaliChannels.dg_sync_broadcast_ch_id  : None,
-                DenaliChannels.ui_to_hd_ch_id           : DenaliChannels.dialin_to_ui_ch_id,
+                DenaliChannels.ui_to_hd_ch_id           : DenaliChannels.hd_to_ui_ch_id,
                 DenaliChannels.ui_sync_broadcast_ch_id  : None,
                 DenaliChannels.hd_to_dialin_ch_id       : DenaliChannels.dialin_to_hd_ch_id,
                 DenaliChannels.dg_to_dialin_ch_id       : DenaliChannels.dialin_to_dg_ch_id,
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r15f670595abe0e0a8fcbb340cc237c09bc64cb1e -ref9b75f5db31f12a46fe9b509385fbd222cd2bf4
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 15f670595abe0e0a8fcbb340cc237c09bc64cb1e)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision ef9b75f5db31f12a46fe9b509385fbd222cd2bf4)
@@ -177,7 +177,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,
@@ -433,7 +433,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)
@@ -1415,7 +1415,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)
Index: dialin/ui/hd_simulator_alarms.py
===================================================================
diff -u -r88b7bc481ed3ee3759eaf6d008f921db5aa84230 -ref9b75f5db31f12a46fe9b509385fbd222cd2bf4
--- dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision 88b7bc481ed3ee3759eaf6d008f921db5aa84230)
+++ dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision ef9b75f5db31f12a46fe9b509385fbd222cd2bf4)
@@ -252,7 +252,7 @@
         @return: None
         """
 
-        state = integer_to_bytearray(AlarmList.ALARM_ID_NO_ALARM.value)
+        state = integer_to_bytearray(0)
         top = integer_to_bytearray(0)
         escalates_in = integer_to_bytearray(0)
         silence_expires = integer_to_bytearray(0)