Index: tst_Treatment_Adjustment_BloodDialysate/test.py
===================================================================
diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_Treatment_Adjustment_BloodDialysate/test.py	(.../test.py)	(revision cea779e4d5eb422603a9194f6b9a01ec7e268612)
+++ tst_Treatment_Adjustment_BloodDialysate/test.py	(.../test.py)	(revision 867655840cada2d79fa5028c8fab68516ea59673)
@@ -35,13 +35,13 @@
     gotoScreenNtest_Contains_FlowsSection()
     utils.waitForGUI(1)
     
-    HDSimulator.setTreatmentBloodFlowRate(175, 0, 0, 0, 0, 0, 0)
-    HDSimulator.setTreatmentDialysateFlowRate(250, 1, 1, 1, 1, 1, 1)
+    HDSimulator.cmd_set_treatment_blood_flow_rate(175, 0, 0, 0, 0, 0, 0)
+    HDSimulator.cmd_set_treatment_dialysate_flow_rate(250, 1, 1, 1, 1, 1, 1)
 
     gotoScreenNTest_Adjustment()
     utils.waitForGUI(1)
     
-    HDSimulator.setTreatmentParamRanges(0, 0, 0, 0, 150, 550)
+    HDSimulator.cmd_set_treatment_parameter_ranges(0, 0, 0, 0, 150, 550)
     HDSimulator.send_acknowledge_UI()
 
     mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton)
@@ -60,9 +60,9 @@
     HDSimulator.waitForMessageToBeSent()
     HDSimulator.send_acknowledge_HD()
     
-    HDSimulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage
-    HDSimulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 125, 150) # coverage
-    HDSimulator.sendTreatmentAdjustBloodDialysateResponse(0, 3, 175, 250)
+    HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage
+    HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 125, 150) # coverage
+    HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(0, 3, 175, 250)
     utils.waitForGUI(2)
     
     mouseClick(waitForObject(names.o_bloodFlowSlider_Slider), 190, 4, Qt.LeftButton)
@@ -71,12 +71,12 @@
     test.compare(waitForObjectExists(names.o_bloodFlowSlider_Slider).value, 225)
     test.compare(waitForObjectExists(names.o_dialysateFlowSlider_Slider).value, 200)
     
-    HDSimulator.sendTreatmentAdjustBloodDialysateResponse(1, 0,
-                                                           waitForObjectExists(names.o_bloodFlowSlider_Slider).value,
-                                                           waitForObjectExists(names.o_dialysateFlowSlider_Slider).value
-                                                           )
-    HDSimulator.setTreatmentBloodFlowRate(225, 1, 1, 1, 1, 1, 1)
-    HDSimulator.setTreatmentDialysateFlowRate(200, 0, 0, 0, 0, 0, 0)
+    HDSimulator.cmd_send_treatment_adjust_blood_dialysate_response(1, 0,
+                                                                   waitForObjectExists(names.o_bloodFlowSlider_Slider).value,
+                                                                   waitForObjectExists(names.o_dialysateFlowSlider_Slider).value
+                                                                   )
+    HDSimulator.cmd_set_treatment_blood_flow_rate(225, 1, 1, 1, 1, 1, 1)
+    HDSimulator.cmd_set_treatment_dialysate_flow_rate(200, 0, 0, 0, 0, 0, 0)
     
     test.compare(str(waitForObjectExists(names.o_treatmentStart_225_Text).text), "225")
     test.compare(str(waitForObjectExists(names.o_treatmentStart_200_Text).text), "200")