Index: simulator/plugins/salinebolus/loader.py
===================================================================
diff -u -rf921975179b1c1ad61d841b9db5976c00432fdcc -r310f51a5ed4921f184572f90d07b350ec41c0bae
--- simulator/plugins/salinebolus/loader.py	(.../loader.py)	(revision f921975179b1c1ad61d841b9db5976c00432fdcc)
+++ simulator/plugins/salinebolus/loader.py	(.../loader.py)	(revision 310f51a5ed4921f184572f90d07b350ec41c0bae)
@@ -5,10 +5,8 @@
 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 import TXStates
 
-
 class Loader(DynamicLoader):
     """
     The Saline Bolus ui loader class
@@ -23,11 +21,11 @@
     sldSalineCumulative: QtWidgets.QSlider
     sldSalineVolume: QtWidgets.QSlider
 
-    saline_requested_state: txStates
+    saline_requested_state: TXStates
 
     def __init__(self):
         super().__init__(os.path.dirname(__file__))
-        self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
 
     def _init_loader(self):
         """
@@ -72,13 +70,13 @@
         :return: none
         """
         # toggle the saline requested state
-        if self.saline_requested_state == txStates.SALINE_BOLUS_STATE_IN_PROGRESS:
-            self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        if self.saline_requested_state == TXStates.SALINE_BOLUS_STATE_IN_PROGRESS:
+            self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
         else:
-            self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS
+            self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IN_PROGRESS
 
         target = self.cmbSalineAcceptTarget.currentText()
-        denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state)
+        self.hd_simulator.cmd_set_saline_bolus_response(True, 0, target, self.saline_requested_state)
         self.lblSalineAction.setText('Accepted ' + target)
 
     @Slot()
@@ -88,7 +86,7 @@
         :return: none
         """
         reason = self.spnSalineRejectReason.value()
-        denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state)
+        self.hd_simulator.cmd_set_saline_bolus_response(False, reason, 0, self.saline_requested_state)
         self.lblSalineAction.setText('Rejected ' + "{}".format(reason))
 
 
@@ -99,6 +97,6 @@
         by calling the denaliMessage API setTreatmentSalineBolusData
         :return: none
         """
-        denaliMessages.setTreatmentSalineBolusData(self.sldSalineTarget.value(),
+        self.hd_simulator.cmd_set_treatment_saline_bolus_data(self.sldSalineTarget.value(),
                                                    self.sldSalineCumulative.value(),
                                                    self.sldSalineVolume.value())