Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rb01542f8e4ef5a29e9b08fc0d465478de516bf02
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision b01542f8e4ef5a29e9b08fc0d465478de516bf02)
@@ -58,7 +58,7 @@
 /// interval (ms/task time) at which the blood pump speed is calculated (every 40 ms).
 #define DIP_SPEED_CALC_INTERVAL              ( 40 / TASK_PRIORITY_INTERVAL )
 /// number of hall sensor counts kept in buffer to hold last 1 second of count data.
-#define DIP_SPEED_CALC_BUFFER__LEN           ( 1000 / DIP_SPEED_CALC_INTERVAL / TASK_PRIORITY_INTERVAL )
+#define DIP_SPEED_CALC_BUFFER_LEN            ( 1000 / DIP_SPEED_CALC_INTERVAL / TASK_PRIORITY_INTERVAL )
 #define DIP_HALL_EDGE_COUNTS_PER_REV         48              ///< number of hall sensor edge counts per motor revolution.
 
 #define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< maximum difference between measured motor speed and speed implied by measured flow.
@@ -164,7 +164,7 @@
 static BOOL dipStopAtHomePosition = FALSE;                                          ///< stop dialysate inlet pump at next home position
 static U32 dipHomeStartTime = 0;                                                    ///< when did dialysate inlet pump home command begin? (in ms)
 
-static U16 dipLastMotorHallSensorCounts[ DIP_SPEED_CALC_BUFFER__LEN ];              ///< last hall sensor count for the blood pump motor
+static U16 dipLastMotorHallSensorCounts[ DIP_SPEED_CALC_BUFFER_LEN ];               ///< last hall sensor count for the dialysate inlet pump motor
 static U32 dipMotorSpeedCalcIdx = 0;                                                ///< index into 1 second buffer of motor speed hall sensor counts
 static U32 dipMotorSpeedCalcTimerCtr = 0;                                           ///< counter determines interval for calculating dialysate inlet pump motor speed from hall sensor count.
 
@@ -225,7 +225,7 @@
 
     // zero motor hall sensors counts buffer
     dipMotorSpeedCalcIdx = 0;
-    for ( i = 0; i < DIP_SPEED_CALC_BUFFER__LEN; i++ )
+    for ( i = 0; i < DIP_SPEED_CALC_BUFFER_LEN; i++ )
     {
         dipLastMotorHallSensorCounts[ i ] = 0;
     }
@@ -912,7 +912,7 @@
     if ( ++dipMotorSpeedCalcTimerCtr >= DIP_SPEED_CALC_INTERVAL )
     {
         U16 dipMotorHallSensorCount = getFPGADialInPumpHallSensorCount();
-        U32 nextIdx = INC_WRAP( dipMotorSpeedCalcIdx, 0, DIP_SPEED_CALC_BUFFER__LEN - 1 );
+        U32 nextIdx = INC_WRAP( dipMotorSpeedCalcIdx, 0, DIP_SPEED_CALC_BUFFER_LEN - 1 );
         U16 incDelta = ( dipMotorHallSensorCount >= dipLastMotorHallSensorCounts[ nextIdx ] ? \
                          dipMotorHallSensorCount - dipLastMotorHallSensorCounts[ nextIdx ] : \
                          ( HEX_64_K - dipLastMotorHallSensorCounts[ nextIdx ] ) + dipMotorHallSensorCount );