Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r94895e32fe18e78b98fe3bb7786838cf00afdbfa -r1760616331f8dbf20f80bd9ec1cfaba01134b8f7
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 94895e32fe18e78b98fe3bb7786838cf00afdbfa)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1760616331f8dbf20f80bd9ec1cfaba01134b8f7)
@@ -499,7 +499,7 @@
         // check UF accuracy
         if ( uFRateError > (F32)MAX_UF_ACCURACY_ERROR_ML_PER_HR )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_UF_RATE_ACCURACY_ERROR, uFSetRatePerHr, uFMeasRatePerHr );
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFSetRatePerHr, uFMeasRatePerHr );
         }
         // reset for next check
         lastUFVolumeChecked = measUFVolume;
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r16b4f0da7429f5c836c93479cd0fd489a422bd55 -r1760616331f8dbf20f80bd9ec1cfaba01134b8f7
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 16b4f0da7429f5c836c93479cd0fd489a422bd55)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 1760616331f8dbf20f80bd9ec1cfaba01134b8f7)
@@ -105,6 +105,7 @@
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR
 };
 
 /// A blank alarm data record for alarms that do not include alarm data when triggered.
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r9b262ba08e3180f121c3cf19d8d25e565183f87d -r1760616331f8dbf20f80bd9ec1cfaba01134b8f7
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 1760616331f8dbf20f80bd9ec1cfaba01134b8f7)
@@ -166,6 +166,8 @@
     SW_FAULT_ID_DIAL_OUT_SET_RX_OUT_OF_RANGE,
     SW_FAULT_ID_DIALYSIS_INVALID_STATE,                                 // 55
     SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
+    SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;