Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -ra50b999266616eb3d0661846cd31bb395c8a7e12 -r5580b8a5f38e4f09d58b41e1febe064741fb1963
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a50b999266616eb3d0661846cd31bb395c8a7e12)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5580b8a5f38e4f09d58b41e1febe064741fb1963)
@@ -1018,13 +1018,13 @@
     }
     else
     {
-        if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_WORN_CARTRIDGE_USE ) ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_WET_CARTRIDGE_USE ) ) )
+        if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_USE_WORN_CARTRIDGE ) ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) ) )
         {
             // If either of the test configurations are set go to loaded check
             state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE;
         }
 
-        if ( ( getTestConfigStatus( TEST_CONFIG_ENABLE_WORN_CARTRIDGE_USE ) != TRUE ) && ( getTestConfigStatus( TEST_CONFIG_ENABLE_WET_CARTRIDGE_USE ) != TRUE ) )
+        if ( ( getTestConfigStatus( TEST_CONFIG_USE_WORN_CARTRIDGE ) != TRUE ) && ( getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) != TRUE ) )
         {
             // If we are using the worn cartridge or wet cartridge, it is not needed to alarm the user to install the new cartridge
             activateAlarmNoData( ALARM_ID_HD_INSTALL_NEW_CARTRIDGE );
@@ -1062,7 +1062,7 @@
         pressureSelfTestPreNormalStartTime = getMSTimerCount();
         state = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE;
 
-        if ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_WORN_CARTRIDGE_USE ) )
+        if ( TRUE == getTestConfigStatus( TEST_CONFIG_USE_WORN_CARTRIDGE ) )
         {
             dryPressureTestsCompleted = TRUE;
             state                     = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;