Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r71d1034e2b46056023734b957a3f49a2b36f806f
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 71d1034e2b46056023734b957a3f49a2b36f806f)
@@ -134,11 +134,11 @@
                 batteryRelStateOfCharge_pct.data = (U32)relStateOfCharge_pct;
                 if ( getBatteryRemainingPercent() < BATTERY_PACK_MIN_CHARGE_PCT )
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, getBatteryRemainingPercent() );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED, getBatteryRemainingPercent() );
                 }
                 else
                 {
-                    clearAlarmCondition( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW );
+                    clearAlarmCondition( ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED );
                 }
             }
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rcf9e54415f1b28789a818ac8ebfed7adf447b0a6 -r71d1034e2b46056023734b957a3f49a2b36f806f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision cf9e54415f1b28789a818ac8ebfed7adf447b0a6)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 71d1034e2b46056023734b957a3f49a2b36f806f)
@@ -1546,7 +1546,7 @@
         F32 integrateVolumeToleranceG       = WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE;
 
 #ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL ) )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
         {
             integrateVolumeToleranceG = 50.0F;
         }
@@ -1685,7 +1685,7 @@
         F32 integrateVolumeToleranceG       = WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE;
 
 #ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL ) )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
         {
             integrateVolumeToleranceG = 50.0F;
         }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2ea138635da28090301a7134a9c1f4a6de964dde -r71d1034e2b46056023734b957a3f49a2b36f806f
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2ea138635da28090301a7134a9c1f4a6de964dde)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 71d1034e2b46056023734b957a3f49a2b36f806f)
@@ -1614,10 +1614,6 @@
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
-                handleTestCurrentTreamtmentParametersRequest( message );
-                break;
-
             case MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE:
                 handleSetFansDutyCycleOverrideRequest( message );
                 break;
@@ -1650,10 +1646,6 @@
                 handleSetBloodLeakEmbeddedModeCommand( message );
                 break;
 
-            case MSG_ID_HD_SEND_ALARMS_COMMAND:
-                handleResendAllAlarmsCommand( message );
-                break;
-
             case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
                 handleTestCurrentTreamtmentParametersRequest( message );
                 break;