Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rbe1ff666dbd2ff03342c22c8e50b21d0f9b988a9 -r6a30402a7d47d1c77c04845a1c880935f00c6551
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision be1ff666dbd2ff03342c22c8e50b21d0f9b988a9)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6a30402a7d47d1c77c04845a1c880935f00c6551)
@@ -125,20 +125,38 @@
     { MSG_ID_DD_SOFTWARE_RESET_REQUEST,                                             &handleDDSoftwareResetRequest },
     { MSG_ID_TD_OP_MODE_DATA,                                                       &handleSetTDOperationMode },
     { MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE,                                        &handleUpdateAvailable },
-    { MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST,                                          &handleDDGetNVRecord },
-    { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST,                                   &handleDDSetNVSystemRecord },
-    { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST,                                  &handleDDSetNVServiceRecord },
-    { MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST,                            &handleDDSetNVInstitutionalRecord },
-    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &handleDDSetNVUsageInfoRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST,                             &handleDDSetPressureSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST,                                 &handleDDSetTempSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST,                                   &handleDDSetConcPumpCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST,                                    &handleDDSetD12PumpCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST,                                    &handleDDSetD48CalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST,                            &handleDDSetAcidConcCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST,                          &handleDDSetBicarbConcCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST,                                &handleDDSetAccelSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST,                           &handleDDSetBloodLeakSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_GET_SYSTEM_RECORD_REQUEST,                                   &handleDDGetSystemRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST,                                   &handleDDSetSystemRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_SERVICE_RECORD_REQUEST,                                  &handleDDGetServicRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST,                                  &handleDDSetServicRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_INSTIT_BASIC_RECORD_REQUEST,                             &handleDDGetInstitBasicRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_INSTIT_BASIC_RECORD_REQUEST,                             &handleDDSetInstitBasicRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_INSTIT_ADVANCED_RECORD_REQUEST,                          &handleDDGetInstitAdvancedRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_INSTIT_ADVANCED_RECORD_REQUEST,                          &handleDDSetInstitAdvancedRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_INSTIT_ADDITIONAL_RECORD_REQUEST,                        &handleDDGetInstitAdditionalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_INSTIT_ADDITIONAL_RECORD_REQUEST,                        &handleDDSetInstitAdditionalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_USAGE_INFO_RECORD_REQUEST,                               &handleDDGetUsageInfoRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &handleDDSetUsageInfoRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_PRESSURE_SENSOR_CAL_RECORD_REQUEST,                      &handleDDGetPressureSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_PRESSURE_SENSOR_CAL_RECORD_REQUEST,                      &handleDDSetPressureSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_TEMPERATURE_SENSOR_CAL_RECORD_REQUEST,                   &handleDDGetTemperatureSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_TEMPERATURE_SENSOR_CAL_RECORD_REQUEST,                   &handleDDSetTemperatureSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_CONC_PUMP_CAL_RECORD_REQUEST,                            &handleDDGetConcPumpCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_CONC_PUMP_CAL_RECORD_REQUEST,                            &handleDDSetConcPumpCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_D12_PUMP_CAL_RECORD_REQUEST,                             &handleDDGetD12PumpCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_D12_PUMP_CAL_RECORD_REQUEST,                             &handleDDSetD12PumpCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_D48_PUMP_CAL_RECORD_REQUEST,                             &handleDDGetD48PumpCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_D48_PUMP_CAL_RECORD_REQUEST,                             &handleDDSetD48PumpCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_ACID_CONC_CAL_RECORD_REQUEST,                            &handleDDGetAcidConcCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_ACID_CONC_CAL_RECORD_REQUEST,                            &handleDDSetAcidConcCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_BICARB_CONC_CAL_RECORD_REQUEST,                          &handleDDGetBicarbConcCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_BICARB_CONC_CAL_RECORD_REQUEST,                          &handleDDSetBicarbConcCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_ACCEL_SENSOR_CAL_RECORD_REQUEST,                         &handleDDGetAccelSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_ACCEL_SENSOR_CAL_RECORD_REQUEST,                         &handleDDSetAccelSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_BLOOD_LEAK_SENSOR_CAL_RECORD_REQUEST,                    &handleDDGetBloodLeakSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_BLOOD_LEAK_SENSOR_CAL_RECORD_REQUEST,                    &handleDDSetBloodLeakSensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST,                  &handleDDGetConductivitySensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST,                  &handleDDSetConductivitySensorCalRecRequest },
     { MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testValvesStatesPublishIntervalOverride },
     { MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,                                       &testValveStateOverride },
     { MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                                &testValveSensedStateOverride },