Index: simulator/plugins/pretreatmentstates/interface.ui
===================================================================
diff -u -r68ba5188e33d6f05936fb77626822f416b9abb37 -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
+++ simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -71,7 +71,7 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-479</y>
+        <y>0</y>
         <width>650</width>
         <height>1515</height>
        </rect>
@@ -784,12 +784,12 @@
          </item>
          <item row="8" column="0">
           <property name="text">
-           <string>NO_CART_SELF_TESTS_DOOR_SWITCH_STATE</string>
+           <string>NO_CART_SELF_TESTS_START_HOMING_STATE</string>
           </property>
          </item>
          <item row="8" column="1">
           <property name="text">
-           <string>No cartridge door switch self-test state.</string>
+           <string>No cartridge start home valves and pumps state.</string>
           </property>
          </item>
          <item row="9" column="0">
@@ -1016,11 +1016,6 @@
            <string>8</string>
           </property>
          </row>
-         <row>
-          <property name="text">
-           <string>9</string>
-          </property>
-         </row>
          <column>
           <property name="text">
            <string>HD_Pre_Treatment_Dry_Self_Tests_States</string>
@@ -1053,81 +1048,71 @@
          </item>
          <item row="2" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE</string>
+           <string>DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE</string>
           </property>
          </item>
          <item row="2" column="1">
           <property name="text">
-           <string>Bubble detectors dry self-test state.</string>
+           <string>Used cartridge self-test state.</string>
           </property>
          </item>
          <item row="3" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_AIR_TRAP_STATE</string>
+           <string>DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE</string>
           </property>
          </item>
          <item row="3" column="1">
           <property name="text">
-           <string>Air trap fill level ultrasonic sensor dry self-test state.</string>
+           <string>Occlusion sensors dry self-test state.</string>
           </property>
          </item>
          <item row="4" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE</string>
+           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE</string>
           </property>
          </item>
          <item row="4" column="1">
           <property name="text">
-           <string>Occlusion sensors dry self-test state.</string>
+           <string>Pressure sensors dry self-test setup valves and pump state.</string>
           </property>
          </item>
          <item row="5" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE</string>
+           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_STATE</string>
           </property>
          </item>
          <item row="5" column="1">
           <property name="text">
-           <string>Pressure sensors dry self-test setup valves and pump state.</string>
+           <string>Pressure sensors verify pressure readings state.</string>
           </property>
          </item>
          <item row="6" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_STATE</string>
+           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE</string>
           </property>
          </item>
          <item row="6" column="1">
           <property name="text">
-           <string>Pressure sensors verify pressure readings state.</string>
+           <string>Preassure sensors verify normal pressure readings state.</string>
           </property>
          </item>
          <item row="7" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE</string>
+           <string>DRY_SELF_TESTS_STOPPED_STATE</string>
           </property>
          </item>
          <item row="7" column="1">
           <property name="text">
-           <string>Preassure sensors verify normal pressure readings state.</string>
+           <string>Dry self-test stopped state.</string>
           </property>
          </item>
          <item row="8" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_STOPPED_STATE</string>
+           <string>DRY_SELF_TESTS_COMPLETE_STATE</string>
           </property>
          </item>
          <item row="8" column="1">
           <property name="text">
-           <string>Dry self-test stopped state.</string>
-          </property>
-         </item>
-         <item row="9" column="0">
-          <property name="text">
-           <string>DRY_SELF_TESTS_COMPLETE_STATE</string>
-          </property>
-         </item>
-         <item row="9" column="1">
-          <property name="text">
            <string>Dry self-test complete state.</string>
           </property>
          </item>