Index: trunk/src/tmcsim/client/ATMSBatchDriver.java
===================================================================
--- trunk/src/tmcsim/client/ATMSDriverClient.java	(revision 112)
+++ trunk/src/tmcsim/client/ATMSBatchDriver.java	(revision 120)
@@ -43,5 +43,5 @@
  * @author jdalbey
  */
-public class ATMSDriverClient extends UnicastRemoteObject implements
+public class ATMSBatchDriver extends UnicastRemoteObject implements
         CADClientInterface
 {
@@ -114,5 +114,5 @@
      * file containing configuration data.
      */
-    public ATMSDriverClient(String propertiesFile) throws SimulationException,
+    public ATMSBatchDriver(String propertiesFile) throws SimulationException,
             RemoteException
     {
@@ -149,5 +149,5 @@
                         simClock = formatter.parse(currentClock);
                     } catch (ParseException ex) {
-                        Logger.getLogger(ATMSDriverClient.class.getName()).log(Level.SEVERE, null, ex);
+                        Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
                         System.out.println("Invalid simulation clock time found in ATMSDriverClient");
                         System.exit(-1);
@@ -156,5 +156,5 @@
                 } catch (RemoteException ex)
                 {
-                    Logger.getLogger(ATMSDriverClient.class.getName()).log(Level.SEVERE, null, ex);
+                    Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 // If we have any events left to process
@@ -168,5 +168,5 @@
                         eventTime = formatter.parse(eventTimeField);
                     } catch (ParseException ex) {
-                        Logger.getLogger(ATMSDriverClient.class.getName()).log(Level.WARNING, null, ex);
+                        Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.WARNING, null, ex);
                         System.out.println("Unable to parse event time: " + nextEvent + " skipping.");
                         eventQueue.remove();
@@ -220,5 +220,5 @@
             }
         } catch (FileNotFoundException ex) {
-            Logger.getLogger(ATMSDriverClient.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
@@ -344,5 +344,5 @@
         {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new ATMSDriverClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            new ATMSBatchDriver(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
 
         } catch (Exception e)