Index: trunk/src/tmcsim/cadsimulator/CADServer.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/CADSimulator.java	(revision 49)
+++ trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 123)
@@ -19,6 +19,6 @@
 import tmcsim.cadsimulator.managers.MediaManager;
 import tmcsim.cadsimulator.managers.ParamicsSimulationManager;
-import tmcsim.cadsimulator.managers.SimulationControlManager;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.managers.SimulationClockManager;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.SimulationException;
 import tmcsim.interfaces.CADViewer;
@@ -64,5 +64,5 @@
  * @version $Date: 2009/04/17 16:27:46 $ $Revision: 1.5 $
  */
-public class CADSimulator
+public class CADServer
 {
 
@@ -78,5 +78,5 @@
      *
      * @author Matthew
-     * @see CADSimulator
+     * @see CADServer
      */
     private static enum CAD_PROPERTIES
@@ -132,4 +132,5 @@
         }
     };
+    /** NOTE: Protected fields are accessed by Coordinator */
     /**
      * CADSimulatorViewer instance.
@@ -138,5 +139,5 @@
     //protected static CADSimulatorViewer theViewer;
     //protected static CADConsoleViewer theConsole;
-    protected static CADSimulatorModel theModel;
+    protected static CADSimulatorState theModel;
     /**
      * Coordinator instance.
@@ -150,5 +151,5 @@
      * SimulationControlManager instance.
      */
-    protected static SimulationControlManager theSimulationCntrlMgr = null;
+    protected static SimulationClockManager theSimulationCntrlMgr = null;
     /**
      * ParamicsSimulationManager instance.
@@ -183,5 +184,5 @@
      * Simulator.
      */
-    public CADSimulator(String propertiesFile) throws SimulationException
+    public CADServer(String propertiesFile) throws SimulationException
     {
 
@@ -224,5 +225,5 @@
                 throw new SimulationException(SimulationException.INITIALIZE_ERROR);
             }
-            theModel = new CADSimulatorModel();
+            theModel = new CADSimulatorState();
             theModel.addObserver(theViewer);
 
@@ -236,5 +237,5 @@
                     CAD_PROPERTIES.CAD_RMI_PORT.name).trim()));
 
-            theSimulationCntrlMgr = new SimulationControlManager(theCoordinator);
+            theSimulationCntrlMgr = new SimulationClockManager(theCoordinator);
 
             theATMSMgr = new ATMSManager(
@@ -410,5 +411,5 @@
                     + System.getProperty("file.separator")
                     + CONFIG_FILE_NAME;
-            new CADSimulator(propFile);
+            new CADServer(propFile);
         } catch (Exception e)
         {