Index: TDDefs.h
===================================================================
diff -u -r88fc3de16df381af2aea7981fc542703843f4e06 -r251b2ada855cfe3f0295770def0acbb8c7bea069
--- TDDefs.h	(.../TDDefs.h)	(revision 88fc3de16df381af2aea7981fc542703843f4e06)
+++ TDDefs.h	(.../TDDefs.h)	(revision 251b2ada855cfe3f0295770def0acbb8c7bea069)
@@ -226,14 +226,13 @@
     DRY_SELF_TESTS_TUBING_SET_LOADED_CHECK_STATE,              ///< Tube set loaded check state
     DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE,            ///< Tube set authentication state
     DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE,         ///< Pressure sensor normal setup state
-    DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE,                ///< Pressure venous setup state
-    DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE,        ///< Venous pressure stabilization state
-    DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE,           ///< Venous pressure leak check state
-    DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE,               ///< Venous pressure relief state
-    DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE,              ///< Pressure arterial setup state
-    DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE,      ///< Arterial pressure stabilization state
-    DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE,         ///< Arterial pressure leak check state
-    DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE,             ///< Arterial pressure relief state
+    DRY_SELF_TESTS_NEG_ART_POS_VEN_PRESSURE_SETUP_STATE,       ///< Pressure venous setup state
+    DRY_SELF_TESTS_NEG_ART_POS_VEN_STABILIZATION_STATE,        ///< Venous pressure stabilization state
+    DRY_SELF_TESTS_NEG_ART_POS_VEN_DECAY_CHECK_STATE,          ///< Venous pressure leak check state
+    DRY_SELF_TESTS_POS_ART_PRESSURE_SETUP_STATE,               ///< Venous pressure relief state
+    DRY_SELF_TESTS_POS_ART_STABILIZATION_STATE,                ///< Pressure arterial setup state
+    DRY_SELF_TESTS_POS_ART_DECAY_CHECK_STATE,                  ///< Arterial pressure stabilization state
+    DRY_SELF_TESTS_PRESSURE_RELIEF_STATE,                      ///< Arterial pressure relief state
     DRY_SELF_TESTS_COMPLETE_STATE,                             ///< Complete state
     DRY_SELF_TESTS_STOPPED_STATE,                              ///< Stopped state
     NUM_OF_DRY_SELF_TESTS_STATES                               ///< Number of dry self-tests states