--- a/dreactor/core/Vat.d	Tue Jul 08 12:16:07 2008 -0400
+++ b/dreactor/core/Vat.d	Tue Jul 08 12:23:26 2008 -0400
@@ -21,7 +21,7 @@
 import tango.util.log.Log;
 
 import dreactor.transport.AsyncSocketConduit;
-import dreactor.core.ConnectionHandler;
+import dreactor.core.Dispatcher;
 import dreactor.util.ThreadSafeQueue;
 
 Logger log;
@@ -37,13 +37,13 @@
     bool running;
     Atomic!(int) pending;
  
-    ThreadSafeQueue!(ConnectionHandler) freshList; 
-    ThreadSafeQueue!(ConnectionHandler) remList;
+    ThreadSafeQueue!(Dispatcher) freshList; 
+    ThreadSafeQueue!(Dispatcher) remList;
 public 
     this()
     {
-        freshList = new ThreadSafeQueue!(ConnectionHandler);
-        remList = new ThreadSafeQueue!(ConnectionHandler);
+        freshList = new ThreadSafeQueue!(Dispatcher);
+        remList = new ThreadSafeQueue!(Dispatcher);
         log = Log.lookup("dreactor.core.Vat");
     }
 
@@ -59,13 +59,13 @@
         running = false;
     }
 
-    bool addConnection(ConnectionHandler handler)
+    bool addConnection(Dispatcher handler)
     {
         log.trace("adding handler");
         return freshList.push(handler);       
     }
      
-    bool remConnection(ConnectionHandler handler)
+    bool remConnection(Dispatcher handler)
     {
         return remList.push(handler);
     }
@@ -88,8 +88,8 @@
                     {
                         // incoming data
                         log.trace("Read event fired");    
-                        auto conn = cast(ConnectionHandler) key.attachment;
-                        if ( ConnectionHandler.State.listening == conn.getState() )
+                        auto conn = cast(Dispatcher) key.attachment;
+                        if ( Dispatcher.State.listening == conn.getState() )
                             conn.handleConnection(conn.transport, &addConnection);
                         else
                             processReturn(conn.handleIncoming(), selector, conn);
@@ -97,20 +97,20 @@
                     else if (key.isWritable())
                     {
                         log.trace("Write event fired");    
-                        auto conn = cast(ConnectionHandler) key.attachment;
+                        auto conn = cast(Dispatcher) key.attachment;
                         processReturn(conn.handleOutgoing(), selector, conn);
                     }
                     else if (key.isHangup())
                     {
                         log.trace("Hangup event fired");
-                        auto conn = cast(ConnectionHandler) key.attachment;
+                        auto conn = cast(Dispatcher) key.attachment;
                         processReturn(conn.handleDisconnect(), selector, conn);
                     }
                     else if (key.isError() || key.isInvalidHandle())
                     {
                         log.trace("Error event fired");    
                         // error, close connection
-                        auto conn = cast(ConnectionHandler) key.attachment;
+                        auto conn = cast(Dispatcher) key.attachment;
                         conn.handleError(&remConnection);
                     }
                 }
@@ -124,12 +124,12 @@
                 log.error("Selector.select returned {}", eventCount);
             }
             //add Conduits to listener
-            freshList.processAll( (ref ConnectionHandler h)
+            freshList.processAll( (ref Dispatcher h)
             {
                 selector.reregister(h.transport, h.events(), h);
                 return 1; 
             });
-            remList.processAll( (ref ConnectionHandler h)
+            remList.processAll( (ref Dispatcher h)
             {
                 selector.unregister(h.transport);
                 return 1;
@@ -139,7 +139,7 @@
 
     }
 
-    void processReturn(int result, Selector s, ConnectionHandler h)
+    void processReturn(int result, Selector s, Dispatcher h)
     {
         switch(result)
         {