Index: /trunk/src/tmcsim/cadsimulator/Coordinator.java
===================================================================
--- /trunk/src/tmcsim/cadsimulator/Coordinator.java	(revision 657)
+++ /trunk/src/tmcsim/cadsimulator/Coordinator.java	(revision 658)
@@ -83,7 +83,7 @@
 import tmcsim.interfaces.CoordinatorInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 import tmcsim.simulationmanager.SimulationManagerView;
 import tmcsim.simulationmanager.actions.LoadScriptAction;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -167,5 +167,5 @@
         try
         {
-            CardfileReader cfr = new CardfileReader(kScenarioFolder+"/Cardfile.xml", cardfileData);
+            CardfileReader cfr = new CardfileReader(SCENARIOS_DIR+"/Cardfile.xml", cardfileData);
         } catch (Exception e)
         {
Index: /trunk/src/tmcsim/simulationmanager/SimulationManager.java
===================================================================
--- /trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 559)
+++ /trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 658)
@@ -48,7 +48,8 @@
     private static final String CONFIG_FILE_NAME = "sim_manager_config.properties";
     /*
-     * Name of filesystem folder that contains Scenario xml files.  
+     * Default name of folder that contains Scenario xml files.
+     * Actual name retrieved from config file.
     */
-    public static final String kScenarioFolder = "Scenarios";
+    public static String SCENARIOS_DIR = "Scenarios";
     /**
      * Error logger.
@@ -66,5 +67,5 @@
         CAD_SIM_HOST("CADSimulatorHost"),
         CAD_SIM_PORT("CADSimulatorRMIPort"),
-        SCRIPT_DIR("ScriptDir"),
+        SCENARIOS_DIR("ScenariosDir"),
         FAKE_PARAMICS("FakeParamicsConnection");
         public String name;
@@ -111,6 +112,6 @@
             simManagerProperties.load(new FileInputStream(new File(propertiesFile)));
 
-            SimulationManagerView.SCRIPT_DIR =
-                    simManagerProperties.getProperty(PROPERTIES.SCRIPT_DIR.name).trim();
+            SCENARIOS_DIR =
+                    simManagerProperties.getProperty(PROPERTIES.SCENARIOS_DIR.name).trim();
 
             //make sure properties aren't null
@@ -229,5 +230,5 @@
             {
                 arg1 = args[0];
-                File scriptFile = new File(kScenarioFolder+ System.getProperty("file.separator") + arg1);
+                File scriptFile = new File(SCENARIOS_DIR+ System.getProperty("file.separator") + arg1);
                 // if the script file exists, load it and show name in title bar
                 if (scriptFile.exists())
Index: /trunk/src/tmcsim/simulationmanager/actions/AddIncidentAction.java
===================================================================
--- /trunk/src/tmcsim/simulationmanager/actions/AddIncidentAction.java	(revision 2)
+++ /trunk/src/tmcsim/simulationmanager/actions/AddIncidentAction.java	(revision 658)
@@ -15,4 +15,5 @@
 import tmcsim.common.SimulationException;
 import tmcsim.common.CADEnums.SCRIPT_STATUS;
+import tmcsim.simulationmanager.SimulationManager;
 import tmcsim.simulationmanager.SimulationManagerView;
 import tmcsim.simulationmanager.dialogs.AddIncidentDialog;
@@ -60,5 +61,5 @@
                 try{                
                     JFileChooser chooser   = new JFileChooser(
-                            SimulationManagerView.SCRIPT_DIR);
+                            SimulationManager.SCENARIOS_DIR);
                     
                     chooser.setDialogTitle("Open Simulation Script File");
Index: /trunk/src/tmcsim/simulationmanager/actions/LoadScriptAction.java
===================================================================
--- /trunk/src/tmcsim/simulationmanager/actions/LoadScriptAction.java	(revision 6)
+++ /trunk/src/tmcsim/simulationmanager/actions/LoadScriptAction.java	(revision 658)
@@ -10,4 +10,5 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
+import tmcsim.simulationmanager.SimulationManager;
 import tmcsim.simulationmanager.SimulationManagerView;
 import tmcsim.simulationmanager.model.XmlFilter;
@@ -39,8 +40,7 @@
         SwingUtilities.invokeLater(new Runnable(){      
             public void run() { 
-                JFileChooser chooser = new JFileChooser(
-                        SimulationManagerView.SCRIPT_DIR);
+                JFileChooser chooser = new JFileChooser(SimulationManager.SCENARIOS_DIR);
                 
-                chooser.setDialogTitle("Open Simulation Script File");
+                chooser.setDialogTitle("Open Simulation Scenario File");
                 chooser.setMultiSelectionEnabled(false);        
                 chooser.setFileFilter(new XmlFilter());
Index: /trunk/src/tmcsim/simulationmanager/SimulationManagerView.java
===================================================================
--- /trunk/src/tmcsim/simulationmanager/SimulationManagerView.java	(revision 460)
+++ /trunk/src/tmcsim/simulationmanager/SimulationManagerView.java	(revision 658)
@@ -83,7 +83,4 @@
     /** Maximum Paramics network ID (100) */
     private static int MAX_NETWORK_ID    = 100;
-
-    /** Default directory for script loading. */
-    public static String SCRIPT_DIR      = ".";
 
     /** Reference to the simulation manager model. */
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/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/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));