Index: AlarmDefs.h
===================================================================
diff -u -r70ec00e730a4e995fbd6e4f84ecbdc90d4edfd96 -refc84d3493fe05c7676957054917992303a8e90b
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 70ec00e730a4e995fbd6e4f84ecbdc90d4edfd96)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision efc84d3493fe05c7676957054917992303a8e90b)
@@ -127,12 +127,12 @@
     ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89,                             ///< HD BP occlusion sensor error
     ALARM_ID____AVAILABLE_12 = 90,                                          ///< HD DPi occlusion sensor error
     ALARM_ID____AVAILABLE_13 = 91,                                          ///< HD DPo occlusion sensor error
-    ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 92,                            ///< HD blood flow sensor not being read
-    ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 93,                                  ///< HD blood flow sensor error
-    ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 94,                            ///< HD dialysate flow sensor not being read
-    ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 95,                                  ///< HD dialysate flow sensor error
-    ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 96,                       ///< HD blood flow sensor not being read - slow packet
-    ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 97,                       ///< HD dialysate flow sensor not being read - slow packet
+    ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 92,                            ///< HD blood flow sensor not being read               TODO remove this alarm when FMB fully removed
+    ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 93,                                  ///< HD blood flow sensor error                        TODO remove this alarm when FMB fully removed
+    ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 94,                            ///< HD dialysate flow sensor not being read           TODO remove this alarm when FMD fully removed
+    ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 95,                                  ///< HD dialysate flow sensor error                    TODO remove this alarm when FMD fully removed
+    ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 96,                       ///< HD blood flow sensor not being read - slow packet TODO remove this alarm when FMB fully removed
+    ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 97,                       ///< HD dialysate flow sensor not being read - slow packet  TODO remove this alarm when FMD fully removed
     ALARM_ID_HD_BATTERY_COMM_FAULT = 98,                                    ///< HD battery communication fault
     ALARM_ID_HD_SYRINGE_PUMP_STALL = 99,                                    ///< HD syringe pump stall alarm
     ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100,                            ///< HD no cartridge self-test timeout
@@ -193,11 +193,11 @@
     ALARM_ID_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR = 155,                  ///< DG non-volatile service invalid record CRC         TODO remove this alarm after DEN-9480 fwcommon was merged into staging
     ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156,                          ///< HW usage data (treatment time in HD and total consumed water in DG) failure
     ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 157,                             ///< Calibration record CRC failure                     TODO remove this alarm after DEN-9480 fwcommon was merged into staging
-    ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158,                    ///< Blood pump failed flow vs. motor speed check.  Mismatch with flow rate and rate implied by motor speed
-    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159,                  ///< Dialysate inlet pump failed flow vs. motor speed check.  Mismatch with flow rate and rate implied by motor speed
+    ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158,                    ///< Blood pump failed flow vs. motor speed check.           TODO remove this alarm when FMB fully removed
+    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159,                  ///< Dialysate inlet pump failed flow vs. motor speed check. TODO remove this alarm when FMD fully removed
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160,                         ///< Blood pump rotor speed too high
-    ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 161,                      ///< Blood flow sensor signal strength too low
-    ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW = 162,                  ///< Dialysate flow sensor signal strength too low
+    ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 161,                      ///< Blood flow sensor signal strength too low               TODO remove this alarm when FMB fully removed
+    ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW = 162,                  ///< Dialysate flow sensor signal strength too low           TODO remove this alarm when FMD fully removed
     ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 163,                   ///< HD sees primary load cell for reservoir 1 change too much too fast
     ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 164,                   ///< HD sees primary load cell for reservoir 2 change too much too fast
     ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 165,                       ///< HD in treatment rinseback operation timeout