@@ -66,18 +66,18 @@
 #  define SA_RESTART 0
 # endif
 #endif
 
 @interface OFApplication ()
-- (instancetype)OF_init OF_METHOD_FAMILY(init);
-- (void)OF_setArgumentCount: (int *)argc
+- (instancetype)of_init OF_METHOD_FAMILY(init);
+- (void)of_setArgumentCount: (int *)argc
 	  andArgumentValues: (char **[])argv;
 #ifdef OF_WINDOWS
-- (void)OF_setArgumentCount: (int)argc
+- (void)of_setArgumentCount: (int)argc
       andWideArgumentValues: (wchar_t *[])argv;
 #endif
-- (void)OF_run;
+- (void)of_run;
 @end
 
 static OFApplication *app = nil;
 
 static void
@@ -129,25 +129,25 @@
 		    "with OF_APPLICATION_DELEGATE().\n",
 		    class_getName(cls), class_getName(cls));
 		exit(1);
 	}
 
-	app = [[OFApplication alloc] OF_init];
+	app = [[OFApplication alloc] of_init];
 
-	[app OF_setArgumentCount: argc
+	[app of_setArgumentCount: argc
 	       andArgumentValues: argv];
 
 #ifdef OF_WINDOWS
 	__wgetmainargs(&wargc, &wargv, &wenvp, _CRT_glob, &si);
-	[app OF_setArgumentCount: wargc
+	[app of_setArgumentCount: wargc
 	   andWideArgumentValues: wargv];
 #endif
 
 	delegate = [[cls alloc] init];
 	[app setDelegate: delegate];
 
-	[app OF_run];
+	[app of_run];
 
 	[delegate release];
 
 	return 0;
 }
@@ -204,11 +204,11 @@
 - init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- OF_init
+- of_init
 {
 	self = [super init];
 
 	@try {
 		void *pool;
@@ -363,11 +363,11 @@
 	[_environment release];
 
 	[super dealloc];
 }
 
-- (void)OF_setArgumentCount: (int *)argc
+- (void)of_setArgumentCount: (int *)argc
 	  andArgumentValues: (char ***)argv
 {
 #ifndef OF_WINDOWS
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
@@ -403,11 +403,11 @@
 	_argv = argv;
 #endif
 }
 
 #ifdef OF_WINDOWS
-- (void)OF_setArgumentCount: (int)argc
+- (void)of_setArgumentCount: (int)argc
       andWideArgumentValues: (wchar_t **)argv
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
 
@@ -483,29 +483,29 @@
 #endif
 
 #undef REGISTER_SIGNAL
 }
 
-- (void)OF_run
+- (void)of_run
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRunLoop *runLoop;
 
 #ifdef OF_HAVE_THREADS
-	[OFThread OF_createMainThread];
+	[OFThread of_createMainThread];
 	runLoop = [OFRunLoop currentRunLoop];
 #else
 	runLoop = [[[OFRunLoop alloc] init] autorelease];
 #endif
 
-	[OFRunLoop OF_setMainRunLoop: runLoop];
+	[OFRunLoop of_setMainRunLoop: runLoop];
 
 	objc_autoreleasePoolPop(pool);
 
 	/*
 	 * Note: runLoop is still valid after the release of the pool, as
-	 * OF_setMainRunLoop: retained it. However, we only have a weak
+	 * of_setMainRunLoop: retained it. However, we only have a weak
 	 * reference to it now, whereas we had a strong reference before.
 	 */
 
 	pool = objc_autoreleasePoolPush();
 	[_delegate applicationDidFinishLaunching];