16 files changed, 144 insertions, 144 deletions

diff --git a/src/core/core_api.c b/src/core/core_api.c
index f3e30eb9a..6a1b88147 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -836,7 +836,7 @@ void
 GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
 {
   if (handle->th != NULL)
-    GNUNET_NETWORK_notify_transmit_ready_cancel (handle->th);
+    GNUNET_NETWORK_connection_notify_transmit_ready_cancel (handle->th);
   if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task);
   GNUNET_CLIENT_disconnect (handle->client);
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 6f6129f77..a6a64a9fd 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1021,7 +1021,7 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
           else
             prev->next = pos->next;
           if (pos->th != NULL)
-            GNUNET_NETWORK_notify_transmit_ready_cancel (pos->th);
+            GNUNET_NETWORK_connection_notify_transmit_ready_cancel (pos->th);
           while (NULL != (e = pos->event_head))
             {
               pos->event_head = e->next;
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index eb8e1d127..b73691b79 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -109,7 +109,7 @@ void GNUNET_CLIENT_receive (struct GNUNET_CLIENT_Connection *sock,
  * @param notify_cls closure for notify
  * @return NULL if someone else is already waiting to be notified
  *         non-NULL if the notify callback was queued (can be used to cancel
- *         using GNUNET_NETWORK_notify_transmit_ready_cancel)
+ *         using GNUNET_NETWORK_connection_notify_transmit_ready_cancel)
  */
 struct GNUNET_NETWORK_TransmitHandle
   *GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *sock,
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 26a39d575..68ca346e5 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -44,9 +44,9 @@ extern "C"
 #define GNUNET_NETWORK_CONNECT_RETRY_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 /**
- * @brief handle for a network socket
+ * @brief handle for a network connection
  */
-struct GNUNET_NETWORK_SocketHandle;
+struct GNUNET_NETWORK_ConnectionHandle;
 
 
 /**
@@ -93,8 +93,8 @@ typedef void (*GNUNET_NETWORK_Receiver) (void *cls,
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the boxed socket handle
  */
-struct GNUNET_NETWORK_SocketHandle
-  *GNUNET_NETWORK_socket_create_from_existing (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle
+  *GNUNET_NETWORK_connection_create_from_existing (struct GNUNET_SCHEDULER_Handle
                                                *sched, int osSocket,
                                                size_t maxbuf);
 
@@ -111,8 +111,8 @@ struct GNUNET_NETWORK_SocketHandle
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the socket handle, NULL on error (for example, access refused)
  */
-struct GNUNET_NETWORK_SocketHandle
-  *GNUNET_NETWORK_socket_create_from_accept (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle
+  *GNUNET_NETWORK_connection_create_from_accept (struct GNUNET_SCHEDULER_Handle
                                              *sched,
                                              GNUNET_NETWORK_AccessCheck
                                              access, void *access_cls,
@@ -131,8 +131,8 @@ struct GNUNET_NETWORK_SocketHandle
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the socket handle
  */
-struct GNUNET_NETWORK_SocketHandle
-  *GNUNET_NETWORK_socket_create_from_connect (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle
+  *GNUNET_NETWORK_connection_create_from_connect (struct GNUNET_SCHEDULER_Handle
                                               *sched, const char *hostname,
                                               uint16_t port, size_t maxbuf);
 
@@ -151,8 +151,8 @@ struct GNUNET_NETWORK_SocketHandle
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the socket handle
  */
-struct GNUNET_NETWORK_SocketHandle
-  *GNUNET_NETWORK_socket_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle
+  *GNUNET_NETWORK_connection_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
                                                *sched, int af_family,
                                                const struct sockaddr
                                                *serv_addr, socklen_t addrlen,
@@ -166,7 +166,7 @@ struct GNUNET_NETWORK_SocketHandle
  * @param sock socket to check
  * @return GNUNET_YES if valid, GNUNET_NO otherwise
  */
-int GNUNET_NETWORK_socket_check (struct GNUNET_NETWORK_SocketHandle *sock);
+int GNUNET_NETWORK_connection_check (struct GNUNET_NETWORK_ConnectionHandle *sock);
 
 
 /**
@@ -177,7 +177,7 @@ int GNUNET_NETWORK_socket_check (struct GNUNET_NETWORK_SocketHandle *sock);
  * @param addrlen where to store the length of the address
  * @return GNUNET_OK on success
  */
-int GNUNET_NETWORK_socket_get_address (struct GNUNET_NETWORK_SocketHandle
+int GNUNET_NETWORK_connection_get_address (struct GNUNET_NETWORK_ConnectionHandle
                                        *sock, void **addr, size_t * addrlen);
 
 /**
@@ -187,7 +187,7 @@ int GNUNET_NETWORK_socket_get_address (struct GNUNET_NETWORK_SocketHandle
  *
  * @param sock socket to destroy
  */
-void GNUNET_NETWORK_socket_destroy (struct GNUNET_NETWORK_SocketHandle *sock);
+void GNUNET_NETWORK_connection_destroy (struct GNUNET_NETWORK_ConnectionHandle *sock);
 
 
 /**
@@ -205,7 +205,7 @@ void GNUNET_NETWORK_socket_destroy (struct GNUNET_NETWORK_SocketHandle *sock);
  * @return scheduler task ID used for receiving, GNUNET_SCHEDULER_NO_TASK on error
  */
 GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_NETWORK_receive (struct GNUNET_NETWORK_SocketHandle *sock,
+GNUNET_NETWORK_connection_receive (struct GNUNET_NETWORK_ConnectionHandle *sock,
                         size_t max,
                         struct GNUNET_TIME_Relative timeout,
                         GNUNET_NETWORK_Receiver receiver, void *receiver_cls);
@@ -220,7 +220,7 @@ GNUNET_NETWORK_receive (struct GNUNET_NETWORK_SocketHandle *sock,
  * @param task task identifier returned from the receive call
  * @return closure of the original receiver callback
  */
-void *GNUNET_NETWORK_receive_cancel (struct GNUNET_NETWORK_SocketHandle *sock,
+void *GNUNET_NETWORK_connection_receive_cancel (struct GNUNET_NETWORK_ConnectionHandle *sock,
                                      GNUNET_SCHEDULER_TaskIdentifier task);
 
 
@@ -275,7 +275,7 @@ struct GNUNET_NETWORK_TransmitHandle;
  *         NULL if we are already going to notify someone else (busy)
  */
 struct GNUNET_NETWORK_TransmitHandle
-  *GNUNET_NETWORK_notify_transmit_ready (struct GNUNET_NETWORK_SocketHandle
+  *GNUNET_NETWORK_connection_notify_transmit_ready (struct GNUNET_NETWORK_ConnectionHandle
                                          *sock, size_t size,
                                          struct GNUNET_TIME_Relative timeout,
                                          GNUNET_NETWORK_TransmitReadyNotify
@@ -289,7 +289,7 @@ struct GNUNET_NETWORK_TransmitHandle
  * @param h handle for notification to cancel
  */
 void
-GNUNET_NETWORK_notify_transmit_ready_cancel (struct
+GNUNET_NETWORK_connection_notify_transmit_ready_cancel (struct
                                              GNUNET_NETWORK_TransmitHandle
                                              *h);
 
diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index aa79d7833..82085ad0d 100644
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -175,7 +175,7 @@ GNUNET_SERVER_add_handlers (struct GNUNET_SERVER_Handle *server,
  * @param callback_cls closure for callback
  * @return non-NULL if the notify callback was queued; can be used
  *           to cancel the request using
- *           GNUNET_NETWORK_notify_transmit_ready_cancel.
+ *           GNUNET_NETWORK_connection_notify_transmit_ready_cancel.
  *         NULL if we are already going to notify someone else (busy)
  */
 struct GNUNET_NETWORK_TransmitHandle
@@ -238,7 +238,7 @@ struct GNUNET_SERVER_Client *GNUNET_SERVER_connect_socket (struct
                                                            GNUNET_SERVER_Handle
                                                            *server,
                                                            struct
-                                                           GNUNET_NETWORK_SocketHandle
+                                                           GNUNET_NETWORK_ConnectionHandle
                                                            *connection);
 
 
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 7585e26e8..764ef8b2f 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -357,7 +357,7 @@ struct Plugin
   /**
    * The listen socket.
    */
-  struct GNUNET_NETWORK_SocketHandle *lsock;
+  struct GNUNET_NETWORK_ConnectionHandle *lsock;
 
   /**
    * List of open TCP sessions.
@@ -652,7 +652,7 @@ connect_and_create_validation_session (struct Plugin *plugin,
                                        const void *addr, size_t addrlen)
 {
   struct GNUNET_SERVER_Client *client;
-  struct GNUNET_NETWORK_SocketHandle *conn;
+  struct GNUNET_NETWORK_ConnectionHandle *conn;
   struct Session *session;
   int af;
 
@@ -665,7 +665,7 @@ connect_and_create_validation_session (struct Plugin *plugin,
       GNUNET_break_op (0);
       return NULL;              /* invalid address */
     }
-  conn = GNUNET_NETWORK_socket_create_from_sockaddr (plugin->env->sched,
+  conn = GNUNET_NETWORK_connection_create_from_sockaddr (plugin->env->sched,
                                                      af,
                                                      addr,
                                                      addrlen,
@@ -796,7 +796,7 @@ disconnect_session (struct Session *session)
   /* clean up state */
   if (session->transmit_handle != NULL)
     {
-      GNUNET_NETWORK_notify_transmit_ready_cancel (session->transmit_handle);
+      GNUNET_NETWORK_connection_notify_transmit_ready_cancel (session->transmit_handle);
       session->transmit_handle = NULL;
     }
   while (NULL != (pm = session->pending_messages))
@@ -877,7 +877,7 @@ struct ConnectContext
 {
   struct Plugin *plugin;
 
-  struct GNUNET_NETWORK_SocketHandle *sa;
+  struct GNUNET_NETWORK_ConnectionHandle *sa;
 
   struct PendingMessage *welcome;
 
@@ -923,7 +923,7 @@ try_connect_to_address (void *cls,
     {
       cc->welcome = create_welcome (addrlen, addr, cc->plugin);
       cc->sa =
-        GNUNET_NETWORK_socket_create_from_sockaddr (cc->plugin->env->sched,
+        GNUNET_NETWORK_connection_create_from_sockaddr (cc->plugin->env->sched,
                                                     af, addr, addrlen,
                                                     GNUNET_SERVER_MAX_MESSAGE_SIZE);
 #if DEBUG_TCP
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 3a5c8e0f5..93efcb4ba 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -1573,7 +1573,7 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
 #endif
           if (h->network_handle != NULL)
             {
-              GNUNET_NETWORK_notify_transmit_ready_cancel (h->network_handle);
+              GNUNET_NETWORK_connection_notify_transmit_ready_cancel (h->network_handle);
               h->network_handle = NULL;
               h->transmission_scheduled = GNUNET_NO;
               th = h->connect_ready_head;
@@ -1964,7 +1964,7 @@ GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
   h = th->handle;
   if ((h->connect_ready_head == NULL) && (h->network_handle != NULL))
     {
-      GNUNET_NETWORK_notify_transmit_ready_cancel (h->network_handle);
+      GNUNET_NETWORK_connection_notify_transmit_ready_cancel (h->network_handle);
       h->network_handle = NULL;
       h->transmission_scheduled = GNUNET_NO;
     }
diff --git a/src/util/client.c b/src/util/client.c
index ab50d9d4d..4e6e09066 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -48,7 +48,7 @@ struct GNUNET_CLIENT_Connection
   /**
    * the socket handle, NULL if not live
    */
-  struct GNUNET_NETWORK_SocketHandle *sock;
+  struct GNUNET_NETWORK_ConnectionHandle *sock;
 
   /**
    * Our scheduler.
@@ -127,7 +127,7 @@ GNUNET_CLIENT_connect (struct GNUNET_SCHEDULER_Handle *sched,
                        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_CLIENT_Connection *ret;
-  struct GNUNET_NETWORK_SocketHandle *sock;
+  struct GNUNET_NETWORK_ConnectionHandle *sock;
   char *hostname;
   unsigned long long port;
 
@@ -147,7 +147,7 @@ GNUNET_CLIENT_connect (struct GNUNET_SCHEDULER_Handle *sched,
                   service_name);
       return NULL;
     }
-  sock = GNUNET_NETWORK_socket_create_from_connect (sched,
+  sock = GNUNET_NETWORK_connection_create_from_connect (sched,
                                                     hostname,
                                                     port,
                                                     GNUNET_SERVER_MAX_MESSAGE_SIZE);
@@ -184,7 +184,7 @@ void
 GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock)
 {
   GNUNET_assert (sock->sock != NULL);
-  GNUNET_NETWORK_socket_destroy (sock->sock);
+  GNUNET_NETWORK_connection_destroy (sock->sock);
   sock->sock = NULL;
   sock->receiver_handler = NULL;
   GNUNET_SCHEDULER_add_after (sock->sched,
@@ -331,7 +331,7 @@ GNUNET_CLIENT_receive (struct GNUNET_CLIENT_Connection *sock,
                                                       GNUNET_SCHEDULER_NO_TASK,
                                                       &receive_task, sock);
   else
-    sock->receiver_task = GNUNET_NETWORK_receive (sock->sock,
+    sock->receiver_task = GNUNET_NETWORK_connection_receive (sock->sock,
                                                   GNUNET_SERVER_MAX_MESSAGE_SIZE,
                                                   timeout,
                                                   &receive_helper, sock);
@@ -362,7 +362,7 @@ write_shutdown (void *cls, size_t size, void *buf)
 void
 GNUNET_CLIENT_service_shutdown (struct GNUNET_CLIENT_Connection *sock)
 {
-  GNUNET_NETWORK_notify_transmit_ready (sock->sock,
+  GNUNET_NETWORK_connection_notify_transmit_ready (sock->sock,
                                         sizeof (struct GNUNET_MessageHeader),
                                         GNUNET_TIME_UNIT_FOREVER_REL,
                                         &write_shutdown, NULL);
@@ -478,7 +478,7 @@ GNUNET_CLIENT_service_test (struct GNUNET_SCHEDULER_Handle *sched,
   conn->test_cb = task;
   conn->test_cb_cls = task_cls;
   if (NULL ==
-      GNUNET_NETWORK_notify_transmit_ready (conn->sock,
+      GNUNET_NETWORK_connection_notify_transmit_ready (conn->sock,
                                             sizeof (struct
                                                     GNUNET_MessageHeader),
                                             timeout, &write_test, NULL))
@@ -515,7 +515,7 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *sock,
                                      GNUNET_NETWORK_TransmitReadyNotify
                                      notify, void *notify_cls)
 {
-  return GNUNET_NETWORK_notify_transmit_ready (sock->sock,
+  return GNUNET_NETWORK_connection_notify_transmit_ready (sock->sock,
                                                size,
                                                timeout, notify, notify_cls);
 }
diff --git a/src/util/network.c b/src/util/network.c
index 9b61bd8c2..3ee19cfb2 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -66,7 +66,7 @@ struct GNUNET_NETWORK_TransmitHandle
   /**
    * Our socket handle.
    */
-  struct GNUNET_NETWORK_SocketHandle *sh;
+  struct GNUNET_NETWORK_ConnectionHandle *sh;
 
   /**
    * Timeout for receiving (in absolute time).
@@ -89,7 +89,7 @@ struct GNUNET_NETWORK_TransmitHandle
 /**
  * @brief handle for a network socket
  */
-struct GNUNET_NETWORK_SocketHandle
+struct GNUNET_NETWORK_ConnectionHandle
 {
 
   /**
@@ -167,7 +167,7 @@ struct GNUNET_NETWORK_SocketHandle
   GNUNET_SCHEDULER_TaskIdentifier write_task;
 
   /**
-   * The handle we return for GNUNET_NETWORK_notify_transmit_ready.
+   * The handle we return for GNUNET_NETWORK_connection_notify_transmit_ready.
    */
   struct GNUNET_NETWORK_TransmitHandle nth;
 
@@ -217,13 +217,13 @@ struct GNUNET_NETWORK_SocketHandle
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the boxed socket handle
  */
-struct GNUNET_NETWORK_SocketHandle *
-GNUNET_NETWORK_socket_create_from_existing (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle *
+GNUNET_NETWORK_connection_create_from_existing (struct GNUNET_SCHEDULER_Handle
                                             *sched, int osSocket,
                                             size_t maxbuf)
 {
-  struct GNUNET_NETWORK_SocketHandle *ret;
-  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_SocketHandle) + maxbuf);
+  struct GNUNET_NETWORK_ConnectionHandle *ret;
+  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_ConnectionHandle) + maxbuf);
   ret->write_buffer = (char *) &ret[1];
   ret->write_buffer_size = maxbuf;
   ret->sock = osSocket;
@@ -244,14 +244,14 @@ GNUNET_NETWORK_socket_create_from_existing (struct GNUNET_SCHEDULER_Handle
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the socket handle, NULL on error
  */
-struct GNUNET_NETWORK_SocketHandle *
-GNUNET_NETWORK_socket_create_from_accept (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle *
+GNUNET_NETWORK_connection_create_from_accept (struct GNUNET_SCHEDULER_Handle
                                           *sched,
                                           GNUNET_NETWORK_AccessCheck access,
                                           void *access_cls, int lsock,
                                           size_t maxbuf)
 {
-  struct GNUNET_NETWORK_SocketHandle *ret;
+  struct GNUNET_NETWORK_ConnectionHandle *ret;
   char addr[32];
   socklen_t addrlen;
   int fd;
@@ -320,7 +320,7 @@ GNUNET_NETWORK_socket_create_from_accept (struct GNUNET_SCHEDULER_Handle
               _("Accepting connection from `%s'\n"),
               GNUNET_a2s(uaddr, addrlen));
 #endif
-  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_SocketHandle) + maxbuf);
+  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_ConnectionHandle) + maxbuf);
   ret->write_buffer = (char *) &ret[1];
   ret->write_buffer_size = maxbuf;
   ret->addr = uaddr;
@@ -339,7 +339,7 @@ GNUNET_NETWORK_socket_create_from_accept (struct GNUNET_SCHEDULER_Handle
  * @return GNUNET_OK on success
  */
 int
-GNUNET_NETWORK_socket_get_address (struct GNUNET_NETWORK_SocketHandle *sock,
+GNUNET_NETWORK_connection_get_address (struct GNUNET_NETWORK_ConnectionHandle *sock,
                                    void **addr, size_t * addrlen)
 {
   if ((sock->addr == NULL) || (sock->addrlen == 0))
@@ -414,7 +414,7 @@ socket_set_blocking (int handle, int doBlock)
  * families as specified in the "address_families" array.
  */
 static void
-try_lookup (struct GNUNET_NETWORK_SocketHandle *sock)
+try_lookup (struct GNUNET_NETWORK_ConnectionHandle *sock)
 {
   struct addrinfo hints;
   int ec;
@@ -446,7 +446,7 @@ try_lookup (struct GNUNET_NETWORK_SocketHandle *sock)
  * @return GNUNET_SYSERR error (no more addresses to try)
  */
 static int
-try_connect (struct GNUNET_NETWORK_SocketHandle *sock)
+try_connect (struct GNUNET_NETWORK_ConnectionHandle *sock)
 {
   int s;
 
@@ -536,7 +536,7 @@ static void
 connect_continuation (void *cls,
                       const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_NETWORK_SocketHandle *sock = cls;
+  struct GNUNET_NETWORK_ConnectionHandle *sock = cls;
   unsigned int len;
   int error;
 
@@ -605,14 +605,14 @@ connect_continuation (void *cls,
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the socket handle
  */
-struct GNUNET_NETWORK_SocketHandle *
-GNUNET_NETWORK_socket_create_from_connect (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle *
+GNUNET_NETWORK_connection_create_from_connect (struct GNUNET_SCHEDULER_Handle
                                            *sched, const char *hostname,
                                            uint16_t port, size_t maxbuf)
 {
-  struct GNUNET_NETWORK_SocketHandle *ret;
+  struct GNUNET_NETWORK_ConnectionHandle *ret;
 
-  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_SocketHandle) + maxbuf);
+  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_ConnectionHandle) + maxbuf);
   ret->sock = -1;
   ret->sched = sched;
   ret->write_buffer = (char *) &ret[1];
@@ -652,14 +652,14 @@ GNUNET_NETWORK_socket_create_from_connect (struct GNUNET_SCHEDULER_Handle
  *        0 for sockets that need no write buffers, such as listen sockets)
  * @return the socket handle
  */
-struct GNUNET_NETWORK_SocketHandle *
-GNUNET_NETWORK_socket_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
+struct GNUNET_NETWORK_ConnectionHandle *
+GNUNET_NETWORK_connection_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
                                             *sched, int af_family,
                                             const struct sockaddr *serv_addr,
                                             socklen_t addrlen, size_t maxbuf)
 {
   int s;
-  struct GNUNET_NETWORK_SocketHandle *ret;
+  struct GNUNET_NETWORK_ConnectionHandle *ret;
 
   s = SOCKET (af_family, SOCK_STREAM, 0);
   if (s == -1)
@@ -691,7 +691,7 @@ GNUNET_NETWORK_socket_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
       GNUNET_break (0 == CLOSE (s));
       return NULL;
     }
-  ret = GNUNET_NETWORK_socket_create_from_existing (sched, s, maxbuf);
+  ret = GNUNET_NETWORK_connection_create_from_existing (sched, s, maxbuf);
   ret->addr = GNUNET_malloc (addrlen);
   memcpy (ret->addr, serv_addr, addrlen);
   ret->addrlen = addrlen;
@@ -708,7 +708,7 @@ GNUNET_NETWORK_socket_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
  * @return GNUNET_YES if valid, GNUNET_NO otherwise
  */
 int
-GNUNET_NETWORK_socket_check (struct GNUNET_NETWORK_SocketHandle *sock)
+GNUNET_NETWORK_connection_check (struct GNUNET_NETWORK_ConnectionHandle *sock)
 {
   if (sock->ai != NULL)
     return GNUNET_YES;          /* still trying to connect */
@@ -724,7 +724,7 @@ static void
 destroy_continuation (void *cls,
                       const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_NETWORK_SocketHandle *sock = cls;
+  struct GNUNET_NETWORK_ConnectionHandle *sock = cls;
   GNUNET_NETWORK_TransmitReadyNotify notify;
 
   if (sock->write_task != GNUNET_SCHEDULER_NO_TASK)
@@ -780,7 +780,7 @@ destroy_continuation (void *cls,
  * @param sock socket to destroy
  */
 void
-GNUNET_NETWORK_socket_destroy (struct GNUNET_NETWORK_SocketHandle *sock)
+GNUNET_NETWORK_connection_destroy (struct GNUNET_NETWORK_ConnectionHandle *sock)
 {
   if (sock->write_buffer_off == 0)
     sock->ai_pos = NULL;        /* if we're still trying to connect and have
@@ -797,7 +797,7 @@ GNUNET_NETWORK_socket_destroy (struct GNUNET_NETWORK_SocketHandle *sock)
  * Tell the receiver callback that a timeout was reached.
  */
 static void
-signal_timeout (struct GNUNET_NETWORK_SocketHandle *sh)
+signal_timeout (struct GNUNET_NETWORK_ConnectionHandle *sh)
 {
   GNUNET_NETWORK_Receiver receiver;
 
@@ -815,7 +815,7 @@ signal_timeout (struct GNUNET_NETWORK_SocketHandle *sh)
  * Tell the receiver callback that we had an IO error.
  */
 static void
-signal_error (struct GNUNET_NETWORK_SocketHandle *sh, int errcode)
+signal_error (struct GNUNET_NETWORK_ConnectionHandle *sh, int errcode)
 {
   GNUNET_NETWORK_Receiver receiver;
   GNUNET_assert (NULL != (receiver = sh->receiver));
@@ -831,7 +831,7 @@ signal_error (struct GNUNET_NETWORK_SocketHandle *sh, int errcode)
 static void
 receive_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_NETWORK_SocketHandle *sh = cls;
+  struct GNUNET_NETWORK_ConnectionHandle *sh = cls;
   struct GNUNET_TIME_Absolute now;
   char buffer[sh->max];
   ssize_t ret;
@@ -904,7 +904,7 @@ RETRY:
 static void
 receive_again (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_NETWORK_SocketHandle *sh = cls;
+  struct GNUNET_NETWORK_ConnectionHandle *sh = cls;
   struct GNUNET_TIME_Absolute now;
 
   sh->read_task = GNUNET_SCHEDULER_NO_TASK;
@@ -968,7 +968,7 @@ receive_again (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @return scheduler task ID used for receiving, GNUNET_SCHEDULER_NO_TASK on error
  */
 GNUNET_SCHEDULER_TaskIdentifier
-GNUNET_NETWORK_receive (struct GNUNET_NETWORK_SocketHandle *sock,
+GNUNET_NETWORK_connection_receive (struct GNUNET_NETWORK_ConnectionHandle *sock,
                         size_t max,
                         struct GNUNET_TIME_Relative timeout,
                         GNUNET_NETWORK_Receiver receiver, void *receiver_cls)
@@ -999,7 +999,7 @@ GNUNET_NETWORK_receive (struct GNUNET_NETWORK_SocketHandle *sock,
  * @return closure of the original receiver callback
  */
 void *
-GNUNET_NETWORK_receive_cancel (struct GNUNET_NETWORK_SocketHandle *sock,
+GNUNET_NETWORK_connection_receive_cancel (struct GNUNET_NETWORK_ConnectionHandle *sock,
                                GNUNET_SCHEDULER_TaskIdentifier task)
 {
   GNUNET_assert (sock->read_task == task);
@@ -1018,7 +1018,7 @@ GNUNET_NETWORK_receive_cancel (struct GNUNET_NETWORK_SocketHandle *sock,
  * @return GNUNET_YES if we were able to call notify
  */
 static int
-process_notify (struct GNUNET_NETWORK_SocketHandle *sock)
+process_notify (struct GNUNET_NETWORK_ConnectionHandle *sock)
 {
   size_t used;
   size_t avail;
@@ -1067,7 +1067,7 @@ process_notify (struct GNUNET_NETWORK_SocketHandle *sock)
 static void
 transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_NETWORK_SocketHandle *sock = cls;
+  struct GNUNET_NETWORK_ConnectionHandle *sock = cls;
   GNUNET_NETWORK_TransmitReadyNotify notify;
 
 #if DEBUG_NETWORK
@@ -1080,7 +1080,7 @@ transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-transmit_error (struct GNUNET_NETWORK_SocketHandle *sock)
+transmit_error (struct GNUNET_NETWORK_ConnectionHandle *sock)
 {
   if (sock->nth.notify_ready == NULL)
     return;                     /* nobody to tell about it */
@@ -1101,7 +1101,7 @@ transmit_error (struct GNUNET_NETWORK_SocketHandle *sock)
 static void
 transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_NETWORK_SocketHandle *sock = cls;
+  struct GNUNET_NETWORK_ConnectionHandle *sock = cls;
   ssize_t ret;
   size_t have;
 
@@ -1221,7 +1221,7 @@ SCHEDULE_WRITE:
  *         NULL if we are already going to notify someone else (busy)
  */
 struct GNUNET_NETWORK_TransmitHandle *
-GNUNET_NETWORK_notify_transmit_ready (struct GNUNET_NETWORK_SocketHandle
+GNUNET_NETWORK_connection_notify_transmit_ready (struct GNUNET_NETWORK_ConnectionHandle
                                       *sock, size_t size,
                                       struct GNUNET_TIME_Relative timeout,
                                       GNUNET_NETWORK_TransmitReadyNotify
@@ -1285,7 +1285,7 @@ GNUNET_NETWORK_notify_transmit_ready (struct GNUNET_NETWORK_SocketHandle
  * notification.
  */
 void
-GNUNET_NETWORK_notify_transmit_ready_cancel (struct
+GNUNET_NETWORK_connection_notify_transmit_ready_cancel (struct
                                              GNUNET_NETWORK_TransmitHandle *h)
 {
   GNUNET_assert (h->notify_ready != NULL);
diff --git a/src/util/server.c b/src/util/server.c
index 8ffc9c027..d518cbeec 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -312,7 +312,7 @@ process_listen_socket (void *cls,
                        const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_SERVER_Handle *server = cls;
-  struct GNUNET_NETWORK_SocketHandle *sock;
+  struct GNUNET_NETWORK_ConnectionHandle *sock;
   struct GNUNET_SERVER_Client *client;
   fd_set r;
 
@@ -329,7 +329,7 @@ process_listen_socket (void *cls,
     }
   GNUNET_assert (FD_ISSET (server->listen_socket, tc->read_ready));
   GNUNET_assert (!FD_ISSET (server->shutpipe[0], tc->read_ready));
-  sock = GNUNET_NETWORK_socket_create_from_accept (tc->sched,
+  sock = GNUNET_NETWORK_connection_create_from_accept (tc->sched,
                                                    server->access,
                                                    server->access_cls,
                                                    server->listen_socket,
@@ -867,20 +867,20 @@ sock_receive (void *cls,
               struct GNUNET_TIME_Relative timeout,
               GNUNET_NETWORK_Receiver receiver, void *receiver_cls)
 {
-  return GNUNET_NETWORK_receive (cls, max, timeout, receiver, receiver_cls);
+  return GNUNET_NETWORK_connection_receive (cls, max, timeout, receiver, receiver_cls);
 }
 
 
 /**
  * Wrapper to cancel receiving from a socket.
  * 
- * @param cls handle to the GNUNET_NETWORK_SocketHandle to cancel
- * @param tc task ID that was returned by GNUNET_NETWORK_receive
+ * @param cls handle to the GNUNET_NETWORK_ConnectionHandle to cancel
+ * @param tc task ID that was returned by GNUNET_NETWORK_connection_receive
  */
 static void
 sock_receive_cancel (void *cls, GNUNET_SCHEDULER_TaskIdentifier ti)
 {
-  GNUNET_NETWORK_receive_cancel (cls, ti);
+  GNUNET_NETWORK_connection_receive_cancel (cls, ti);
 }
 
 
@@ -894,7 +894,7 @@ sock_notify_transmit_ready (void *cls,
                             GNUNET_NETWORK_TransmitReadyNotify notify,
                             void *notify_cls)
 {
-  return GNUNET_NETWORK_notify_transmit_ready (cls, size, timeout, notify,
+  return GNUNET_NETWORK_connection_notify_transmit_ready (cls, size, timeout, notify,
                                                notify_cls);
 }
 
@@ -905,7 +905,7 @@ sock_notify_transmit_ready (void *cls,
 static void
 sock_notify_transmit_ready_cancel (void *cls, void *h)
 {
-  GNUNET_NETWORK_notify_transmit_ready_cancel (h);
+  GNUNET_NETWORK_connection_notify_transmit_ready_cancel (h);
 }
 
 
@@ -918,7 +918,7 @@ sock_notify_transmit_ready_cancel (void *cls, void *h)
 static int
 sock_check (void *cls)
 {
-  return GNUNET_NETWORK_socket_check (cls);
+  return GNUNET_NETWORK_connection_check (cls);
 }
 
 
@@ -930,7 +930,7 @@ sock_check (void *cls)
 static void
 sock_destroy (void *cls)
 {
-  GNUNET_NETWORK_socket_destroy (cls);
+  GNUNET_NETWORK_connection_destroy (cls);
 }
 
 
@@ -950,7 +950,7 @@ struct GNUNET_SERVER_Client *
 GNUNET_SERVER_connect_socket (struct
                               GNUNET_SERVER_Handle
                               *server,
-                              struct GNUNET_NETWORK_SocketHandle *connection)
+                              struct GNUNET_NETWORK_ConnectionHandle *connection)
 {
   struct GNUNET_SERVER_Client *client;
 
@@ -1064,7 +1064,7 @@ GNUNET_SERVER_client_get_address (struct GNUNET_SERVER_Client *client,
 {
   if (client->receive != &sock_receive)
     return GNUNET_SYSERR;       /* not a network client */
-  return GNUNET_NETWORK_socket_get_address (client->client_closure,
+  return GNUNET_NETWORK_connection_get_address (client->client_closure,
                                             addr, addrlen);
 }
 
@@ -1127,7 +1127,7 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client)
  * @param callback_cls closure for callback
  * @return non-NULL if the notify callback was queued; can be used
  *           to cancel the request using
- *           GNUNET_NETWORK_notify_transmit_ready_cancel.
+ *           GNUNET_NETWORK_connection_notify_transmit_ready_cancel.
  *         NULL if we are already going to notify someone else (busy)
  */
 struct GNUNET_NETWORK_TransmitHandle *
diff --git a/src/util/test_network.c b/src/util/test_network.c
index 02555c299..cb0656921 100644
--- a/src/util/test_network.c
+++ b/src/util/test_network.c
@@ -32,11 +32,11 @@
 #define PORT 12435
 
 
-static struct GNUNET_NETWORK_SocketHandle *csock;
+static struct GNUNET_NETWORK_ConnectionHandle *csock;
 
-static struct GNUNET_NETWORK_SocketHandle *asock;
+static struct GNUNET_NETWORK_ConnectionHandle *asock;
 
-static struct GNUNET_NETWORK_SocketHandle *lsock;
+static struct GNUNET_NETWORK_ConnectionHandle *lsock;
 
 static size_t sofar;
 
@@ -88,7 +88,7 @@ receive_check (void *cls,
 #if VERBOSE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receive needs more data\n");
 #endif
-      GNUNET_NETWORK_receive (asock,
+      GNUNET_NETWORK_connection_receive (asock,
                               1024,
                               GNUNET_TIME_relative_multiply
                               (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
@@ -101,7 +101,7 @@ receive_check (void *cls,
                   "Receive closes accepted socket\n");
 #endif
       *ok = 0;
-      GNUNET_NETWORK_socket_destroy (asock);
+      GNUNET_NETWORK_connection_destroy (asock);
     }
 }
 
@@ -112,19 +112,19 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test accepts connection\n");
 #endif
-  asock = GNUNET_NETWORK_socket_create_from_accept (tc->sched,
+  asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched,
                                                     NULL, NULL, ls, 1024);
   GNUNET_assert (asock != NULL);
-  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_socket_check (asock));
+  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock));
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys listen socket\n");
 #endif
-  GNUNET_NETWORK_socket_destroy (lsock);
+  GNUNET_NETWORK_connection_destroy (lsock);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Test asks to receive on accepted socket\n");
 #endif
-  GNUNET_NETWORK_receive (asock,
+  GNUNET_NETWORK_connection_receive (asock,
                           1024,
                           GNUNET_TIME_relative_multiply
                           (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls);
@@ -146,23 +146,23 @@ static void
 task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   ls = open_listen_socket ();
-  lsock = GNUNET_NETWORK_socket_create_from_existing (tc->sched, ls, 0);
+  lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0);
   GNUNET_assert (lsock != NULL);
-  csock = GNUNET_NETWORK_socket_create_from_connect (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched,
                                                      "localhost", PORT, 1024);
   GNUNET_assert (csock != NULL);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test asks for write notification\n");
 #endif
   GNUNET_assert (NULL !=
-                 GNUNET_NETWORK_notify_transmit_ready (csock,
+                 GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                                        12,
                                                        GNUNET_TIME_UNIT_SECONDS,
                                                        &make_hello, NULL));
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys client socket\n");
 #endif
-  GNUNET_NETWORK_socket_destroy (csock);
+  GNUNET_NETWORK_connection_destroy (csock);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test prepares to accept\n");
 #endif
diff --git a/src/util/test_network_addressing.c b/src/util/test_network_addressing.c
index 3c2a690d9..aeb187634 100644
--- a/src/util/test_network_addressing.c
+++ b/src/util/test_network_addressing.c
@@ -32,11 +32,11 @@
 #define PORT 12435
 
 
-static struct GNUNET_NETWORK_SocketHandle *csock;
+static struct GNUNET_NETWORK_ConnectionHandle *csock;
 
-static struct GNUNET_NETWORK_SocketHandle *asock;
+static struct GNUNET_NETWORK_ConnectionHandle *asock;
 
-static struct GNUNET_NETWORK_SocketHandle *lsock;
+static struct GNUNET_NETWORK_ConnectionHandle *lsock;
 
 static size_t sofar;
 
@@ -82,7 +82,7 @@ receive_check (void *cls,
     sofar += available;
   if (sofar < 12)
     {
-      GNUNET_NETWORK_receive (asock,
+      GNUNET_NETWORK_connection_receive (asock,
                               1024,
                               GNUNET_TIME_relative_multiply
                               (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
@@ -91,7 +91,7 @@ receive_check (void *cls,
   else
     {
       *ok = 0;
-      GNUNET_NETWORK_socket_destroy (asock);
+      GNUNET_NETWORK_connection_destroy (asock);
     }
 }
 
@@ -104,12 +104,12 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct sockaddr_in *v4;
   struct sockaddr_in expect;
 
-  asock = GNUNET_NETWORK_socket_create_from_accept (tc->sched,
+  asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched,
                                                     NULL, NULL, ls, 1024);
   GNUNET_assert (asock != NULL);
-  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_socket_check (asock));
+  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock));
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_NETWORK_socket_get_address (asock, &addr, &alen));
+                 GNUNET_NETWORK_connection_get_address (asock, &addr, &alen));
   GNUNET_assert (alen == sizeof (struct sockaddr_in));
   v4 = addr;
   memset (&expect, 0, sizeof (expect));
@@ -118,8 +118,8 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   expect.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
   GNUNET_assert (0 == memcmp (&expect, v4, alen));
   GNUNET_free (addr);
-  GNUNET_NETWORK_socket_destroy (lsock);
-  GNUNET_NETWORK_receive (asock,
+  GNUNET_NETWORK_connection_destroy (lsock);
+  GNUNET_NETWORK_connection_receive (asock,
                           1024,
                           GNUNET_TIME_relative_multiply
                           (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls);
@@ -138,24 +138,24 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct sockaddr_in v4;
   ls = open_listen_socket ();
-  lsock = GNUNET_NETWORK_socket_create_from_existing (tc->sched, ls, 0);
+  lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0);
   GNUNET_assert (lsock != NULL);
 
   v4.sin_family = AF_INET;
   v4.sin_port = htons (PORT);
   v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-  csock = GNUNET_NETWORK_socket_create_from_sockaddr (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_sockaddr (tc->sched,
                                                       AF_INET,
                                                       (const struct sockaddr
                                                        *) &v4, sizeof (v4),
                                                       1024);
   GNUNET_assert (csock != NULL);
   GNUNET_assert (NULL !=
-                 GNUNET_NETWORK_notify_transmit_ready (csock,
+                 GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                                        12,
                                                        GNUNET_TIME_UNIT_SECONDS,
                                                        &make_hello, NULL));
-  GNUNET_NETWORK_socket_destroy (csock);
+  GNUNET_NETWORK_connection_destroy (csock);
   GNUNET_SCHEDULER_add_read (tc->sched,
                              GNUNET_NO,
                              GNUNET_SCHEDULER_PRIORITY_HIGH,
diff --git a/src/util/test_network_receive_cancel.c b/src/util/test_network_receive_cancel.c
index 7eb31153c..51d8350af 100644
--- a/src/util/test_network_receive_cancel.c
+++ b/src/util/test_network_receive_cancel.c
@@ -32,11 +32,11 @@
 #define PORT 12435
 
 
-static struct GNUNET_NETWORK_SocketHandle *csock;
+static struct GNUNET_NETWORK_ConnectionHandle *csock;
 
-static struct GNUNET_NETWORK_SocketHandle *asock;
+static struct GNUNET_NETWORK_ConnectionHandle *asock;
 
-static struct GNUNET_NETWORK_SocketHandle *lsock;
+static struct GNUNET_NETWORK_ConnectionHandle *lsock;
 
 static int ls;
 
@@ -85,13 +85,13 @@ static void
 run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 
-  asock = GNUNET_NETWORK_socket_create_from_accept (tc->sched,
+  asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched,
                                                     NULL, NULL, ls, 1024);
   GNUNET_assert (asock != NULL);
-  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_socket_check (asock));
-  GNUNET_NETWORK_socket_destroy (lsock);
+  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock));
+  GNUNET_NETWORK_connection_destroy (lsock);
   receive_task
-    = GNUNET_NETWORK_receive (asock,
+    = GNUNET_NETWORK_connection_receive (asock,
                               1024,
                               GNUNET_TIME_relative_multiply
                               (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive,
@@ -103,9 +103,9 @@ static void
 receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   int *ok = cls;
-  GNUNET_NETWORK_receive_cancel (asock, receive_task);
-  GNUNET_NETWORK_socket_destroy (csock);
-  GNUNET_NETWORK_socket_destroy (asock);
+  GNUNET_NETWORK_connection_receive_cancel (asock, receive_task);
+  GNUNET_NETWORK_connection_destroy (csock);
+  GNUNET_NETWORK_connection_destroy (asock);
   *ok = 0;
 }
 
@@ -115,9 +115,9 @@ static void
 task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   ls = open_listen_socket ();
-  lsock = GNUNET_NETWORK_socket_create_from_existing (tc->sched, ls, 0);
+  lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0);
   GNUNET_assert (lsock != NULL);
-  csock = GNUNET_NETWORK_socket_create_from_connect (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched,
                                                      "localhost", PORT, 1024);
   GNUNET_assert (csock != NULL);
   GNUNET_SCHEDULER_add_read (tc->sched,
diff --git a/src/util/test_network_timeout.c b/src/util/test_network_timeout.c
index 2c2f6f9f2..1d8910842 100644
--- a/src/util/test_network_timeout.c
+++ b/src/util/test_network_timeout.c
@@ -31,9 +31,9 @@
 
 #define PORT 12435
 
-static struct GNUNET_NETWORK_SocketHandle *csock;
+static struct GNUNET_NETWORK_ConnectionHandle *csock;
 
-static struct GNUNET_NETWORK_SocketHandle *lsock;
+static struct GNUNET_NETWORK_ConnectionHandle *lsock;
 
 static int ls;
 
@@ -74,8 +74,8 @@ send_kilo (void *cls, size_t size, void *buf)
 #endif
       GNUNET_assert (buf == NULL);
       *ok = 0;
-      GNUNET_NETWORK_socket_destroy (lsock);
-      GNUNET_NETWORK_socket_destroy (csock);
+      GNUNET_NETWORK_connection_destroy (lsock);
+      GNUNET_NETWORK_connection_destroy (csock);
       return 0;
     }
 #if VERBOSE
@@ -85,7 +85,7 @@ send_kilo (void *cls, size_t size, void *buf)
   memset (buf, 42, 1024);
 
   GNUNET_assert (NULL !=
-                 GNUNET_NETWORK_notify_transmit_ready (csock,
+                 GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                                        1024,
                                                        GNUNET_TIME_UNIT_SECONDS,
                                                        &send_kilo, cls));
@@ -98,13 +98,13 @@ task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 
   ls = open_listen_socket ();
-  lsock = GNUNET_NETWORK_socket_create_from_existing (tc->sched, ls, 0);
+  lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0);
   GNUNET_assert (lsock != NULL);
-  csock = GNUNET_NETWORK_socket_create_from_connect (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched,
                                                      "localhost", PORT, 1024);
   GNUNET_assert (csock != NULL);
   GNUNET_assert (NULL !=
-                 GNUNET_NETWORK_notify_transmit_ready (csock,
+                 GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                                        1024,
                                                        GNUNET_TIME_UNIT_SECONDS,
                                                        &send_kilo, cls));
diff --git a/src/util/test_network_timeout_no_connect.c b/src/util/test_network_timeout_no_connect.c
index fd5e82dcd..172a6991d 100644
--- a/src/util/test_network_timeout_no_connect.c
+++ b/src/util/test_network_timeout_no_connect.c
@@ -31,7 +31,7 @@
 
 #define PORT 13425
 
-static struct GNUNET_NETWORK_SocketHandle *csock;
+static struct GNUNET_NETWORK_ConnectionHandle *csock;
 
 static size_t
 handle_timeout (void *cls, size_t size, void *buf)
@@ -51,11 +51,11 @@ handle_timeout (void *cls, size_t size, void *buf)
 static void
 task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  csock = GNUNET_NETWORK_socket_create_from_connect (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched,
                                                      "localhost", PORT, 1024);
   GNUNET_assert (csock != NULL);
   GNUNET_assert (NULL !=
-                 GNUNET_NETWORK_notify_transmit_ready (csock,
+                 GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                                        1024,
                                                        GNUNET_TIME_UNIT_SECONDS,
                                                        &handle_timeout, cls));
diff --git a/src/util/test_network_transmit_cancel.c b/src/util/test_network_transmit_cancel.c
index 802f9a477..7a67000a8 100644
--- a/src/util/test_network_transmit_cancel.c
+++ b/src/util/test_network_transmit_cancel.c
@@ -46,17 +46,17 @@ task_transmit_cancel (void *cls,
 {
   int *ok = cls;
   struct GNUNET_NETWORK_TransmitHandle *th;
-  struct GNUNET_NETWORK_SocketHandle *csock;
+  struct GNUNET_NETWORK_ConnectionHandle *csock;
 
-  csock = GNUNET_NETWORK_socket_create_from_connect (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched,
                                                      "localhost", PORT, 1024);
   GNUNET_assert (csock != NULL);
-  th = GNUNET_NETWORK_notify_transmit_ready (csock,
+  th = GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                              12,
                                              GNUNET_TIME_UNIT_MINUTES,
                                              &not_run, cls);
-  GNUNET_NETWORK_notify_transmit_ready_cancel (th);
-  GNUNET_NETWORK_socket_destroy (csock);
+  GNUNET_NETWORK_connection_notify_transmit_ready_cancel (th);
+  GNUNET_NETWORK_connection_destroy (csock);
   *ok = 0;
 }