Index: TDDefs.h
===================================================================
diff -u -rbf926947342bad2327352d878c681401a6b2d994 -r915593ccc439f4a7fb999879297d8d8c5bb0b3d2
--- TDDefs.h	(.../TDDefs.h)	(revision bf926947342bad2327352d878c681401a6b2d994)
+++ TDDefs.h	(.../TDDefs.h)	(revision 915593ccc439f4a7fb999879297d8d8c5bb0b3d2)
@@ -66,6 +66,7 @@
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test state
     POST_STATE_UI_POST,                                 ///< Check whether UI passed its POST tests
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
+    POST_STATE_EJECTOR_HOMING,                          ///< Run ejector homing POST state
     POST_STATE_FPGA,                                    ///< Run FPGA test state
     POST_STATE_COMPLETED,                               ///< POST self-tests completed state
     POST_STATE_FAILED,                                  ///< POST self-tests failed state
@@ -122,7 +123,7 @@
     TD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0,                                ///< Water sample state
     TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,                            ///< Consumable self-tests state
     TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< No cartridge self-tests state
-    TD_PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
+    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE,                              ///< Consumable and cartridge installation state
     TD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self-tests when the cartridge is dry state
     TD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime blood and dialysate circuits and run wet self-tests state
     TD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
@@ -347,8 +348,8 @@
 /// Enumeration of post-treatment mode states.
 enum TD_Post_Treatment_Mode_States
 {
-    TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0,                       ///< Drain reservoirs state
-    TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE,                      ///< Patient disconnection state
+    TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0,                  ///< Patient disconnection state
+    TD_POST_TREATMENT_AUTO_EJECT_STATE,
     TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE,                         ///< Disposable removal state
     TD_POST_TREATMENT_VERIFY_STATE,                                     ///< Verify cartridge removed, syringe removed, and reservoirs drained state
     NUM_OF_TD_POST_TREATMENT_STATES                                     ///< Number of post-treatment mode states