@@ -70,19 +70,19 @@
 + (id)addObject: (id)object
 {
 	return _objc_rootAutorelease(object);
 }
 
-+ (void)OF_handleThreadTermination
++ (void)of_handleThreadTermination
 {
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	OFAutoreleasePool **cache = of_tlskey_get(cacheKey);
 #endif
 
 	if (cache != NULL) {
 		for (size_t i = 0; i < MAX_CACHE_SIZE; i++)
-			[cache[i] OF_super_dealloc];
+			[cache[i] of_super_dealloc];
 
 		free(cache);
 		cache = NULL;
 	}
 }
@@ -123,11 +123,11 @@
 - (void)drain
 {
 	[self dealloc];
 }
 
-- (void)OF_super_dealloc
+- (void)of_super_dealloc
 {
 	[super dealloc];
 }
 
 - (void)dealloc