@@ -120,11 +120,11 @@
 	[thread handleTermination];
 
 	thread->_running = OF_THREAD_WAITING_FOR_JOIN;
 
 	objc_autoreleasePoolPop(thread->_pool);
-	[OFAutoreleasePool OF_handleThreadTermination];
+	[OFAutoreleasePool of_handleThreadTermination];
 
 	[thread release];
 }
 #endif
 
@@ -259,18 +259,18 @@
 
 		thread->_running = OF_THREAD_WAITING_FOR_JOIN;
 		objc_autoreleasePoolPop(thread->_pool);
 	}
 
-	[OFAutoreleasePool OF_handleThreadTermination];
+	[OFAutoreleasePool of_handleThreadTermination];
 
 	[thread release];
 
 	of_thread_exit();
 }
 
-+ (void)OF_createMainThread
++ (void)of_createMainThread
 {
 	mainThread = [[OFThread alloc] init];
 	mainThread->_thread = of_thread_current();
 
 	if (!of_tlskey_set(threadSelfKey, mainThread))