Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r5eda37efda2d771de4f5cfb509adf05621a290c3 -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
@@ -99,13 +99,13 @@
     NUM_OF_BLOOD_PUMP_STATES                    ///< Number of blood pump states.
 } BLOOD_PUMP_STATE_T;
 
-/// Enumeration of blood pump self test states.
+/// Enumeration of blood pump self-test states.
 typedef enum BloodFlow_Self_Test_States
 {
-    BLOOD_FLOW_SELF_TEST_STATE_START = 0,       ///< Blood pump self test start state.
-    BLOOD_FLOW_TEST_STATE_IN_PROGRESS,          ///< Blood pump self test in progress state.
-    BLOOD_FLOW_TEST_STATE_COMPLETE,             ///< Blood pump self test completed state.
-    NUM_OF_BLOOD_FLOW_SELF_TEST_STATES          ///< Number of blood pump self test states.
+    BLOOD_FLOW_SELF_TEST_STATE_START = 0,       ///< Blood pump self-test start state.
+    BLOOD_FLOW_TEST_STATE_IN_PROGRESS,          ///< Blood pump self-test in progress state.
+    BLOOD_FLOW_TEST_STATE_COMPLETE,             ///< Blood pump self-test completed state.
+    NUM_OF_BLOOD_FLOW_SELF_TEST_STATES          ///< Number of blood pump self-test states.
 } BLOOD_FLOW_SELF_TEST_STATE_T;
 
 // pin assignments for pump stop and direction outputs
@@ -166,8 +166,8 @@
 
 static U32 bpCurrErrorDurationCtr = 0;                                          ///< used for tracking persistence of bp current errors
 
-static BLOOD_FLOW_SELF_TEST_STATE_T bloodPumpSelfTestState = BLOOD_FLOW_SELF_TEST_STATE_START;  ///< current blood pump self test state
-static U32 bloodPumpSelfTestTimerCount = 0;                                     ///< timer counter for blood pump self test
+static BLOOD_FLOW_SELF_TEST_STATE_T bloodPumpSelfTestState = BLOOD_FLOW_SELF_TEST_STATE_START;  ///< current blood pump self-test state
+static U32 bloodPumpSelfTestTimerCount = 0;                                     ///< timer counter for blood pump self-test
 
 // ********** private function prototypes **********
 
@@ -1163,11 +1163,11 @@
 /*********************************************************************//**
  * @brief
  * The execBloodFlowTest function executes the state machine for the
- * BloodFlow self test.
+ * BloodFlow self-test.
  * @details
  * Inputs : none
  * Outputs : none
- * @return the current state of the BloodFlow self test.
+ * @return the current state of the BloodFlow self-test.
  *************************************************************************/
 SELF_TEST_STATUS_T execBloodFlowTest( void )
 {
@@ -1182,7 +1182,7 @@
             {
                 bloodFlowCalGain = cal.bloodFlowGain;
                 bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
-                bloodPumpSelfTestState = BLOOD_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self test(s)
+                bloodPumpSelfTestState = BLOOD_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self-test(s)
                 result = SELF_TEST_STATUS_PASSED;
             }
             break;