@@ -84,11 +84,11 @@
 	[thread handleTermination];
 
 	thread->running = OF_THREAD_WAITING_FOR_JOIN;
 
 	[OFTLSKey callAllDestructors];
-	[OFAutoreleasePool _releaseAll];
+	[OFAutoreleasePool OF_releaseAll];
 
 	[thread release];
 
 	return 0;
 }
@@ -221,18 +221,18 @@
 
 		thread->running = OF_THREAD_WAITING_FOR_JOIN;
 	}
 
 	[OFTLSKey callAllDestructors];
-	[OFAutoreleasePool _releaseAll];
+	[OFAutoreleasePool OF_releaseAll];
 
 	[thread release];
 
 	of_thread_exit();
 }
 
-+ (void)_createMainThread
++ (void)OF_createMainThread
 {
 	mainThread = [[OFThread alloc] init];
 	mainThread->thread = of_thread_current();
 
 	if (!of_tlskey_set(threadSelfKey, mainThread))
@@ -326,11 +326,11 @@
 - (OFRunLoop*)runLoop
 {
 	return [[runLoop retain] autorelease];
 }
 
-- (void)_setRunLoop: (OFRunLoop*)runLoop_
+- (void)OF_setRunLoop: (OFRunLoop*)runLoop_
 {
 	OFRunLoop *old = runLoop;
 	runLoop = [runLoop_ retain];
 	[old release];
 }
@@ -462,11 +462,11 @@
 	initialized = YES;
 
 	return self;
 }
 
-- _initWithoutCreatingMutex
+- OF_initWithoutCreatingMutex
 {
 	return [super init];
 }
 
 - (void)lock
@@ -503,11 +503,11 @@
 @end
 
 @implementation OFRecursiveMutex
 - init
 {
-	self = [super _initWithoutCreatingMutex];
+	self = [super OF_initWithoutCreatingMutex];
 
 	if (!of_rmutex_new(&rmutex)) {
 		Class c = [self class];
 		[self release];
 		@throw [OFInitializationFailedException exceptionWithClass: c];