Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r53ad62b20a323d405916edafb195fdcf64164f7a -raa0c52b98e8e58798eb98d7546e7cffd9af9af09
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 53ad62b20a323d405916edafb195fdcf64164f7a)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision aa0c52b98e8e58798eb98d7546e7cffd9af9af09)
@@ -325,9 +325,9 @@
 class TDPreTreaDrySelfTestStates(DialinEnum):
     DRY_SELF_TESTS_START_STATE                              = 0         # Dry self-tests starting state
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE                = 1         # Wait for door to close before executing self-tests
-    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE               = 2         # Used cartridge check dry self-test state
-    DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE             = 3         # Cartridge loaded check dry self-test state
-    DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE            = 4         # Tube set authentication state
+    DRY_SELF_TESTS_USED_TUBING_CHECK_STATE                  = 2         # Used cartridge check dry self-test state
+    DRY_SELF_TESTS_TUBING_LOADED_CHECK_STATE                = 3         # Cartridge loaded check dry self-test state
+    DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE          = 4         # Tube set authentication state
     DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                  = 5         # Syringe pump seek state
     DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE      = 6         # Pressure sensor normal setup state
     DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE              = 7         # Venous pressure sensor dry self-test setup valves and pump state
@@ -348,9 +348,9 @@
     # Official Name :       Accepted strings
     'DRY_SELF_TESTS_START_STATE': ['start'],
     'DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE': ['wait for front door to close', 'wait for door close'],
-    'DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE': ['used cartridge check'],
-    'DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE': ['cartridge loaded check'],
-    'DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE': ['tube set authentication', 'tube authentication'],
+    'DRY_SELF_TESTS_USED_TUBING_CHECK_STATE': ['used cartridge check'],
+    'DRY_SELF_TESTS_TUBING_LOADED_CHECK_STATE': ['cartridge loaded check'],
+    'DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE': ['tube set authentication', 'tube authentication'],
     'DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE': ['srynge pump seek', 'pump seek'],
     'DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE': ['pressure sensors normal setup'],
     'DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE': ['pressure venous setup', 'venous setup'],