Index: simulator/plugins/ultrafiltration/loader.py
===================================================================
diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -r310f51a5ed4921f184572f90d07b350ec41c0bae
--- simulator/plugins/ultrafiltration/loader.py	(.../loader.py)	(revision 9206e36aeff354823f2c37103d79f548221cd64c)
+++ simulator/plugins/ultrafiltration/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, EResponse
+from dialin.ui import HDSimulator, TXStates, EResponse
 
 
 class Loader(DynamicLoader):
@@ -79,8 +78,8 @@
         the slot for accept ultrafiltration pause button
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Accepted, 0, txStates.UF_PAUSED_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Accepted, 0, TXStates.UF_PAUSED_STATE)
         self.lblUfPauseAction.setText('Accepted ')
 
     @Slot()
@@ -90,8 +89,8 @@
         :return: none
         """
         reason = self.spnUfPauseRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Rejected, reason, txStates.UF_RUNNING_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Rejected, reason, TXStates.UF_RUNNING_STATE)
         self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -100,8 +99,8 @@
         the slot for accept ultrafiltration resume accept
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Accepted, 0, txStates.UF_RUNNING_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Accepted, 0, TXStates.UF_RUNNING_STATE)
         self.lblUfResumeAction.setText('Accepted ')
 
     @Slot()
@@ -111,8 +110,8 @@
         :return: none
         """
         reason = self.spnUfResumeRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Rejected, reason, txStates.UF_PAUSED_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Rejected, reason, TXStates.UF_PAUSED_STATE)
         self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -121,7 +120,7 @@
         the slot for accept ultrafiltration next button
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(
             EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Accepted ')
 
@@ -132,7 +131,7 @@
         :return: none
         """
         reason = self.spnUfEditRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(
             EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Rejected ' + "{}".format(reason))
 
@@ -142,5 +141,5 @@
         sends the ultrafiltration delivered volume message
         :return: none
         """
-        denaliMessages.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)
+        self.hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)