Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rbdee7caad13de484d50de4089497725c44a43c74 -r93282b8a03682015a0c70b94d95d387204e10a89
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision bdee7caad13de484d50de4089497725c44a43c74)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 93282b8a03682015a0c70b94d95d387204e10a89)
@@ -529,7 +529,7 @@
     // Check fresh and spent dialysate pressure in range or BC switch only flag set
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         //Valve control for state 1 fill
         valveControlForBCState1FillStart();
@@ -551,7 +551,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
             //Alarm when pressure is not in range
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -627,7 +627,7 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
         if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
              ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
@@ -683,7 +683,7 @@
 
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
             {
                 if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
                 {
@@ -743,7 +743,7 @@
     // Check fresh and spent dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         // Valve control for state 2 fill
         valveControlForBCState2FillStart();
@@ -765,7 +765,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
             //Alarm when pressure is not in range
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -790,7 +790,7 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
         if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
              ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
@@ -847,7 +847,7 @@
         // Pressure alarm check
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
             {
                 if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
                 {
Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -re0c913b397af3122889433d855c5c5fb328f9865 -r93282b8a03682015a0c70b94d95d387204e10a89
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision e0c913b397af3122889433d855c5c5fb328f9865)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 93282b8a03682015a0c70b94d95d387204e10a89)
@@ -266,7 +266,7 @@
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
 
-    if ( getTestConfigStatus( TEST_CONFIG_ENABLE_DRY_BICART_FILL ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICART_FILL ) == TRUE )
     {
         setBicartFillRequested();