Index: firmware/App/Services/NVRecordsDD.h
===================================================================
diff -u -rb50ce33669efe6dfcf5f8a211c78a6c2c309adf3 -rac72b3fa86015b2c60c7687a4597dd4ae5c24dc8
--- firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision b50ce33669efe6dfcf5f8a211c78a6c2c309adf3)
+++ firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision ac72b3fa86015b2c60c7687a4597dd4ae5c24dc8)
@@ -17,6 +17,7 @@
 
 #include "Common.h"
 #include "ConcentratePumps.h"
+#include "ConductivitySensors.h"
 #include "DDDefs.h"
 #include "DialysatePumps.h"
 #include "FlowSensor.h"
@@ -81,7 +82,7 @@
     NV_DD_DATA_CAL_D48_PUMP_RECORD,                                             ///< D48 dialysate pump calibration record.
     NV_DD_DATA_CAL_ACID_CONCENTREATES,                                          ///< Acid concentrates calibration data.
     NV_DD_DATA_CAL_BICARB_CONCENTRATES,                                         ///< Bicarb concentrates calibration data.
-    NV_DD_DATA_CAL_ACCEL_SENSOR,                                                //< Accelerometers calibration data.
+    NV_DD_DATA_CAL_ACCELEROMETER_SENSOR,                                        //< Accelerometer calibration data.
     NV_DD_DATA_CAL_BLOOD_LEAK_SENSOR,                                           ///< Blood leak sensor calibration data.
     NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS,                                        ///< Conductivity sensor calibration data.
     NV_DD_DATA_INSTIT_BASIC_RECORD,                                             ///< Basic institutional record.
@@ -243,29 +244,10 @@
     U16 crc;                                                                    ///< CRC for the DD blood leak calibration payload.
 } DD_BLOOD_LEAK_SENSOR_CAL_RECORD_T;
 
-/// DD conductivity sensor calibration structure
-typedef struct
-{
-    F32 coeff1;                                                                 ///< Coefficient 1
-    F32 coeff2;                                                                 ///< Coefficient 2
-    F32 coeff3;                                                                 ///< Coefficient 3
-    F32 coeff4;                                                                 ///< Coefficient 4
-    F32 coeff5;                                                                 ///< Coefficient 5
-    F32 coeff6;                                                                 ///< Coefficient 6
-    F32 coeff7;                                                                 ///< Coefficient 7
-    F32 coeff8;                                                                 ///< Coefficient 8
-    F32 coeff9;                                                                 ///< Coefficient 9
-    F32 coeff10;                                                                ///< Coefficient 10
-    F32 coeff11;                                                                ///< Coefficient 11
-    F32 coeff12;                                                                ///< Coefficient 12
-    U32 calibrationTime;                                                        ///< Calibration time.
-    U16 crc;                                                                    ///< CRC for the DD conductivity calibration payload.
-} DD_CONDUCTIVITY_SENSOR_T;
-
 /// DD conductivity sensor calibration record.
 typedef struct
 {
-    DD_CONDUCTIVITY_SENSOR_T condSensors[ NUM_OF_CONDUCTIVITY_SENSORS ];        ///< DD Conductivity Sensors
+    CONDUCTIVITY_COEFFICIENTS_T condSensors[ NUM_OF_CONDUCTIVITY_SENSORS ];        ///< DD Conductivity Sensors
 } DD_CONDUCTIVITY_SENSOR_CAL_RECORD_T;
 
 /// DD systems record structure