Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 47)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 123)
@@ -22,5 +22,5 @@
 {
 
-    static CADSimulator app;
+    static CADServer app;
     static final String configData =
             "CADClientPort          = 4444 \n"
Index: trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 52)
+++ trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 123)
@@ -30,5 +30,5 @@
 
     SimulationManager simMgrApp;
-    CADSimulator engine;
+    CADServer engine;
 
     public SystemConsoleTest(String testName)
@@ -52,5 +52,5 @@
         try
         {
-            engine = new CADSimulator("config/testConfig/cad_simulator_console_config.properties");
+            engine = new CADServer("config/testConfig/cad_simulator_console_config.properties");
         } catch (Exception e)
         {
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 47)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 123)
@@ -25,5 +25,5 @@
 {
 
-    private static CADSimulator app = null;
+    private static CADServer app = null;
     private CADConsoleViewer console;
     private StringWriter sw;
@@ -43,5 +43,5 @@
             try
             {
-                app = new CADSimulator("config.txt");
+                app = new CADServer("config.txt");
             } catch (Exception ex)
             {
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 47)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 123)
@@ -52,5 +52,5 @@
      * Test of main method, of class CADSimulator.
      */
-    CADSimulator app;
+    CADServer app;
 
     public void testConstructor() throws SimulationException, RemoteException, ScriptException
@@ -77,5 +77,5 @@
                     try
                     {
-                        app = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
+                        app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
 
                     } catch (Exception e)
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java	(revision 47)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java	(revision 123)
@@ -23,5 +23,5 @@
 {
 
-    static CADSimulator app;
+    static CADServer app;
     static ByteArrayOutputStream bos;
     static PrintStream ps;
@@ -109,5 +109,5 @@
             try
             {
-                app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                app = new CADServer(System.getProperty("CAD_SIM_PROPERTIES"));
             } catch (Exception ex)
             {
Index: trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java	(revision 49)
+++ trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java	(revision 123)
@@ -6,5 +6,5 @@
 import static junit.framework.Assert.assertTrue;
 import org.uispec4j.*;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.CADEnums;
 
@@ -18,5 +18,5 @@
     CADSimulatorViewer viewer;
     Window cadwindow;
-    CADSimulatorModel model;
+    CADSimulatorState model;
     Panel mainPanel;
 
@@ -32,5 +32,5 @@
         viewer = new CADSimulatorViewer();
         cadwindow = new Window(viewer);
-        model = new CADSimulatorModel();
+        model = new CADSimulatorState();
         model.addObserver(viewer);
         mainPanel = cadwindow.getPanel("contentPane");
Index: trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java	(revision 47)
+++ trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java	(revision 123)
@@ -5,5 +5,5 @@
 import java.util.logging.Logger;
 import junit.framework.TestCase;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.CADEnums;
 
@@ -16,5 +16,5 @@
 
     CADConsoleViewer console;
-    CADSimulatorModel cadmodel;
+    CADSimulatorState cadmodel;
     StringWriter sw;
 
@@ -29,5 +29,5 @@
         super.setUp();
         console = new CADConsoleViewer();
-        cadmodel = new CADSimulatorModel();
+        cadmodel = new CADSimulatorState();
         cadmodel.addObserver(console);
         sw = new StringWriter();
Index: trunk/test/tmcsim/cadsimulator/viewer/model/CADSimulatorModelTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/viewer/model/CADSimulatorModelTest.java	(revision 47)
+++ trunk/test/tmcsim/cadsimulator/viewer/model/CADSimulatorModelTest.java	(revision 123)
@@ -18,5 +18,5 @@
 {
 
-    private CADSimulatorModel model;
+    private CADSimulatorState model;
     private String currentTest;
 
@@ -28,5 +28,5 @@
     public void setUp()
     {
-        model = new CADSimulatorModel();
+        model = new CADSimulatorState();
         model.addObserver(this);
     }
Index: trunk/test/tmcsim/cadsimulator/SystemTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 52)
+++ trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 123)
@@ -26,5 +26,5 @@
 
     SimulationManager simMgrApp;
-    CADSimulator engine;
+    CADServer engine;
 //    ParamicsCommunicator paramicscomm;
 
@@ -53,5 +53,5 @@
                 try
                 {
-                    engine = new CADSimulator("config/testConfig/cad_simulator_config.properties");
+                    engine = new CADServer("config/testConfig/cad_simulator_config.properties");
                 } catch (Exception e)
                 {
Index: trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 44)
+++ trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 123)
@@ -14,5 +14,5 @@
 import org.uispec4j.Window;
 import org.uispec4j.interception.WindowInterceptor;
-import tmcsim.cadsimulator.CADSimulator;
+import tmcsim.cadsimulator.CADServer;
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
@@ -28,5 +28,5 @@
 
     SimulationManager simMgrApp;
-    CADSimulator engine;
+    CADServer engine;
 
     public SimulationManagerSmokeTest(String testName)
@@ -52,5 +52,5 @@
                     try
                     {
-                        engine = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        engine = new CADServer(System.getProperty("CAD_SIM_PROPERTIES"));
                     } catch (Exception e)
                     {
Index: trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java
===================================================================
--- trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java	(revision 47)
+++ trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java	(revision 123)
@@ -13,5 +13,5 @@
 import static junit.framework.Assert.fail;
 import junit.framework.TestCase;
-import tmcsim.cadsimulator.CADSimulator;
+import tmcsim.cadsimulator.CADServer;
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
@@ -44,5 +44,5 @@
         try
         {
-            CADSimulator engine = new CADSimulator("config/testConfig/cad_simulator_console_config.properties");
+            CADServer engine = new CADServer("config/testConfig/cad_simulator_console_config.properties");
         } catch (Exception e)
         {
Index: trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java
===================================================================
--- trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java	(revision 50)
+++ trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java	(revision 123)
@@ -12,5 +12,5 @@
 import static junit.framework.Assert.fail;
 import junit.framework.TestCase;
-import tmcsim.cadsimulator.CADSimulator;
+import tmcsim.cadsimulator.CADServer;
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
@@ -43,5 +43,5 @@
         try
         {
-            new CADSimulator("config/testConfig/cad_simulator_console_config.properties");
+            new CADServer("config/testConfig/cad_simulator_console_config.properties");
         } catch (Exception e)
         {