Index: firmware/App/Controllers/DialysateFlow.c
===================================================================
diff -u -r224b86c0847207c168d38fa1713a1e9116642267 -rbcf9339af8a725054a8c936ae572bb95e2bcd3f0
--- firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
+++ firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision bcf9339af8a725054a8c936ae572bb95e2bcd3f0)
@@ -90,15 +90,8 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
     BOOL calStatus            = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
-                                                    NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
-    if ( TRUE == calStatus )
-    {
-        result = SELF_TEST_STATUS_PASSED;
-    }
-    else
-    {
-        result = SELF_TEST_STATUS_FAILED;
-    }
+                                                    NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD );
+    result                    = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
 
     return result;
 }