Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -ra1daba982e3117ce45437384e770b50cfda7b7a7 -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision a1daba982e3117ce45437384e770b50cfda7b7a7)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
@@ -96,13 +96,13 @@
     NUM_OF_DIAL_IN_PUMP_STATES                  ///< Number of dialysate inlet pump states.
 } DIAL_IN_PUMP_STATE_T;
 
-/// Enumeration of dialysate inlet self test states.
+/// Enumeration of dialysate inlet self-test states.
 typedef enum DialInFlow_Self_Test_States
 {
-    DIAL_IN_FLOW_SELF_TEST_STATE_START = 0,     ///< Start state for the dialysate inlet pump self test.
-    DIAL_IN_FLOW_TEST_STATE_IN_PROGRESS,        ///< Test in progress state for the dialysate inlet pump self test.
-    DIAL_IN_FLOW_TEST_STATE_COMPLETE,           ///< Test completed state for the dialysate inlet pump self test.
-    NUM_OF_DIAL_IN_FLOW_SELF_TEST_STATES        ///< Number of dialysate inlet pump self test states.
+    DIAL_IN_FLOW_SELF_TEST_STATE_START = 0,     ///< Start state for the dialysate inlet pump self-test.
+    DIAL_IN_FLOW_TEST_STATE_IN_PROGRESS,        ///< Test in progress state for the dialysate inlet pump self-test.
+    DIAL_IN_FLOW_TEST_STATE_COMPLETE,           ///< Test completed state for the dialysate inlet pump self-test.
+    NUM_OF_DIAL_IN_FLOW_SELF_TEST_STATES        ///< Number of dialysate inlet pump self-test states.
 } DIAL_IN_FLOW_SELF_TEST_STATE_T;
 
 // pin assignments for pump stop and direction outputs
@@ -163,8 +163,8 @@
 
 static U32 dipCurrErrorDurationCtr = 0;                                             ///< used for tracking persistence of dip current errors
 
-static DIAL_IN_FLOW_SELF_TEST_STATE_T dialInPumpSelfTestState = DIAL_IN_FLOW_SELF_TEST_STATE_START;  ///< current dialIn pump self test state
-static U32 dialInPumpSelfTestTimerCount = 0;                                        ///< timer counter for dialIn pump self test
+static DIAL_IN_FLOW_SELF_TEST_STATE_T dialInPumpSelfTestState = DIAL_IN_FLOW_SELF_TEST_STATE_START;  ///< current dialIn pump self-test state
+static U32 dialInPumpSelfTestTimerCount = 0;                                        ///< timer counter for dialIn pump self-test
 
 // ********** private function prototypes **********
 
@@ -1134,11 +1134,11 @@
 /*********************************************************************//**
  * @brief
  * The execDialInFlowTest function executes the state machine for the
- * DialInFlow self test.
+ * DialInFlow self-test.
  * @details
  * Inputs : none
  * Outputs : none
- * @return the current state of the DialInFlow self test.
+ * @return the current state of the DialInFlow self-test.
  *************************************************************************/
 SELF_TEST_STATUS_T execDialInFlowTest( void )
 {
@@ -1153,7 +1153,7 @@
             {
                 dialInFlowCalGain = cal.dialysateFlowGain;
                 dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;
-                dialInPumpSelfTestState = DIAL_IN_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self test(s)
+                dialInPumpSelfTestState = DIAL_IN_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self-test(s)
                 result = SELF_TEST_STATUS_PASSED;
             }
             break;