Index: AlarmDefs.h
===================================================================
diff -u -rd24a995b13c2e8d7e6a2e7b4b2b4b01974396b58 -ra3302dbcab2d703510a251b5f04cc06c7aeb6ba7
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision d24a995b13c2e8d7e6a2e7b4b2b4b01974396b58)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a3302dbcab2d703510a251b5f04cc06c7aeb6ba7)
@@ -21,7 +21,7 @@
 // ********** public definitions **********
 
 /**
- *  @addtogroup AlarmDefs
+ *  @addtogroup AlarmManagement
  *  @{
  */
 
@@ -106,18 +106,11 @@
     ALARM_ID_DG_ACCELEROMETER_FAILURE = 75,                         ///< DG accelerometer error (no readings or FPGA reports error)
     ALARM_ID_DG_CRITICAL_DATA_ERROR = 76,                           ///< DG critical data integrity check failed
     ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE = 77,                  ///< RO rejection ratio out of range
-    ALARM_ID_INLET_WATER_PRESSURE_FAULT = 77,                       ///< Inlet water pressure fault
+    ALARM_ID_INLET_WATER_PRESSURE_FAULT = 78,                       ///< Inlet water pressure fault
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
 
-/**@}*/
-
-/**
- *  @addtogroup AlarmPriorities
- *  @{
- */
-
 /// Enumeration of alarm priorities.
 enum Alarm_Priorities
 {
@@ -129,13 +122,6 @@
 };
 typedef enum Alarm_Priorities ALARM_PRIORITY_T;                     ///< Type for alarm priorities enumeration
 
-/**@}*/
-
-/**
- *  @addtogroup AlarmSources
- *  @{
- */
-
 /// Enumeration of alarm sources.
 enum Alarm_Sources
 {
Index: HDDefs.h
===================================================================
diff -u -rd24a995b13c2e8d7e6a2e7b4b2b4b01974396b58 -ra3302dbcab2d703510a251b5f04cc06c7aeb6ba7
--- HDDefs.h	(.../HDDefs.h)	(revision d24a995b13c2e8d7e6a2e7b4b2b4b01974396b58)
+++ HDDefs.h	(.../HDDefs.h)	(revision a3302dbcab2d703510a251b5f04cc06c7aeb6ba7)
@@ -62,8 +62,8 @@
     POST_STATE_ACCELEROMETER,                           ///< Run Accelerometer test mode state
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test mode state
     POST_STATE_VALVES,                                  ///< Run Valves test mode state
-    POST_STATE_COMPLETED,                               ///< POST self tests completed mode state
-    POST_STATE_FAILED,                                  ///< POST self tests failed mode state
+    POST_STATE_COMPLETED,                               ///< POST self-tests completed mode state
+    POST_STATE_FAILED,                                  ///< POST self-tests failed mode state
     NUM_OF_POST_STATES                                  ///< Number of initialize & POST mode states
 };
 typedef enum HD_POST_States HD_POST_STATE_T;            ///< Type for HD POST states enumeration
Index: MsgDefs.h
===================================================================
diff -u -rd24a995b13c2e8d7e6a2e7b4b2b4b01974396b58 -ra3302dbcab2d703510a251b5f04cc06c7aeb6ba7
--- MsgDefs.h	(.../MsgDefs.h)	(revision d24a995b13c2e8d7e6a2e7b4b2b4b01974396b58)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision a3302dbcab2d703510a251b5f04cc06c7aeb6ba7)
@@ -21,7 +21,7 @@
 // ********** public definitions **********
 
 /**
- *  @addtogroup SystemMessageIDs
+ *  @addtogroup SystemCommMessages
  *  @{
  */
 
@@ -191,13 +191,6 @@
 };
 typedef enum Msg_IDs MSG_ID_T;                                          ///< Type for message IDs enumeration
 
-/**@}*/
-
-/**
- *  @addtogroup RequestRejectReasonsID
- *  @{
- */
-
 /// Enumeration of settings change rejection reason codes
 enum Request_Reject_Reasons
 {
@@ -222,6 +215,7 @@
     REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION,             ///< The Heparin pre-stop setting is greater than the treatment duration
     REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH,                ///< Arterial pressure low and high alarm limits are not inconsistent
     REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH,                  ///< Venous pressure low and high alarm limits are inconsistent
+    REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED,                    ///< Saline bolus volume maximum has been reached - no more saline allowed
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;       ///< Type for settings change rejection reason codes enumeration