Index: trunk/src/tmcsim/cadsimulator/CADServer.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 355)
+++ trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 360)
@@ -181,5 +181,5 @@
      * Properties file for the CADSimulator.
      */
-    private Properties cadSimulatorProperties;
+    private Properties cadServerProperties;
 
     /**
@@ -199,6 +199,6 @@
         try
         {
-            cadSimulatorProperties = new Properties();
-            cadSimulatorProperties.load(new FileInputStream(propertiesFile));
+            cadServerProperties = new Properties();
+            cadServerProperties.load(new FileInputStream(propertiesFile));
             cadSimLogger.logp(Level.INFO, "CADSimulator", "Constructor",
                     "Properties loaded from " + propertiesFile);
@@ -219,5 +219,5 @@
         {
             String userInterfaceName =
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.USER_INTERFACE.name);
             if (userInterfaceName == null)
@@ -244,8 +244,8 @@
 
             startRegistry(Integer.parseInt(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.COOR_RMI_PORT.name).trim()));
             startRegistry(Integer.parseInt(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.CAD_RMI_PORT.name).trim()));
 
@@ -253,9 +253,9 @@
 
             theATMSMgr = new ATMSManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.ATMS_PROP_FILE.name));
             
             theTrafficMgr = new TrafficModelManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.TRAFFICMGR_PROP_FILE.name),
                     theCoordinator);
@@ -264,15 +264,15 @@
 
             theMediaMgr = new MediaManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.MEDIA_PROP_FILE.name),
                     theATMSMgr, theModel);
 
             theParamicsSimMgr = new ParamicsSimulationManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.PARAMICS_PROP_FILE.name),
                     theCoordinator, theMediaMgr);
 
             theSoundPlayer = new SoundPlayer(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.AUDIO_LOCATION.name));
             theSoundPlayer.start();
@@ -283,5 +283,5 @@
             //Begin accepting Client connections
             CADSimulatorSocketHandler tmsh = new CADSimulatorSocketHandler(
-                    Integer.parseInt(cadSimulatorProperties.getProperty(
+                    Integer.parseInt(cadServerProperties.getProperty(
                     CAD_PROPERTIES.CLIENT_PORT.name).trim()));
             tmsh.start();
@@ -297,10 +297,10 @@
         try
         {
-            if (cadSimulatorProperties.getProperty(
+            if (cadServerProperties.getProperty(
                     CAD_PROPERTIES.CMS_XML_FILE.name) != null)
             {
                 CMSDiversionDB.getInstance().loadFromXML(
                         DocumentBuilderFactory.newInstance().newDocumentBuilder()
-                        .parse(new File(cadSimulatorProperties.getProperty(
+                        .parse(new File(cadServerProperties.getProperty(
                         CAD_PROPERTIES.CMS_XML_FILE.name))));
             }
@@ -311,5 +311,5 @@
 
             JOptionPane.showMessageDialog(new JWindow(), "Unable to open "
-                    + cadSimulatorProperties.getProperty(CAD_PROPERTIES.CMS_XML_FILE.name),
+                    + cadServerProperties.getProperty(CAD_PROPERTIES.CMS_XML_FILE.name),
                     "Initialization Error", JOptionPane.WARNING_MESSAGE);
         }