Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -rb2e7c9194acd84783d2bbad64c5720410493e199 -r1fa38184526c2b0c072eb8745c653f772156a824
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision b2e7c9194acd84783d2bbad64c5720410493e199)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 1fa38184526c2b0c072eb8745c653f772156a824)
@@ -22,7 +22,7 @@
 #include "FpgaDD.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
-//#include "NVDataMgmt.h"
+//#include "NVMgmt.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "PIControllers.h"
@@ -633,8 +633,11 @@
 //    if ( TRUE == isNewCalibrationRecordAvailable() )
 //    {
         // get updated record
-        //getNVRecord2Driver( GET_CAL_DIALYSATE_PUMP_RECORD, (U08*)&dialysatePumpCalRecord, sizeof( DD_DIALYSATE_PUMP_CAL_RECORD_T ), 0,
-        //                    ALARM_ID_DD_D12_PUMP_INVALID_CAL_RECORD );
+//        getNVRecord2Driver( GET_CAL_D12_PUMP_RECORD, (U08*)&dialysatePumpD12CalRecord, sizeof( DD_D12_DIALYSATE_PUMP_RECORD_T ), 0,
+//                            ALARM_ID_DD_D12_PUMP_INVALID_CAL_RECORD );
+//
+//        getNVRecord2Driver( GET_CAL_D48_PUMP_RECORD, (U08*)&dialysatePumpD48CalRecord, sizeof( DD_D48_DIALYSATE_PUMP_RECORD_T ), 0,
+//                            ALARM_ID_DD_D48_PUMP_INVALID_CAL_RECORD );
 //    }
 
     for ( pumpId = DIALYSATE_PUMPS_FIRST; pumpId < NUM_OF_DIALYSATE_PUMPS; pumpId++ )
@@ -674,13 +677,10 @@
     BOOL calStatus            = TRUE;  // TODO:initialize to false when calibration records avialble
 
     // This is only one record the number of items to check is 0 since the get NV data function does not do a for loop to check the calibration time
-//    calStatus |= getNVRecord2Driver( GET_CAL_D12_PUMP_RECORD, (U08*)&freshDialysatePumpRecord, sizeof( DD_D12_PUMP_RECORD_T ), 0,
+//    calStatus |= getNVRecord2Driver( GET_CAL_D12_PUMP_RECORD, (U08*)&freshDialysatePumpRecord, sizeof( DD_D12_DIALYSATE_PUMP_RECORD_T ), 0,
 //                                     ALARM_ID_DD_D12_PUMP_INVALID_CAL_RECORD );
-//    calStatus |= getNVRecord2Driver( GET_CAL_D48_PUMP_RECORD, (U08*)&spentDialysatePumpRecord, sizeof( DD_D48_PUMP_RECORD_T ), 0,
+//    calStatus |= getNVRecord2Driver( GET_CAL_D48_PUMP_RECORD, (U08*)&spentDialysatePumpRecord, sizeof( DD_D48_DIALYSATE_PUMP_RECORD_T ), 0,
 //                                     ALARM_ID_DD_D48_PUMP_INVALID_CAL_RECORD );
-//
-//    calStatus |= getNVRecord2Driver( GET_CAL_DIALYSATE_PUMP_RECORD, (U08*)&dialysatePumpCalRecord, sizeof( DD_DIALYSATE_PUMP_CAL_RECORD_T ), 0,
-//                                     ALARM_ID_NO_ALARM );
 
     if ( TRUE == calStatus )
     {