@@ -347,11 +347,11 @@
 #else
 	return [self mainRunLoop];
 #endif
 }
 
-+ (void)OF_setMainRunLoop: (OFRunLoop *)runLoop
++ (void)of_setMainRunLoop: (OFRunLoop *)runLoop
 {
 	mainRunLoop = [runLoop retain];
 }
 
 #ifdef OF_HAVE_SOCKETS
@@ -375,11 +375,11 @@
 	code								\
 	[queue appendObject: queueItem];				\
 									\
 	objc_autoreleasePoolPop(pool);
 
-+ (void)OF_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream *)stream
 			  buffer: (void *)buffer
 			  length: (size_t)length
 			  target: (id)target
 			selector: (SEL)selector
 {
@@ -389,11 +389,11 @@
 		queueItem->_buffer = buffer;
 		queueItem->_length = length;
 	})
 }
 
-+ (void)OF_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream *)stream
 			  buffer: (void *)buffer
 		     exactLength: (size_t)exactLength
 			  target: (id)target
 			selector: (SEL)selector
 {
@@ -403,11 +403,11 @@
 		queueItem->_buffer = buffer;
 		queueItem->_exactLength = exactLength;
 	})
 }
 
-+ (void)OF_addAsyncReadLineForStream: (OFStream *)stream
++ (void)of_addAsyncReadLineForStream: (OFStream *)stream
 			    encoding: (of_string_encoding_t)encoding
 			      target: (id)target
 			    selector: (SEL)selector
 {
 	ADD_READ(OFRunLoop_ReadLineQueueItem, stream, {
@@ -415,21 +415,21 @@
 		queueItem->_selector = selector;
 		queueItem->_encoding = encoding;
 	})
 }
 
-+ (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
++ (void)of_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
 			       target: (id)target
 			     selector: (SEL)selector
 {
 	ADD_READ(OFRunLoop_AcceptQueueItem, stream, {
 		queueItem->_target = [target retain];
 		queueItem->_selector = selector;
 	})
 }
 
-+ (void)OF_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
++ (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
 				buffer: (void *)buffer
 				length: (size_t)length
 				target: (id)target
 			      selector: (SEL)selector
 {
@@ -440,11 +440,11 @@
 		queueItem->_selector = selector;
 	})
 }
 
 # ifdef OF_HAVE_BLOCKS
-+ (void)OF_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream *)stream
 			  buffer: (void *)buffer
 			  length: (size_t)length
 			   block: (of_stream_async_read_block_t)block
 {
 	ADD_READ(OFRunLoop_ReadQueueItem, stream, {
@@ -452,11 +452,11 @@
 		queueItem->_buffer = buffer;
 		queueItem->_length = length;
 	})
 }
 
-+ (void)OF_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream *)stream
 			  buffer: (void *)buffer
 		     exactLength: (size_t)exactLength
 			   block: (of_stream_async_read_block_t)block
 {
 	ADD_READ(OFRunLoop_ExactReadQueueItem, stream, {
@@ -464,29 +464,29 @@
 		queueItem->_buffer = buffer;
 		queueItem->_exactLength = exactLength;
 	})
 }
 
-+ (void)OF_addAsyncReadLineForStream: (OFStream *)stream
++ (void)of_addAsyncReadLineForStream: (OFStream *)stream
 			    encoding: (of_string_encoding_t)encoding
 			       block: (of_stream_async_read_line_block_t)block
 {
 	ADD_READ(OFRunLoop_ReadLineQueueItem, stream, {
 		queueItem->_block = [block copy];
 		queueItem->_encoding = encoding;
 	})
 }
 
-+ (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
++ (void)of_addAsyncAcceptForTCPSocket: (OFTCPSocket *)stream
 				block: (of_tcp_socket_async_accept_block_t)block
 {
 	ADD_READ(OFRunLoop_AcceptQueueItem, stream, {
 		queueItem->_block = [block copy];
 	})
 }
 
-+ (void)OF_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
++ (void)of_addAsyncReceiveForUDPSocket: (OFUDPSocket *)socket
 				buffer: (void *)buffer
 				length: (size_t)length
 				 block: (of_udp_socket_async_receive_block_t)
 					    block
 {
@@ -497,11 +497,11 @@
 	})
 }
 # endif
 # undef ADD_READ
 
-+ (void)OF_cancelAsyncRequestsForObject: (id)object
++ (void)of_cancelAsyncRequestsForObject: (id)object
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRunLoop *runLoop = [self currentRunLoop];
 	OFList *queue;
 
@@ -575,20 +575,20 @@
 	} @finally {
 		[_timersQueueLock unlock];
 	}
 #endif
 
-	[timer OF_setInRunLoop: self];
+	[timer of_setInRunLoop: self];
 
 #if defined(OF_HAVE_SOCKETS)
 	[_kernelEventObserver cancel];
 #elif defined(OF_HAVE_THREADS)
 	[_condition signal];
 #endif
 }
 
-- (void)OF_removeTimer: (OFTimer *)timer
+- (void)of_removeTimer: (OFTimer *)timer
 {
 #ifdef OF_HAVE_THREADS
 	[_timersQueueLock lock];
 	@try {
 #endif
@@ -677,11 +677,11 @@
 					    retain] autorelease];
 
 					[_timersQueue removeListObject:
 					    listObject];
 
-					[timer OF_setInRunLoop: nil];
+					[timer of_setInRunLoop: nil];
 				} else
 					break;
 #ifdef OF_HAVE_THREADS
 			} @finally {
 				[_timersQueueLock unlock];