@@ -72,11 +72,11 @@
 	OFString *_host;
 	uint16_t _port;
 	id _target;
 	SEL _selector;
 # ifdef OF_HAVE_BLOCKS
-	of_tcpsocket_async_connect_block_t _connectBlock;
+	of_tcp_socket_async_connect_block_t _connectBlock;
 # endif
 	OFException *_exception;
 }
 
 - initWithSourceThread: (OFThread*)sourceThread
@@ -88,11 +88,11 @@
 # ifdef OF_HAVE_BLOCKS
 - initWithSourceThread: (OFThread*)sourceThread
 		socket: (OFTCPSocket*)socket
 		  host: (OFString*)host
 		  port: (uint16_t)port
-		 block: (of_tcpsocket_async_connect_block_t)block;
+		 block: (of_tcp_socket_async_connect_block_t)block;
 # endif
 @end
 
 @implementation OFTCPSocket_ConnectThread
 - initWithSourceThread: (OFThread*)sourceThread
@@ -122,11 +122,11 @@
 # ifdef OF_HAVE_BLOCKS
 - initWithSourceThread: (OFThread*)sourceThread
 		socket: (OFTCPSocket*)socket
 		  host: (OFString*)host
 		  port: (uint16_t)port
-		 block: (of_tcpsocket_async_connect_block_t)block
+		 block: (of_tcp_socket_async_connect_block_t)block
 {
 	self = [super init];
 
 	@try {
 		_sourceThread = [sourceThread retain];
@@ -331,11 +331,11 @@
 }
 
 # ifdef OF_HAVE_BLOCKS
 - (void)asyncConnectToHost: (OFString*)host
 		      port: (uint16_t)port
-		     block: (of_tcpsocket_async_connect_block_t)block
+		     block: (of_tcp_socket_async_connect_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[[[[OFTCPSocket_ConnectThread alloc]
 	    initWithSourceThread: [OFThread currentThread]
@@ -481,11 +481,11 @@
 					  target: target
 					selector: selector];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)asyncAcceptWithBlock: (of_tcpsocket_async_accept_block_t)block
+- (void)asyncAcceptWithBlock: (of_tcp_socket_async_accept_block_t)block
 {
 	[OFRunLoop OF_addAsyncAcceptForTCPSocket: self
 					   block: block];
 }
 #endif