@@ -25,12 +25,12 @@
 #import "OFArray.h"
 #import "OFData.h"
 #import "OFDictionary.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFKernelEventObserver.h"
-# import "OFTCPSocket.h"
-# import "OFTCPSocket+Private.h"
+# import "OFIPStreamSocket.h"
+# import "OFIPStreamSocket+Private.h"
 #endif
 #import "OFThread.h"
 #ifdef OF_HAVE_THREADS
 # import "OFMutex.h"
 # import "OFCondition.h"
@@ -155,11 +155,11 @@
 
 @interface OFRunLoopAcceptQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_tcp_socket_async_accept_block_t _block;
+	of_ip_stream_socket_async_accept_block_t _block;
 # endif
 }
 @end
 
 @interface OFRunLoopUDPReceiveQueueItem: OFRunLoopQueueItem
@@ -733,11 +733,11 @@
 # endif
 
 @implementation OFRunLoopAcceptQueueItem
 - (bool)handleObject: (id)object
 {
-	OFTCPSocket *acceptedSocket;
+	OFIPStreamSocket *acceptedSocket;
 	id exception = nil;
 
 	@try {
 		acceptedSocket = [object accept];
 	} @catch (id e) {
@@ -1050,29 +1050,28 @@
 
 	QUEUE_ITEM
 }
 
 # if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
-+ (void)of_addAsyncConnectForTCPSocket: (OFTCPSocket *)stream
-				  mode: (of_run_loop_mode_t)mode
-			      delegate: (id <OFTCPSocketDelegate_Private>)
-					    delegate
++ (void)of_addAsyncConnectForIPStreamSocket: (OFIPStreamSocket *)stream
+      mode: (of_run_loop_mode_t)mode
+  delegate: (id <OFIPStreamSocketDelegate_Private>)delegate
 {
 	NEW_WRITE(OFRunLoopConnectQueueItem, stream, mode)
 
 	queueItem->_delegate = [delegate retain];
 
 	QUEUE_ITEM
 }
 # endif
 
-+ (void)of_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
-				 mode: (of_run_loop_mode_t)mode
++ (void)of_addAsyncAcceptForIPStreamSocket: (OFIPStreamSocket *)stream
+      mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-				block: (of_tcp_socket_async_accept_block_t)block
+     block: (of_ip_stream_socket_async_accept_block_t)block
 # endif
-			     delegate: (id <OFTCPSocketDelegate>)delegate
+  delegate: (id <OFIPStreamSocketDelegate>)delegate
 {
 	NEW_READ(OFRunLoopAcceptQueueItem, stream, mode)
 
 	queueItem->_delegate = [delegate retain];
 # ifdef OF_HAVE_BLOCKS