@@ -88,11 +88,11 @@
 
 @interface OFRunLoopReadQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_stream_async_read_block_t _block;
+	OFStreamAsyncReadBlock _block;
 # endif
 	void *_buffer;
 	size_t _length;
 }
 @end
@@ -99,11 +99,11 @@
 
 @interface OFRunLoopExactReadQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_stream_async_read_block_t _block;
+	OFStreamAsyncReadBlock _block;
 # endif
 	void *_buffer;
 	size_t _exactLength, _readLength;
 }
 @end
@@ -110,21 +110,21 @@
 
 @interface OFRunLoopReadLineQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_stream_async_read_line_block_t _block;
+	OFStreamAsyncReadLineBlock _block;
 # endif
 	OFStringEncoding _encoding;
 }
 @end
 
 @interface OFRunLoopWriteDataQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_stream_async_write_data_block_t _block;
+	OFStreamAsyncWriteDataBlock _block;
 # endif
 	OFData *_data;
 	size_t _writtenLength;
 }
 @end
@@ -131,11 +131,11 @@
 
 @interface OFRunLoopWriteStringQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_stream_async_write_string_block_t _block;
+	OFStreamAsyncWriteStringBlock _block;
 # endif
 	OFString *_string;
 	OFStringEncoding _encoding;
 	size_t _writtenLength;
 }
@@ -157,11 +157,11 @@
 
 @interface OFRunLoopDatagramReceiveQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_datagram_socket_async_receive_block_t _block;
+	OFDatagramSocketAsyncReceiveBlock _block;
 # endif
 	void *_buffer;
 	size_t _length;
 }
 @end
@@ -168,11 +168,11 @@
 
 @interface OFRunLoopDatagramSendQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_datagram_socket_async_send_data_block_t _block;
+	OFDatagramSocketAsyncSendDataBlock _block;
 # endif
 	OFData *_data;
 	of_socket_address_t _receiver;
 }
 @end
@@ -179,11 +179,11 @@
 
 @interface OFRunLoopPacketReceiveQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_sequenced_packet_socket_async_receive_block_t _block;
+	OFSequencedPacketSocketAsyncReceiveBlock _block;
 # endif
 	void *_buffer;
 	size_t _length;
 }
 @end
@@ -190,11 +190,11 @@
 
 @interface OFRunLoopPacketSendQueueItem: OFRunLoopQueueItem
 {
 @public
 # ifdef OF_HAVE_BLOCKS
-	of_sequenced_packet_socket_async_send_data_block_t _block;
+	OFSequencedPacketSocketAsyncSendDataBlock _block;
 # endif
 	OFData *_data;
 }
 @end
 #endif
@@ -752,16 +752,15 @@
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
 		if ([object isKindOfClass: [OFStreamSocket class]])
-			return ((of_stream_socket_async_accept_block_t)
-			    _block)(acceptedSocket, exception);
+			return ((OFStreamSocketAsyncAcceptBlock)_block)(
+			    acceptedSocket, exception);
 		else if ([object isKindOfClass:
 		    [OFSequencedPacketSocket class]])
-			return
-			    ((of_sequenced_packet_socket_async_accept_block_t)
+			return ((OFSequencedPacketSocketAsyncAcceptBlock)
 			    _block)(acceptedSocket, exception);
 		else
 			OF_ENSURE(0);
 	} else {
 # endif
@@ -1088,11 +1087,11 @@
 				      stream
 			  buffer: (void *)buffer
 			  length: (size_t)length
 			    mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-			   block: (of_stream_async_read_block_t)block
+			   block: (OFStreamAsyncReadBlock)block
 # endif
 			delegate: (id <OFStreamDelegate>)delegate
 {
 	NEW_READ(OFRunLoopReadQueueItem, stream, mode)
 
@@ -1110,11 +1109,11 @@
 				      stream
 			  buffer: (void *)buffer
 		     exactLength: (size_t)exactLength
 			    mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-			   block: (of_stream_async_read_block_t)block
+			   block: (OFStreamAsyncReadBlock)block
 # endif
 			delegate: (id <OFStreamDelegate>)delegate
 {
 	NEW_READ(OFRunLoopExactReadQueueItem, stream, mode)
 
@@ -1131,11 +1130,11 @@
 + (void)of_addAsyncReadLineForStream: (OFStream <OFReadyForReadingObserving> *)
 					  stream
 			    encoding: (OFStringEncoding)encoding
 				mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-			       block: (of_stream_async_read_line_block_t)block
+			       block: (OFStreamAsyncReadLineBlock)block
 # endif
 			    delegate: (id <OFStreamDelegate>)delegate
 {
 	NEW_READ(OFRunLoopReadLineQueueItem, stream, mode)
 
@@ -1151,11 +1150,11 @@
 + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *)
 				       stream
 			     data: (OFData *)data
 			     mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-			    block: (of_stream_async_write_data_block_t)block
+			    block: (OFStreamAsyncWriteDataBlock)block
 # endif
 			 delegate: (id <OFStreamDelegate>)delegate
 {
 	NEW_WRITE(OFRunLoopWriteDataQueueItem, stream, mode)
 
@@ -1172,11 +1171,11 @@
 				       stream
 			   string: (OFString *)string
 			 encoding: (OFStringEncoding)encoding
 			     mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-			    block: (of_stream_async_write_string_block_t)block
+			    block: (OFStreamAsyncWriteStringBlock)block
 # endif
 			 delegate: (id <OFStreamDelegate>)delegate
 {
 	NEW_WRITE(OFRunLoopWriteStringQueueItem, stream, mode)
 
@@ -1221,11 +1220,11 @@
 + (void)of_addAsyncReceiveForDatagramSocket: (OFDatagramSocket *)sock
     buffer: (void *)buffer
     length: (size_t)length
       mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-     block: (of_datagram_socket_async_receive_block_t)block
+     block: (OFDatagramSocketAsyncReceiveBlock)block
 # endif
   delegate: (id <OFDatagramSocketDelegate>)delegate
 {
 	NEW_READ(OFRunLoopDatagramReceiveQueueItem, sock, mode)
 
@@ -1242,11 +1241,11 @@
 + (void)of_addAsyncSendForDatagramSocket: (OFDatagramSocket *)sock
       data: (OFData *)data
   receiver: (const of_socket_address_t *)receiver
       mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-     block: (of_datagram_socket_async_send_data_block_t)block
+     block: (OFDatagramSocketAsyncSendDataBlock)block
 # endif
   delegate: (id <OFDatagramSocketDelegate>)delegate
 {
 	NEW_WRITE(OFRunLoopDatagramSendQueueItem, sock, mode)
 
@@ -1264,11 +1263,11 @@
 							sock
     buffer: (void *)buffer
     length: (size_t)length
       mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-     block: (of_sequenced_packet_socket_async_receive_block_t)block
+     block: (OFSequencedPacketSocketAsyncReceiveBlock)block
 # endif
   delegate: (id <OFSequencedPacketSocketDelegate>)delegate
 {
 	NEW_READ(OFRunLoopPacketReceiveQueueItem, sock, mode)
 
@@ -1284,11 +1283,11 @@
 
 + (void)of_addAsyncSendForSequencedPacketSocket: (OFSequencedPacketSocket *)sock
       data: (OFData *)data
       mode: (of_run_loop_mode_t)mode
 # ifdef OF_HAVE_BLOCKS
-     block: (of_sequenced_packet_socket_async_send_data_block_t)block
+     block: (OFSequencedPacketSocketAsyncSendDataBlock)block
 # endif
   delegate: (id <OFSequencedPacketSocketDelegate>)delegate
 {
 	NEW_WRITE(OFRunLoopPacketSendQueueItem, sock, mode)