Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r9bb662bfd053fa114ac47224db7825c85bb6d796 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 9bb662bfd053fa114ac47224db7825c85bb6d796)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -191,10 +191,10 @@
 void initPresOccl( void )
 {
     // Initialize persistent pressure alarms
-    initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, 0, PRES_OCCL_ALARM_PERSISTENCE );
@@ -503,14 +503,14 @@
             artPresHigh = ( artPres > artHighLimit ? TRUE : FALSE );
 
             // Check arterial pressure is within user set alarm limits
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPresLow ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_LOW, artPresLow ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
             }
 
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPresHigh ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH, artPresHigh ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
             }
         }
         else if ( MODE_TREA == getCurrentOperationMode() )  // All treatment states not covered by the if above
@@ -521,19 +521,19 @@
             BOOL artPresHigh = ( artPres > artHighLimit ? TRUE : FALSE );
 
             // Check arterial pressure is within max selectable range
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPresLow ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_LOW, artPresLow ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
             }
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPresHigh ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH, artPresHigh ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
             }
         }
         else
         {   // Reset persistence if alarm is out of scope
-            isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, FALSE );
-            isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, FALSE );
+            isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_LOW, FALSE );
+            isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH, FALSE );
         }
     }
 }
@@ -584,19 +584,19 @@
             // Cannot monitor for low venous pressure while venting air trap
             if ( getValveAirTrapStatus() != STATE_OPEN )
             {
-                if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPresLow ) )
+                if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_LOW, venPresLow ) )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
                 }
             }
             else
             {   // clear persistence if air trap valve is open
-                isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );
+                isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_LOW, FALSE );
             }
 
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPresHigh ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_HIGH, venPresHigh ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
             }
         }
         else if ( MODE_TREA == getCurrentOperationMode() )  // All treatment states not covered by the if statement above
@@ -607,19 +607,19 @@
             BOOL venPresHigh = ( venPres > venHighLimit ? TRUE : FALSE );
 
             // Check venous pressure is within max selectable range
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPresHigh ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_HIGH, venPresHigh ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
             }
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPresLow ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_LOW, venPresLow ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
             }
         }
         else
         {   // Reset persistence if alarm is out of scope
-            isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );
-            isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, FALSE );
+            isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_LOW, FALSE );
+            isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_HIGH, FALSE );
         }
     }
 }
@@ -671,7 +671,7 @@
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
                     signalBloodPumpHardStop();  // Stop pump immediately
-                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
                 }
             }
         }
@@ -685,15 +685,15 @@
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
                     signalBloodPumpHardStop();  // Stop pump immediately
-                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
                 }
             }
         }
 
         // Clear alarm regardless of op mode once conditions are met.
         if ( bpOccl <= ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
         {
-            clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
+            clearAlarmCondition( ALARM_ID_HD_OCCLUSION_BLOOD_PUMP );
         }
 
         // Check for venous occlusion
@@ -938,7 +938,7 @@
 
         if ( ( bpPressure < CARTRIDGE_LOADED_THRESHOLD ) || ( bpPressure > OCCLUSION_CARTRIDGE_LOADED_PRESSURE_READING_MAX ) )
         {
-            activateAlarmNoData( ALARM_ID_NO_CARTRIDGE_LOADED );
+            activateAlarmNoData( ALARM_ID_HD_NO_CARTRIDGE_LOADED );
             result = SELF_TEST_STATUS_FAILED;
         }
     }