Index: simulator/run.py
===================================================================
diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673
--- simulator/run.py	(.../run.py)	(revision cea779e4d5eb422603a9194f6b9a01ec7e268612)
+++ simulator/run.py	(.../run.py)	(revision 867655840cada2d79fa5028c8fab68516ea59673)
@@ -6,12 +6,11 @@
 # import names
 from dialin.ui import utils
 from dialin import HDSimulator
-from dialin.ui.hd_simulator import txStates, EResponse
+from dialin.ui.hd_simulator import TXStates, EResponse
 # Import PySide2 classes
 from PySide2.QtUiTools import QUiLoader
 from PySide2 import QtCore, QtWidgets
 from PySide2.QtCore import QFile, Slot
-from PySide2.QtGui import qApp
 from PySide2.QtCore import QTimer
 
 HDSimulator = HDSimulator()
@@ -164,11 +163,11 @@
     tblSalineSalineStates: QtWidgets.QTableWidget
 
     # static class variables
-    saline_requested_state: txStates
+    saline_requested_state: TXStates
 
     def __init__(self):
         super().__init__(Simulator.ui_file_name)
-        self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
         self.initialize()
 
     def setup_ranges(self):
@@ -259,13 +258,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()
-        HDSimulator.setSalineBolusResponse(True, 0, target, self.saline_requested_state)
+        HDSimulator.cmd_set_saline_bolus_response(True, 0, target, self.saline_requested_state)
         self.lblSalineAction.setText('Accepted ' + target)
 
     @Slot()
@@ -275,7 +274,7 @@
         :return: none
         """
         reason = self.spnSalineRejectReason.value()
-        HDSimulator.setSalineBolusResponse(False, reason, 0, self.saline_requested_state)
+        HDSimulator.cmd_set_saline_bolus_response(False, reason, 0, self.saline_requested_state)
         self.lblSalineAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -284,8 +283,8 @@
         the slot for accept ultrafiltration pause button
         :return: none
         """
-        HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Accepted, 0, txStates.UF_PAUSED_STATE)
+        HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Accepted, 0, TXStates.UF_PAUSED_STATE)
         self.lblUfPauseAction.setText('Accepted ')
 
     @Slot()
@@ -295,8 +294,8 @@
         :return: none
         """
         reason = self.spnUfPauseRejectReason.value()
-        HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Rejected, reason, txStates.UF_RUNNING_STATE)
+        HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Rejected, reason, TXStates.UF_RUNNING_STATE)
         self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -305,8 +304,8 @@
         the slot for accept ultrafiltration resume accept
         :return: none
         """
-        HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Accepted, 0, txStates.UF_RUNNING_STATE)
+        HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Accepted, 0, TXStates.UF_RUNNING_STATE)
         self.lblUfResumeAction.setText('Accepted ')
 
     @Slot()
@@ -316,8 +315,8 @@
         :return: none
         """
         reason = self.spnUfResumeRejectReason.value()
-        HDSimulator.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Rejected, reason, txStates.UF_PAUSED_STATE)
+        HDSimulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            EResponse.Rejected, reason, TXStates.UF_PAUSED_STATE)
         self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -326,7 +325,7 @@
         the slot for accept ultrafiltration next button
         :return: none
         """
-        HDSimulator.setTreatmentAdjustUltrafiltrationEditResponse(
+        HDSimulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(
             EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Accepted ')
 
@@ -337,7 +336,7 @@
         :return: none
         """
         reason = self.spnUfEditRejectReason.value()
-        HDSimulator.setTreatmentAdjustUltrafiltrationEditResponse(
+        HDSimulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(
             EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Rejected ' + "{}".format(reason))
 
@@ -350,34 +349,34 @@
         sub_mode = self.tblSalineSubMode.verticalHeaderItem(self.tblSalineSubMode.currentRow()).text()
         uf_state = self.tblSalineUFStates.verticalHeaderItem(self.tblSalineUFStates.currentRow()).text()
         saline = self.tblSalineSalineStates.verticalHeaderItem(self.tblSalineSalineStates.currentRow()).text()
-        HDSimulator.setTreatmentStatesData(sub_mode, uf_state, saline)
+        HDSimulator.cmd_set_treatment_states_data(sub_mode, uf_state, saline)
 
     @Slot()
     def do_saline_data(self):
         """
         the slot which is called to send the saline bolus data
-        by calling the denaliMessage API setTreatmentSalineBolusData
+        by calling the denaliMessage API cmd_set_treatment_saline_bolus_data
         :return: none
         """
-        HDSimulator.setTreatmentSalineBolusData(self.sldSalineTarget.value(),
-                                                 self.sldSalineCumulative.value(),
-                                                 self.sldSalineVolume.value())
+        HDSimulator.cmd_set_treatment_saline_bolus_data(self.sldSalineTarget.value(),
+                                                        self.sldSalineCumulative.value(),
+                                                        self.sldSalineVolume.value())
 
     @Slot()
     def do_uf_volume_data(self):
         """
         sends the ultrafiltration delivered volume message
         :return: none
         """
-        HDSimulator.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)
+        HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)
 
     @Slot()
     def do_ranges_data(self):
         """
         sends the treatment ranges message with given value on the screen
         :return: none
         """
-        HDSimulator.setTreatmentParamRanges(
+        HDSimulator.cmd_set_treatment_parameter_ranges(
             self.spnDurationMin.value(),
             self.spnDurationMax.value(),
             self.spnUFVolumeMin.value(),
@@ -406,15 +405,15 @@
     utils.tstStart(__file__)
 
     # create qt application
-    QtWidgets.QApplication(sys.argv)
+    qapp = QtWidgets.QApplication(sys.argv)
 
     simulator = Simulator()
     simulator.show()
 
     utils.tstDone()
 
     # start qt application main loop
-    sys.exit(qApp.exec_())
+    sys.exit(qapp.exec_())
 
 
 if __name__ == "__main__":