Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r08aa1ee4a1cc79526979153fa4759e1df3892203 -red962b050e6b9714318a0b9034742efc2ccb9e4f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 08aa1ee4a1cc79526979153fa4759e1df3892203)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ed962b050e6b9714318a0b9034742efc2ccb9e4f)
@@ -62,41 +62,6 @@
 /// Multiplier to conver flow (mL/min) into volume (mL) for period of general task interval.
 static const F32 SELF_TEST_FLOW_INTEGRATOR = ( ( 1.0 * TASK_GENERAL_INTERVAL ) / ( SEC_PER_MIN * MS_PER_SECOND ) );
 
-/// No cartridge self-tests state machine.
-typedef enum No_Cart_Self_Tests_State
-{
-    NO_CART_SELF_TESTS_START_STATE = 0,                     ///< No cartridge self-tests starting state.
-    NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,           ///< Wait for door to be closed before running self-tests.
-    NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE,             ///< No cartridge occlusion sensors self-test state.
-    NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE,             ///< No cartridge blood flow meter self-test state.
-    NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE,         ///< No cartridge dialysate flow meter self-test state.
-    NO_CART_SELF_TESTS_PUMPS_STATE,                         ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state.
-    NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE,                ///< No cartridge leak detectors self-test state.
-    NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE,             ///< No cartridge board temperature self-test state.
-    NO_CART_SELF_TESTS_DOOR_SWITCH_STATE,                   ///< No cartridge door switch self-test state.
-    NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE,         ///< No cartridge home valves and pumps self-test state.
-    NO_CART_SELF_TESTS_HOME_IDLE_STATE,                     ///< Wait for valves and pumps finish homing state.
-    NO_CART_SELF_TESTS_STOPPED_STATE,                       ///< No cart self-test stopped state.
-    NO_CART_SELF_TESTS_COMPLETE_STATE,                      ///< No cartridge self-test complete state.
-    NUM_OF_NO_CART_SELF_TESTS_STATES                        ///< Number of no cartridge self-tests states.
-} NO_CART_SELF_TESTS_STATE_T;
-
-/// Dry self-tests state machine.
-typedef enum Dry_Self_Tests_State
-{
-    DRY_SELF_TESTS_START_STATE = 0,                         ///< Dry self-tests starting state.
-    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,               ///< Wait for door to close before executing self-tests.
-    DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE,                   ///< Bubble detectors dry self-test state.
-    DRY_SELF_TESTS_AIR_TRAP_STATE,                          ///< Air trap fill level ultrasonic sensor dry self-test state.
-    DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE,                 ///< Occlusion sensors dry self-test state.
-    DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE,            ///< Pressure sensors dry self-test setup valves and pump state.
-    DRY_SELF_TESTS_PRESSURE_SENSORS_STATE,                  ///< Pressure sensors verify pressure readings state.
-    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE,           ///< Preassure sensors verify normal pressure readings state.
-    DRY_SELF_TESTS_STOPPED_STATE,                           ///< Dry self-test stopped state.
-    DRY_SELF_TESTS_COMPLETE_STATE,                          ///< Dry self-test complete state.
-    NUM_OF_DRY_SELF_TESTS_STATES                            ///< Number of dry self-tests states.
-} DRY_SELF_TESTS_STATE_T;
-
 /// Wet self-tests state machine.
 typedef enum Wet_Self_Tests_State
 {
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -red3e4d4180a4c0f08af285426c247aadfc685847 -red962b050e6b9714318a0b9034742efc2ccb9e4f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ed3e4d4180a4c0f08af285426c247aadfc685847)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ed962b050e6b9714318a0b9034742efc2ccb9e4f)
@@ -618,7 +618,7 @@
  *************************************************************************/
 BOOL sendStartPrimeCmdResponse( BOOL accepted, U32 reason )
 {
-    return sendUIResponseMsg( MSG_ID_HD_START_PRIME_REQUEST_RESPONSE, accepted, reason );
+    return sendUIResponseMsg( MSG_ID_HD_START_PRIME_RESPONSE, accepted, reason );
 }
 
 /*********************************************************************//**
@@ -652,7 +652,7 @@
  *************************************************************************/
 BOOL sendContinueToTreatmentCmdResponse( BOOL accepted, U32 reason )
 {
-    return sendUIResponseMsg( MSG_ID_HD_CONTINUE_TO_TREATMENT_REQUEST_RESPONSE, accepted, reason );
+    return sendUIResponseMsg( MSG_ID_HD_CONTINUE_TO_TREATMENT_RESPONSE, accepted, reason );
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -red3e4d4180a4c0f08af285426c247aadfc685847 -red962b050e6b9714318a0b9034742efc2ccb9e4f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ed3e4d4180a4c0f08af285426c247aadfc685847)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ed962b050e6b9714318a0b9034742efc2ccb9e4f)
@@ -173,13 +173,13 @@
 // MSG_ID_UI_START_PRIME_REQUEST
 void handleStartPrimeCmd( MESSAGE_T *message );
 
-// MSG_ID_HD_START_PRIME_REQUEST_RESPONSE
+// MSG_ID_HD_START_PRIME_RESPONSE
 BOOL sendStartPrimeCmdResponse( BOOL accepted, U32 reason );
 
 // MSG_ID_UI_CONTINUE_TO_TREATMENT_REQUEST
 void handleContinueToTreatmentCmd( MESSAGE_T *message );
 
-// MSG_ID_HD_CONTINUE_TO_TREATMENT_REQUEST_RESPONSE
+// MSG_ID_HD_CONTINUE_TO_TREATMENT_RESPONSE
 BOOL sendContinueToTreatmentCmdResponse( BOOL accepted, U32 reason );
 
 // MSG_ID_UI_PATIENT_CONNECTION_CONFIRM