Index: references/src/main/java/geniusweb/connection/Connectable.java
===================================================================
--- references/src/main/java/geniusweb/connection/Connectable.java	(revision 52)
+++ references/src/main/java/geniusweb/connection/Connectable.java	(revision 1)
@@ -2,8 +2,7 @@
 
 /**
- * A Connectable is an object that can connect on request with a provided
- * {@link ConnectionEnd} and then respond to incoming and outgong signals.
+ * a socket for a general two-way connection
  *
- * @param <INTYPE>  the type of incoming messages
+ * @param <INTYPE> the type of incoming messages
  * @param <OUTTYPE> the type of outgoing messages
  */
@@ -14,5 +13,5 @@
 	 * @param connection the new connection
 	 */
-	void connect(ConnectionEnd<INTYPE, OUTTYPE> connection);
+	void connect(Connection<INTYPE, OUTTYPE> connection);
 
 	/**
Index: references/src/main/java/geniusweb/connection/Connection.java
===================================================================
--- references/src/main/java/geniusweb/connection/Connection.java	(revision 1)
+++ references/src/main/java/geniusweb/connection/Connection.java	(revision 1)
@@ -0,0 +1,65 @@
+package geniusweb.connection;
+
+import java.io.IOException;
+import java.net.SocketException;
+import java.net.URI;
+
+import geniusweb.references.Reference;
+import tudelft.utilities.listener.Listenable;
+
+/**
+ * A general two-way connection. incoming data is reported through the
+ * {@link Listenable} channel, sending events of the INTYPE.
+ * <p>
+ * If an internal error occurs, eg a socket failure, timeout, or parser error, a
+ * null event is sent into the Listenable and {@link #getError()} can be called
+ * to find out about the error.
+ *
+ * @param <INTYPE>  the type of incoming messages. Incoming messages are
+ *                  received through Listener#not. Incoming messages are usually
+ *                  asynchronous.
+ * @param <OUTTYPE> the type of outgoing messages. Outgoing messages can be sent
+ *                  directly with #send.
+ * 
+ */
+public interface Connection<INTYPE, OUTTYPE> extends Listenable<INTYPE> {
+
+	/**
+	 * Send data out (and flush the output so that there are no excessive delays
+	 * in sending the data). This call is assumed to return immediately (never
+	 * block, eg on synchronized, Thread.sleep, IO, etc). When this is called
+	 * multiple times in sequence, the data should arrive at the receiver end in
+	 * the same order.
+	 * 
+	 * @param data the data to be sent.
+	 * @throws IOException if the data failed to be sent.
+	 */
+	void send(OUTTYPE data) throws IOException;
+
+	/**
+	 * @return Reference that was used to create this connection
+	 */
+	Reference getReference();
+
+	/**
+	 * @return the URI of the remote endpoint that makes up the connection. This
+	 *         is a URI that uniquely identifies the remote object
+	 */
+	URI getRemoteURI();
+
+	/**
+	 * Close the connection. Should return immediately (not block). Before
+	 * really closing, this should attempt to send out possibly cached messages
+	 * before closing the connection.
+	 * 
+	 */
+	void close();
+
+	/**
+	 * @return the latest internal error, or null if no error occured. If the
+	 *         channel is closed, this is set to {@link SocketException} "Socket
+	 *         closed", even if the close was a "normal" termination eg when
+	 *         {@link #close()} was called.
+	 */
+	Throwable getError();
+}
Index: references/src/main/java/geniusweb/connection/ConnectionEnd.java
===================================================================
--- references/src/main/java/geniusweb/connection/ConnectionEnd.java	(revision 52)
+++ 	(revision )
@@ -1,73 +1,0 @@
-package geniusweb.connection;
-
-import java.io.IOException;
-import java.net.SocketException;
-import java.net.URI;
-
-import geniusweb.references.Reference;
-import tudelft.utilities.listener.Listenable;
-
-/**
- * One end of a general two-way connection. incoming data is reported through
- * the {@link Listenable} channel, sending events of the INTYPE.
- * <p>
- * 
- * The connection mechanism assumed here is fundamentally asymmetric. One side
- * is "Connectable", the other side is a ConnectionEnd created (usually from a
- * {@link Reference}. This matches the typical client-server system (web
- * architecture).
- * 
- * <p>
- * If an internal error occurs, eg a socket failure, timeout, or parser error, a
- * null event is sent into the Listenable. {@link #getError()} can be called to
- * find out about the error.
- *
- * @param <INTYPE>  the type of incoming messages (incoming for the user of this
- *                  connection end). Incoming messages are received through
- *                  Listener#not. Incoming messages are usually asynchronous.
- * @param <OUTTYPE> the type of outgoing messages (outgoing for the user of this
- *                  connection end). Outgoing messages can be sent directly with
- *                  #send.
- * 
- */
-public interface ConnectionEnd<INTYPE, OUTTYPE> extends Listenable<INTYPE> {
-
-	/**
-	 * Send data out (and flush the output so that there are no excessive delays
-	 * in sending the data). This call is assumed to return immediately (never
-	 * block, eg on synchronized, Thread.sleep, IO, etc). When this is called
-	 * multiple times in sequence, the data should arrive at the receiver end in
-	 * the same order.
-	 * 
-	 * @param data the data to be sent.
-	 * @throws IOException if the data failed to be sent.
-	 */
-	void send(OUTTYPE data) throws IOException;
-
-	/**
-	 * @return Reference that was used to create this connection
-	 */
-	Reference getReference();
-
-	/**
-	 * @return the URI of the remote endpoint that makes up the connection. This
-	 *         is a URI that uniquely identifies the remote object
-	 */
-	URI getRemoteURI();
-
-	/**
-	 * Close the connection. Should return immediately (not block). Before
-	 * really closing, this should attempt to send out possibly cached messages
-	 * before closing the connection.
-	 * 
-	 */
-	void close();
-
-	/**
-	 * @return the latest internal error, or null if no error occured. If the
-	 *         channel is closed, this is set to {@link SocketException} "Socket
-	 *         closed", even if the close was a "normal" termination eg when
-	 *         {@link #close()} was called.
-	 */
-	Throwable getError();
-}
Index: references/src/main/java/geniusweb/connection/ConnectionFactory.java
===================================================================
--- references/src/main/java/geniusweb/connection/ConnectionFactory.java	(revision 52)
+++ references/src/main/java/geniusweb/connection/ConnectionFactory.java	(revision 1)
@@ -9,5 +9,4 @@
  * factory that can turn a {@link Reference} into a connection to that
  * reference.
- * 
  * 
  * @param <INTYPE>  the type of incoming messages. Incoming messages are
@@ -31,5 +30,5 @@
 	 *                                 the server. This suggest to retry later.
 	 */
-	ConnectionEnd<INTYPE, OUTTYPE> connect(Reference reference)
+	Connection<INTYPE, OUTTYPE> connect(Reference reference)
 			throws IOException, NoResourcesNowException;
 
Index: references/src/main/java/geniusweb/connection/DefaultConnection.java
===================================================================
--- references/src/main/java/geniusweb/connection/DefaultConnection.java	(revision 52)
+++ references/src/main/java/geniusweb/connection/DefaultConnection.java	(revision 1)
@@ -6,12 +6,12 @@
  * Default implementation of connection. Connection implementors only need to
  * implement the send (which moves the data sent into the connection to the
- * other side) and they can call
- * {@link DefaultListenable#notifyListeners(Object)} to inform the users of the
- * connection that something came in from the other side.
+ * other side) and they can call {@link DefaultListenable#notifyChange(Object)}
+ * to inform the users of the connection that something came in from the other
+ * side.
  *
- * @param <INTYPE>  the datatype of objects received from the other side
+ * @param <INTYPE> the datatype of objects received from the other side
  * @param <OUTTYPE> the datatype of objects sent to the other side.
  */
 public abstract class DefaultConnection<INTYPE, OUTTYPE> extends
-		DefaultListenable<INTYPE> implements ConnectionEnd<INTYPE, OUTTYPE> {
+		DefaultListenable<INTYPE> implements Connection<INTYPE, OUTTYPE> {
 }
