Index: firmware/App/Services/NVRecordsDD.h
===================================================================
diff -u -r1e742ba641458eaf36c8d953275a3e1c32b943d4 -r7b414857790dd5282137bf67d56688a703d4bfe7
--- firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 1e742ba641458eaf36c8d953275a3e1c32b943d4)
+++ firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 7b414857790dd5282137bf67d56688a703d4bfe7)
@@ -74,7 +74,8 @@
 typedef enum DD_nv_commands
 {
     NV_DD_DATA_SYSTEM_RECORD = 0,                                               ///< System record.
-    NV_DD_DATA_SERVICE_RECORD,                                                  ///< Service record
+    NV_DD_DATA_FP_SERVICE_RECORD,                                               ///< FP Service record
+    NV_DD_DATA_DD_SERVICE_RECORD,                                               ///< DD Service record
     NV_DD_DATA_CAL_PRESSURE_SENOSRS,                                            ///< Pressure sensors calibration data.
     NV_DD_DATA_CAL_TEMPERATURE_SENSORS,                                         ///< Temperature sensors calibration data.
     NV_DD_DATA_CAL_CONCENTRATE_PUMPS_RECORD,                                    ///< Concentrate pumps calibration record.
@@ -88,7 +89,8 @@
     NV_DD_DATA_INSTIT_BASIC_RECORD,                                             ///< Basic institutional record.
     NV_DD_DATA_INSTIT_ADVANCED_RECORD,                                          ///< Advanced institutional record.
     NV_DD_DATA_INSTIT_ADDITIONAL_RECORD,                                        ///< Additional institutional record.
-    NV_DD_DATA_USAGE_INFO_RECORD,                                               ///< Usage record.
+    NV_DD_DATA_FP_USAGE_INFO_RECORD,                                               ///< FP Usage record.
+    NV_DD_DATA_DD_USAGE_INFO_RECORD,                                               ///< DD Usage record.
     NUM_OF_NV_DD_DATA                                                           ///< Number of non-volatile data.
 } NV_DATA_T;
 
@@ -294,8 +296,8 @@
 typedef struct
 {
     BOOL isHDFOnlineFluidAvailable;                                             ///< True : HDF Online Fluid feature is available, False if not.
-    U32 UltraFilter1ReplacementDate;                                            ///< Last replacement date of Ultrafilter 1
-    U32 UltraFilter2ReplacementDate;                                            ///< Last replacement date of Ultrafilter 2
+    U32 ultraFilter1ReplacementDate;                                            ///< Last replacement date of Ultrafilter 1
+    U32 ultraFilter2ReplacementDate;                                            ///< Last replacement date of Ultrafilter 2
     U32 UFPumpTubingReplacementDate;                                            ///< Last replacement date of UP Pump Tubing
     U32 serviceLoc;                                                             ///< DD service location.
     U32 lastServiceEpochDate;                                                   ///< DD last service date in epoch.
@@ -373,10 +375,10 @@
 {
     F32 roWaterGenTotalL;                                                       ///< Total RO water generated in liters. (Cannot be reset)
     F32 roWaterGenSinceLastServiceL;                                            ///< RO water generated since last treatment in liters.
-    U32 UltraFilter1TreatmentNum;                                               ///< Number of treatments performed on ultrafilter 1 since last replaced
-    U32 UltraFilter1DisinfectionNum;                                            ///< Number of disinfections performed on ultrafilter 1 since last replaced
-    U32 UltraFilter2TreatmentNum;                                               ///< Number of treatments performed on ultrafilter 2 since last replaced
-    U32 UltraFilter2DisinfectionNum;                                            ///< Number of disinfections performed on ultrafilter 2 since last replaced
+    U32 ultraFilter1TreatmentNum;                                               ///< Number of treatments performed on ultrafilter 1 since last replaced
+    U32 ultraFilter1DisinfectionNum;                                            ///< Number of disinfections performed on ultrafilter 1 since last replaced
+    U32 ultraFilter2TreatmentNum;                                               ///< Number of treatments performed on ultrafilter 2 since last replaced
+    U32 ultraFilter2DisinfectionNum;                                            ///< Number of disinfections performed on ultrafilter 2 since last replaced
     U32 UFPumpTubingTreatmentNum;                                               ///< Number of treatments performed on UF Pump Tubing since last replaced
     U32 UFPumpTubingDisinfectionNum;                                            ///< Number of disinfections performed on UF Pump Tubing since last replaced
     U32 lastBasicFlushCompleteDateEpoch;                                        ///< Last basic flush complete date in epoch.