@@ -16,19 +16,19 @@
  */
 
 #import "OFRunLoop.h"
 #import "OFStream.h"
 #ifdef OF_HAVE_SOCKETS
-# import "OFTCPSocket.h"
+# import "OFIPStreamSocket.h"
 # import "OFUDPSocket.h"
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 #ifdef OF_HAVE_SOCKETS
-@protocol OFTCPSocketDelegate_Private <OFObject>
-- (void)of_socketDidConnect: (OFTCPSocket *)socket
+@protocol OFIPStreamSocketDelegate_Private <OFObject>
+- (void)of_socketDidConnect: (OFIPStreamSocket *)socket
 		  exception: (nullable id)exception;
 @end
 #endif
 
 @interface OFRunLoop ()
@@ -81,24 +81,20 @@
 				       of_stream_async_write_string_block_t)
 				       block
 # endif
 			 delegate: (nullable id <OFStreamDelegate>)delegate;
 # if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
-+ (void)of_addAsyncConnectForTCPSocket: (OFTCPSocket *)socket
-				  mode: (of_run_loop_mode_t)mode
-			      delegate: (id <OFTCPSocketDelegate_Private>)
-					    delegate;
++ (void)of_addAsyncConnectForIPStreamSocket: (OFIPStreamSocket *)socket
+      mode: (of_run_loop_mode_t)mode
+  delegate: (id <OFIPStreamSocketDelegate_Private>) delegate;
 # endif
-+ (void)of_addAsyncAcceptForTCPSocket: (OFTCPSocket *)socket
-				 mode: (of_run_loop_mode_t)mode
++ (void)of_addAsyncAcceptForIPStreamSocket: (OFIPStreamSocket *)socket
+      mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-				block: (nullable
-					   of_tcp_socket_async_accept_block_t)
-					   block
+     block: (nullable of_ip_stream_socket_async_accept_block_t)block
 # endif
-			     delegate: (nullable id <OFTCPSocketDelegate>)
-					   delegate;
+  delegate: (nullable id <OFIPStreamSocketDelegate>)delegate;
 + (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
 				buffer: (void *)buffer
 				length: (size_t)length
 				  mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS