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/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");