Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r1fa38184526c2b0c072eb8745c653f772156a824 -r2e65cae607c3ee68326f82d6134b0de3777559f9
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 1fa38184526c2b0c072eb8745c653f772156a824)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2e65cae607c3ee68326f82d6134b0de3777559f9)
@@ -267,12 +267,11 @@
     { MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST,                       &testBiCarbChamberFillRequestOverride },
     { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
     { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
-    { MSG_ID_DD_NVM_GET_RECORD,                                                     &testDDGetNVRecord },
-    { MSG_ID_DD_NVM_SET_SYSTEM_RECORD,                                              &testDDSetNVSystemRecord },
-    { MSG_ID_DD_NVM_SET_SERVICE_RECORD,                                             &testDDSetNVServiceRecord },
-    { MSG_ID_DD_NVM_SET_CALIBRATION_RECORD,                                         &testDDSetNVCalibrationRecord },
-    { MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD,                                       &testDDSetNVInstitutionalRecord },
-    { MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD,                                          &testDDSetNVUsageInfoRecord },
+    { 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_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 },