Index: etc/reports/alarms/AlarmMapping.py
===================================================================
diff -u -r776875c427f250c228ea5bd1c8192c08021fbc93 -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2
--- etc/reports/alarms/AlarmMapping.py	(.../AlarmMapping.py)	(revision 776875c427f250c228ea5bd1c8192c08021fbc93)
+++ etc/reports/alarms/AlarmMapping.py	(.../AlarmMapping.py)	(revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2)
@@ -209,7 +209,7 @@
  207 : "TD POST Safety Shutdown failure."                                                                      
  208 : "TD initial rev blood circuit prime limit reached."                                                     
  209 : "TD initial blood circuit prime timeout."                                                               
- 210 : "FW reserved for use."                                                                                  
+ 210 : "TD prime complete."                                                                                    
  211 : "FW reserved for use."                                                                                  
  212 : "FW reserved for use."                                                                                  
  213 : "TD blood pressure systolic low."                                                                       
@@ -322,11 +322,11 @@
   13 : "REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM"     # Treatment time change is less than minimum treatment time.
   14 : "REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS"                    # Ultrafiltration is not currently in progress.
   15 : "REQUEST_REJECT_REASON_UF_NOT_PAUSED"                        # Ultrafiltration is not currently paused.
-  16 : "REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS"             # A saline bolus is in progress.
+  16 : "REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS"              # A fluid bolus is in progress.
   17 : "REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE"                   # A treatment parameter is out of range.
   18 : "REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED"        # Filter flush time has been expired.
   19 : "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED"            # Saline bolus volume maximum has been reached.
-  20 : "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS"         # A saline bolus is not in progress.
+  20 : "REQUEST_REJECT_REASON_FLUID_BOLUS_NOT_IN_PROGRESS"          # A fluid bolus is not in progress.
   21 : "REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE"     # Requested user action is disabled in current state.
   22 : "REQUEST_REJECT_REASON_ALARM_IS_ACTIVE"                      # Requested user action not allowed while alarm is active.
   23 : "REQUEST_REJECT_REASON_INVALID_COMMAND"                      # Requested user action invalid.
@@ -349,7 +349,7 @@
   40 : "REQUEST_REJECT_REASON_TD_SERVICE_IS_DUE"                    # TD service is due.
   41 : "REQUEST_REJECT_REASON_RO_FILTER_TEMPERATURE_OUT_OF_RANGE"   # RO filter temperature out of range.
   42 : "REQUEST_REJECT_REASON_DD_INCOMPATIBLE"                      # DD firmware version is not compatible with TD firmware.
-  43 : "REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS"         # Saline bolus is not allowed during dialyzer reprime.
+  43 : "REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS"         # Fluid bolus is not allowed during dialyzer reprime.
   44 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_DD_BUSY"                 # RO only mode DD is busy.
   45 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER"       # RO only mode invalid parameter.
   46 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH"  # RO only mode invalid payload length.
@@ -363,6 +363,14 @@
   54 : "REQUEST_REJECT_REASON_ACID_CONV_FACTOR_MISMATCH"            # Acid conversion factor from UI mismatch with FW.
   55 : "REQUEST_REJECT_REASON_INVALID_PATIENT_WEIGHTS"              # Patient pre and estimated target weights are invalid.
   56 : "REQUEST_REJECT_REASON_UF_VOL_AND_WEIGHTS_INCONSISTENT"      # UF volume and the patient weights are not consistent.
-  57 : "NUM_OF_REQUEST_REJECT_REASONS"                              # Number of settings change reject codes.
+  57 : "REQUEST_REJECT_REASON_TD_AUTHENTICATION_INVALID"            # TD authentication invalid.
+  58 : "REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED"            # Confirmation received without prior validation.
+  59 : "REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH"                # Confirmed value does not match validated value.
+  60 : "REQUEST_REJECT_REASON_INVALID_TREATMENT_SUB_STATE"          # Request is not allowed in current treatment sub-state.
+  61 : "REQUEST_REJECT_REASON_MODALITY_MISMATCH"                    # Mismatched modality (Rx entered vs reatment initiation modality ).
+  62 : "REQUEST_REJECT_REASON_NVM_JOB_QUEUE_BUSY"                   # NVM Job queue is busy sending other records.
+  63 : "REQUEST_REJECT_REASON_NVM_INVALID_CRC"                      # NVM received CRC of the record is invalid.
+  64 : "REQUEST_REJECT_REASON_NVM_INVALID_OPERATION_MODE"           # NVM Operation Mode is not Service mode.
+  65 : "NUM_OF_REQUEST_REJECT_REASONS"                              # Number of settings change reject codes.
 }