Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rb925bf251dfd5584a0839cee93ccf8566a0ec2fb -r0599bd5494eb64416999de0487a9882c557b6044
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b925bf251dfd5584a0839cee93ccf8566a0ec2fb)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0599bd5494eb64416999de0487a9882c557b6044)
@@ -268,19 +268,19 @@
     { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
     { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
     { MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST,                                          &testDDGetNVRecord },
-    { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD,                                           &testDDSetNVSystemRecord },
-    { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD,                                          &testDDSetNVServiceRecord },
-    { MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD,                                    &testDDSetNVInstitutionalRecord },
-    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD,                                       &testDDSetNVUsageInfoRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR,                                     &testDDSetPressureSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR,                                         &testDDSetTempSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP,                                           &testDDSetConcPumpCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP,                                            &testDDSetD12PumpCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP,                                            &testDDSetD48CalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE,                                    &testDDSetAcidConcCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE,                                  &testDDSetBicarbConcCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR,                                        &testDDSetAccelSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR,                                   &testDDSetBloodLeakSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST,                                   &testDDSetNVSystemRecord },
+    { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST,                                  &testDDSetNVServiceRecord },
+    { MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST,                            &testDDSetNVInstitutionalRecord },
+    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &testDDSetNVUsageInfoRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST,                             &testDDSetPressureSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST,                                 &testDDSetTempSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST,                                   &testDDSetConcPumpCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST,                                    &testDDSetD12PumpCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST,                                    &testDDSetD48CalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST,                            &testDDSetAcidConcCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST,                          &testDDSetBicarbConcCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST,                                &testDDSetAccelSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST,                           &testDDSetBloodLeakSensorCalRecord },
     { MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST,                                    &testDDSetNVUsageInfoRecord },
     { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testRORejectionRatioDataPublishIntervalOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },