Index: simulator/plugins/heparin/loader.py
===================================================================
diff -u -rf921975179b1c1ad61d841b9db5976c00432fdcc -r310f51a5ed4921f184572f90d07b350ec41c0bae
--- simulator/plugins/heparin/loader.py	(.../loader.py)	(revision f921975179b1c1ad61d841b9db5976c00432fdcc)
+++ simulator/plugins/heparin/loader.py	(.../loader.py)	(revision 310f51a5ed4921f184572f90d07b350ec41c0bae)
@@ -5,8 +5,7 @@
 from simulator.dynamicloader import DynamicLoader
 from PySide2 import QtWidgets
 from PySide2.QtCore import Slot
-from dialin.squish import denaliMessages
-from dialin.squish.denaliMessages import txStates
+from dialin.ui.hd_simulator import TXStates
 
 
 class Loader(DynamicLoader):
@@ -21,11 +20,11 @@
     spnRejectReason: QtWidgets.QSpinBox
     sldCumulative: QtWidgets.QSlider
 
-    requested_state: txStates
+    requested_state: TXStates
 
     def __init__(self):
         super().__init__(os.path.dirname(__file__))
-        self.requested_state = txStates.HEPARIN_STATE_PAUSED
+        self.requested_state = TXStates.HEPARIN_STATE_PAUSED
 
     def _init_loader(self):
         """
@@ -66,12 +65,12 @@
         :return: none
         """
         # toggle the requested state
-        if self.requested_state == txStates.HEPARIN_STATE_DISPENSING:
-            self.requested_state = txStates.HEPARIN_STATE_PAUSED
+        if self.requested_state == TXStates.HEPARIN_STATE_DISPENSING:
+            self.requested_state = TXStates.HEPARIN_STATE_PAUSED
         else:
-            self.requested_state = txStates.HEPARIN_STATE_DISPENSING
+            self.requested_state = TXStates.HEPARIN_STATE_DISPENSING
 
-        denaliMessages.setHeparinResponse(True, 0, self.requested_state)
+        self.hd_simulator.cmd_set_heparin_pause_resume_response(True, 0, self.requested_state)
         self.lblAction.setText('Accepted ')
 
     @Slot()
@@ -81,7 +80,7 @@
         :return: none
         """
         reason = self.spnRejectReason.value()
-        denaliMessages.setHeparinResponse(False, reason, self.requested_state)
+        self.hd_simulator.cmd_set_heparin_pause_resume_response(False, reason, self.requested_state)
         self.lblAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -92,5 +91,5 @@
         :return: none
         """
         volume = value * 0.1
-        denaliMessages.setTreatmentHeparinData(volume)
+        self.hd_simulator.cmd_set_treatment_heparin_data(volume)
         self.lblCumulative.setNum(volume)