Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 558)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 658)
@@ -13,5 +13,5 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -87,5 +87,5 @@
 
         // Load a script file
-        String autoloadScriptname = kScenarioFolder+"/one-incident.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/one-incident.xml";
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         // The status should now say Ready
Index: trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 653)
+++ trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 658)
@@ -19,5 +19,5 @@
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -150,5 +150,5 @@
 
         // Load a script file
-        String autoloadScriptname = kScenarioFolder+"/audio_systest.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/audio_systest.xml";
         simMgrApp.loadScript(new File(autoloadScriptname));
         try
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 657)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 658)
@@ -17,5 +17,5 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -253,5 +253,5 @@
         System.out.println("Sim status");
         // Load a script file - to put status at Ready
-        String autoloadScriptname = kScenarioFolder+"/one-incident.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/one-incident.xml";
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         pause(2000);
@@ -335,6 +335,6 @@
     {
         new File("scripts").mkdir();
-        writedata(kScenarioFolder+"/Cardfile.xml", cardfileData);
-        writedata(kScenarioFolder+"/one-incident.xml", oneincidentXML);
+        writedata(SCENARIOS_DIR+"/Cardfile.xml", cardfileData);
+        writedata(SCENARIOS_DIR+"/one-incident.xml", oneincidentXML);
     }
 
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 558)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 658)
@@ -16,5 +16,5 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -140,5 +140,5 @@
 
         // Load a script file
-        String autoloadScriptname = kScenarioFolder+"/one-incident.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/one-incident.xml";
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         // The status should now say Ready
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java	(revision 558)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java	(revision 658)
@@ -13,5 +13,5 @@
 import java.util.logging.Logger;
 import static tmcsim.cadsimulator.CADSimulatorFixture.bos;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -68,6 +68,6 @@
     public static void writeScriptfiles()
     {
-        writeFileFromURL(kScenarioFolder+"/Cardfile.xml", cardfileURL);
-        writeFileFromURL(kScenarioFolder+"/one-incident.xml", smallXMLURL);
+        writeFileFromURL(SCENARIOS_DIR+"/Cardfile.xml", cardfileURL);
+        writeFileFromURL(SCENARIOS_DIR+"/one-incident.xml", smallXMLURL);
     }
 
Index: trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java	(revision 558)
+++ trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java	(revision 658)
@@ -14,5 +14,5 @@
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -138,5 +138,5 @@
 
         // Load a script file
-        String autoloadScriptname = kScenarioFolder+"/audio_systest.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/audio_systest.xml";
         simMgrApp.loadScript(new File(autoloadScriptname));
         try
Index: trunk/test/tmcsim/cadsimulator/SystemTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 657)
+++ trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 658)
@@ -15,5 +15,5 @@
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -98,5 +98,5 @@
 
         // Load a script file
-        String autoloadScriptname = kScenarioFolder+"/system_test_script.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/system_test_script.xml";
         simMgrApp.loadScript(new File(autoloadScriptname));
         try
Index: trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 558)
+++ trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 658)
@@ -17,5 +17,5 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -110,5 +110,5 @@
 
         // Load a script file
-        String autoloadScriptname = kScenarioFolder+"/practice_script_2016.xml";
+        String autoloadScriptname = SCENARIOS_DIR+"/practice_script_2016.xml";
         SimulationManagerModel simMgrModel = simMgrApp.theSimManagerModel;
         simMgrModel.loadScript(new File(autoloadScriptname));