Index: firmware/App/Services/NVMessagingDD.c
===================================================================
diff -u -r3ac9763f9bcf1246565b6309c5d1b1d6b665700c -r13e865e5849f939d1c413b55f7240bc047006996
--- firmware/App/Services/NVMessagingDD.c	(.../NVMessagingDD.c)	(revision 3ac9763f9bcf1246565b6309c5d1b1d6b665700c)
+++ firmware/App/Services/NVMessagingDD.c	(.../NVMessagingDD.c)	(revision 13e865e5849f939d1c413b55f7240bc047006996)
@@ -82,7 +82,7 @@
 {
     BOOL accepted;                                                              ///< Accepted/Rejected
     U32 rejectionReason;                                                        ///< Reason to reject the entire request
-    U32 waterRecoveryRejectReason;                                              ///< Reason to reject Service record parameter waterRecovery
+    U32 waterRecoveryModeRejectReason;                                          ///< Reason to reject Service record parameter waterRecoveryMode
     U32 primaryFilterReplacementDateRejectReason;                               ///< Reason to reject Service record parameter primaryFilterReplacementDate
     U32 secondaryFilterReplacementDateRejectReason;                             ///< Reason to reject Service record parameter secondaryFilterReplacementDate
     U32 ROMembraneReplacementDateRejectReason;                                  ///< Reason to reject Service record parameter ROMembraneReplacementDate
@@ -2630,6 +2630,7 @@
         {
             memcpy( &record, message->payload, expectedPayloadLen );
             record.crc = crc16( (U08*)&record, expectedPayloadLen );
+            // TODO: Add a range check function
             setNVMRecord( NV_DD_DATA_INSTIT_BASIC_RECORD, (U08*)&record, 0 );
             result = enqueueEraseAndWriteSector( NVM_INSTITUTIONAL_RECORD );
             sendNVEvent( NVM_INSTITUTIONAL_RECORD, 0, 0 );