Index: TDDefs.h
===================================================================
diff -u -r8f4c7a14f0ed74c238c7c72a316a026e50dc3cec -r3a7dfff801e256d774db4f61f511995d8ef0233a
--- TDDefs.h	(.../TDDefs.h)	(revision 8f4c7a14f0ed74c238c7c72a316a026e50dc3cec)
+++ TDDefs.h	(.../TDDefs.h)	(revision 3a7dfff801e256d774db4f61f511995d8ef0233a)
@@ -208,8 +208,8 @@
 {
     DRY_SELF_TESTS_START_STATE = 0,                            ///< Dry self-tests start state
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,                  ///< Wait for door close state
-    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,                 ///< Used cartridge check state
-    DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE,               ///< Cartridge loaded check state
+    DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE,                  ///< Used tube set check state
+    DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE,                ///< Tube set loaded check state
     DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE,              ///< Tube set authentication state
     DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE,                    ///< Syringe pump seek state
     DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE,         ///< Pressure sensor normal setup state
@@ -221,7 +221,7 @@
     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_SYRINGE_PUMP_PRIME_STATE,                        ///< Syringe prime state
+    DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE,                   ///< Syringe prime state
     DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE,         ///< Syringe pump occlusion check state
     DRY_SELF_TESTS_COMPLETE_STATE,                             ///< Complete state
     DRY_SELF_TESTS_STOPPED_STATE,                              ///< Stopped state
@@ -720,7 +720,7 @@
     TD_EVENT_STARTUP = 0,                                               ///< TD startup event
     TD_EVENT_OP_MODE_CHANGE,                                            ///< TD Op mode change event
     TD_EVENT_SUB_MODE_CHANGE,                                           ///< TD Op sub-mode change event
-    TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,                            ///< TD dry self test cartridge result
+    TD_EVENT_DRY_SELF_TEST_TUBESET_RESULT,                              ///< TD dry self test cartridge result
     TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST,                           ///< TD tubing set barcode scan request
     TD_EVENT_TUBING_SET_BARCODE_SCAN_AUTHENTICATED,                     ///< TD tubing set barcode scan authenticated
     TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT,                             ///< TD dry self test pressure result