@@ -312,11 +312,11 @@
 	if (_block != NULL)
 		return _block(object, _buffer, length, address, exception);
 	else {
 # endif
 		bool (*func)(id, SEL, OFUDPSocket *, void *, size_t,
-		    of_udp_socket_address_t address, OFException *) =
+		    of_udp_socket_address_t, OFException *) =
 		    (bool (*)(id, SEL, OFUDPSocket *, void *, size_t,
 		    of_udp_socket_address_t, OFException *))
 		    [_target methodForSelector: _selector];
 
 		return func(_target, _selector, object, _buffer, length,
@@ -428,17 +428,17 @@
 		queueItem->_target = [target retain];
 		queueItem->_selector = selector;
 	})
 }
 
-+ (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
++ (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)sock
 				buffer: (void *)buffer
 				length: (size_t)length
 				target: (id)target
 			      selector: (SEL)selector
 {
-	ADD_READ(OFRunLoop_UDPReceiveQueueItem, socket, {
+	ADD_READ(OFRunLoop_UDPReceiveQueueItem, sock, {
 		queueItem->_buffer = buffer;
 		queueItem->_length = length;
 		queueItem->_target = [target retain];
 		queueItem->_selector = selector;
 	})
@@ -485,17 +485,17 @@
 	ADD_READ(OFRunLoop_AcceptQueueItem, stream, {
 		queueItem->_block = [block copy];
 	})
 }
 
-+ (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
++ (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)sock
 				buffer: (void *)buffer
 				length: (size_t)length
 				 block: (of_udp_socket_async_receive_block_t)
 					    block
 {
-	ADD_READ(OFRunLoop_UDPReceiveQueueItem, socket, {
+	ADD_READ(OFRunLoop_UDPReceiveQueueItem, sock, {
 		queueItem->_buffer = buffer;
 		queueItem->_length = length;
 		queueItem->_block = [block copy];
 	})
 }