Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r4ea05914616f25058c242b8300f83770438b01d0 -r1fa38184526c2b0c072eb8745c653f772156a824
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4ea05914616f25058c242b8300f83770438b01d0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1fa38184526c2b0c072eb8745c653f772156a824)
@@ -25,7 +25,7 @@
 #include "ModeGenDialysate.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
-//#include "NVDataMgmt.h"
+//#include "NVMgmt.h"
 #include "OperationModes.h"
 #include "PermeateTank.h"
 #include "Pressure.h"
@@ -306,7 +306,7 @@
 //        cmdResponse.rejectCode  = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
@@ -366,7 +366,7 @@
 //        cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
@@ -427,7 +427,7 @@
 //        cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;