Index: firmware/App/Services/NVMessagingDD.h
===================================================================
diff -u -r6a30402a7d47d1c77c04845a1c880935f00c6551 -r7b414857790dd5282137bf67d56688a703d4bfe7
--- firmware/App/Services/NVMessagingDD.h	(.../NVMessagingDD.h)	(revision 6a30402a7d47d1c77c04845a1c880935f00c6551)
+++ firmware/App/Services/NVMessagingDD.h	(.../NVMessagingDD.h)	(revision 7b414857790dd5282137bf67d56688a703d4bfe7)
@@ -42,21 +42,12 @@
 BOOL handleDDGetSystemRecRequest( MESSAGE_T *message );
 BOOL handleDDSetSystemRecRequest( MESSAGE_T *message );
 
+BOOL handleFPGetServicRecRequest( MESSAGE_T *message );
+BOOL handleFPSetServicRecRequest( MESSAGE_T *message );
+
 BOOL handleDDGetServicRecRequest( MESSAGE_T *message );
 BOOL handleDDSetServicRecRequest( MESSAGE_T *message );
 
-BOOL handleDDGetUsageInfoRecRequest( MESSAGE_T *message );
-BOOL handleDDSetUsageInfoRecRequest( MESSAGE_T *message );
-
-BOOL handleDDGetInstitBasicRecRequest( MESSAGE_T *message );
-BOOL handleDDSetInstitBasicRecRequest( MESSAGE_T *message );
-
-BOOL handleDDGetInstitAdvancedRecRequest( MESSAGE_T *message );
-BOOL handleDDSetInstitAdvancedRecRequest( MESSAGE_T *message );
-
-BOOL handleDDGetInstitAdditionalRecRequest( MESSAGE_T *message );
-BOOL handleDDSetInstitAdditionalRecRequest( MESSAGE_T *message );
-
 BOOL handleDDGetPressureSensorCalRecRequest( MESSAGE_T *message );
 BOOL handleDDSetPressureSensorCalRecRequest( MESSAGE_T *message );
 
@@ -87,6 +78,21 @@
 BOOL handleDDGetConductivitySensorCalRecRequest( MESSAGE_T *message );
 BOOL handleDDSetConductivitySensorCalRecRequest( MESSAGE_T *message );
 
+BOOL handleDDGetInstitBasicRecRequest( MESSAGE_T *message );
+BOOL handleDDSetInstitBasicRecRequest( MESSAGE_T *message );
+
+BOOL handleDDGetInstitAdvancedRecRequest( MESSAGE_T *message );
+BOOL handleDDSetInstitAdvancedRecRequest( MESSAGE_T *message );
+
+BOOL handleDDGetInstitAdditionalRecRequest( MESSAGE_T *message );
+BOOL handleDDSetInstitAdditionalRecRequest( MESSAGE_T *message );
+
+BOOL handleFPGetUsageInfoRecRequest( MESSAGE_T *message );
+BOOL handleFPSetUsageInfoRecRequest( MESSAGE_T *message );
+
+BOOL handleDDGetUsageInfoRecRequest( MESSAGE_T *message );
+BOOL handleDDSetUsageInfoRecRequest( MESSAGE_T *message );
+
 BOOL testSetNVRecordCRCOverride( MESSAGE_T *message  );
 
 /**@}*/