Index: AlarmDefs.h
===================================================================
diff -u -r00a8d9f7081aec25701ef8d5a0511036f5c54d32 -r33dedb7791060fc5a0e6ab4ba49326e13bd630b7
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 00a8d9f7081aec25701ef8d5a0511036f5c54d32)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 33dedb7791060fc5a0e6ab4ba49326e13bd630b7)
@@ -501,7 +501,7 @@
     { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD,         0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED,        0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED,        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD,       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SOFTWARE_FAULT,                                0,              ALARM_ID_NO_ALARM },
@@ -632,7 +632,7 @@
     { ALARM_PRIORITY_MEDIUM, 799,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE,           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 799,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE,            0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 799,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE,                0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,    36,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH,                             0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,    36,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH,                             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW,        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,      3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE,       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE,     0,              ALARM_ID_NO_ALARM },
@@ -694,7 +694,7 @@
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 800,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_SITTING_WARNING,                            0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 801,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_OF_TREATMENT_ALARM,                           0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_MEDIUM, 802,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_MEDIUM,                           ALM_ESC_30_MIN, ALARM_ID_PRIME_COMPLETED_HIGH },
+    { ALARM_PRIORITY_MEDIUM, 802,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_PRIME_COMPLETED_MEDIUM,                           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE,                0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM,                      0,              ALARM_ID_NO_ALARM },
@@ -708,7 +708,7 @@
     { ALARM_PRIORITY_MEDIUM, 803,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_BY_USER,                        0,              ALARM_ID_NO_ALARM },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoBRcr NoDRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
     { ALARM_PRIORITY_LOW,    904,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_OF_TREATMENT_WARNING,                         0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_LOW,    905,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY,                     ALM_ESC_90_MIN, ALARM_ID_PRIME_COMPLETED_MEDIUM },
+    { ALARM_PRIORITY_LOW,    905,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY,                     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    909,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_OUT_OF_TIME,                                0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    909,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_PRIME_SALINE_PURGE_AIR_TIME_OUT,               0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    909,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT,                0,              ALARM_ID_NO_ALARM },
Index: HDDefs.h
===================================================================
diff -u -rce7b714d018400b2cd392fe64fafe2dd215e8fbc -r33dedb7791060fc5a0e6ab4ba49326e13bd630b7
--- HDDefs.h	(.../HDDefs.h)	(revision ce7b714d018400b2cd392fe64fafe2dd215e8fbc)
+++ HDDefs.h	(.../HDDefs.h)	(revision 33dedb7791060fc5a0e6ab4ba49326e13bd630b7)
@@ -266,8 +266,8 @@
 enum Wet_Self_Tests_States
 {
     WET_SELF_TESTS_START_STATE = 0,                         ///< Wet self-tests starting state.
-    WET_SELF_TESTS_SETUP_STATE,                             ///< Setup reservoirs for wet self-tests.
-    WET_SELF_TESTS_BUBBLES_STATE,                           ///< Wet self-test air bubble detectors state.
+    WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE,                ///< Setup for wet air bubble self-test state.
+    WET_SELF_TESTS_BUBBLE_CHECK_STATE,                      ///< Wet self-test air bubble detectors state.
     WET_SELF_TESTS_PRIME_CHECK_STATE,                       ///< Prime check wet self-tests state, checks for primed patient lines.
     WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE,               ///< Blood leak detector self-test state.
     WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE,          ///< Setup valve and start dialysate pump for first displacement.