Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r97e24856b80f612b2556fb9a599e40659710822a -r9bc5e72e777b0bf72807428e40450705b1eef321
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 97e24856b80f612b2556fb9a599e40659710822a)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9bc5e72e777b0bf72807428e40450705b1eef321)
@@ -95,11 +95,11 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT
-void handleUIStartTreatmentMsg( MESSAGE_T *message );
+// MSG_ID_UI_INITIATE_TREATMENT_REQUEST
+void handleInitiateTreatmentRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_START_TREATMENT_RESPONSE
-BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
+// MSG_ID_UI_INITIATE_TREATMENT_RESPONSE
+BOOL sendInitiateTreatmentResponseMsg( BOOL accepted, U32 reason );
 
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
@@ -215,6 +215,12 @@
 // MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE
 BOOL sendPatientConnectionConfirmCmdResponse( BOOL accepted, U32 reason );
 
+// MSG_ID_UI_START_TREATMENT_REQUEST
+void handleStartTreatmentRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_START_TREATMENT_RESPONSE
+BOOL sendStartTreatmentResponse( BOOL accepted, U32 reason );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -274,10 +280,10 @@
 BOOL broadcastDialInFlowData( DIALIN_PUMP_STATUS_PAYLOAD_T *dialInData );
 
 // MSG_ID_DIALYSATE_OUT_FLOW_DATA
-BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
+BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
 
 // MSG_ID_HD_SYRINGE_PUMP_DATA
-BOOL broadcastSyringePumpData( SYRINGE_PUMP_DATA_PAYLOAD_T data );
+BOOL broadcastSyringePumpData( SYRINGE_PUMP_DATA_PAYLOAD_T data );
 
 // MSG_ID_PRESSURE_OCCLUSION_DATA
 BOOL broadcastPresOcclData( PRESSURE_OCCLUSION_DATA_T data );
@@ -321,6 +327,12 @@
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
+// MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS
+BOOL broadcastNoCartSelfTestTime( U32 timeout, U32 countdown );
+
+// MSG_ID_HD_DRY_SELF_TEST_PROGRESS
+BOOL broadcastDrySelfTestTime( U32 timeout, U32 countdown );
+
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );