@@ -108,24 +108,24 @@
 
 	if (runLoop != nil)
 		return runLoop;
 
 	runLoop = [[[OFRunLoop alloc] init] autorelease];
-	[currentThread _setRunLoop: runLoop];
+	[currentThread OF_setRunLoop: runLoop];
 
 	return runLoop;
 }
 
-+ (void)_setMainRunLoop
++ (void)OF_setMainRunLoop
 {
 	void *pool = objc_autoreleasePoolPush();
 	mainRunLoop = [[[OFThread currentThread] runLoop] retain];
 	objc_autoreleasePoolPop(pool);
 }
 
 #ifdef OF_HAVE_BLOCKS
-+ (void)_addAsyncReadForStream: (OFStream*)stream
++ (void)OF_addAsyncReadForStream: (OFStream*)stream
 			buffer: (void*)buffer
 			length: (size_t)length
 			 block: (of_stream_async_read_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -149,13 +149,13 @@
 	[queue appendObject: queueItem];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-+ (void)_addAsyncReadLineForStream: (OFStream*)stream
-			  encoding: (of_string_encoding_t)encoding
-			     block: (of_stream_async_read_line_block_t)block
++ (void)OF_addAsyncReadLineForStream: (OFStream*)stream
+			    encoding: (of_string_encoding_t)encoding
+			       block: (of_stream_async_read_line_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRunLoop *runLoop = [self currentRunLoop];
 	OFList *queue = [runLoop->readQueues objectForKey: stream];
 	OFRunLoop_ReadLineQueueItem *queueItem;
@@ -175,12 +175,12 @@
 	[queue appendObject: queueItem];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-+ (void)_addAsyncAcceptForTCPSocket: (OFTCPSocket*)socket
-			      block: (of_tcpsocket_async_accept_block_t)block
++ (void)OF_addAsyncAcceptForTCPSocket: (OFTCPSocket*)socket
+				block: (of_tcpsocket_async_accept_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRunLoop *runLoop = [self currentRunLoop];
 	OFList *queue = [runLoop->readQueues objectForKey: socket];
 	OFRunLoop_AcceptQueueItem *queueItem;