@@ -59,25 +59,25 @@
 {
 	[OFWin32ConsoleStdIOStream class];
 }
 #endif
 
-OFStdIOStream *of_stdin = nil;
-OFStdIOStream *of_stdout = nil;
-OFStdIOStream *of_stderr = nil;
+OFStdIOStream *OFStdIn = nil;
+OFStdIOStream *OFStdOut = nil;
+OFStdIOStream *OFStdErr = nil;
 
 #ifdef OF_AMIGAOS
 OF_DESTRUCTOR()
 {
-	[of_stdin dealloc];
-	[of_stdout dealloc];
-	[of_stderr dealloc];
+	[OFStdIn dealloc];
+	[OFStdOut dealloc];
+	[OFStdErr dealloc];
 }
 #endif
 
 void
-of_log(OFConstantString *format, ...)
+OFLog(OFConstantString *format, ...)
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *date;
 	OFString *dateString, *me, *msg;
 	va_list arguments;
@@ -93,12 +93,12 @@
 	va_start(arguments, format);
 	msg = [[[OFString alloc] initWithFormat: format
 				      arguments: arguments] autorelease];
 	va_end(arguments);
 
-	[of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString,
-				date.microsecond / 1000, me, getpid(), msg];
+	[OFStdErr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString,
+			       date.microsecond / 1000, me, getpid(), msg];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 #ifdef HAVE_ISATTY
@@ -151,17 +151,16 @@
 
 # ifndef OF_AMIGAOS
 	int fd;
 
 	if ((fd = fileno(stdin)) >= 0)
-		of_stdin = [[OFStdIOStream alloc]
-		    of_initWithFileDescriptor: fd];
+		OFStdIn = [[OFStdIOStream alloc] of_initWithFileDescriptor: fd];
 	if ((fd = fileno(stdout)) >= 0)
-		of_stdout = [[OFStdIOStream alloc]
+		OFStdOut = [[OFStdIOStream alloc]
 		    of_initWithFileDescriptor: fd];
 	if ((fd = fileno(stderr)) >= 0)
-		of_stderr = [[OFStdIOStream alloc]
+		OFStdErr = [[OFStdIOStream alloc]
 		    of_initWithFileDescriptor: fd];
 # else
 	BPTR input, output, error;
 	bool inputClosable = false, outputClosable = false,
 	    errorClosable = false;
@@ -183,16 +182,16 @@
 	if (error == 0) {
 		error = Open("*", MODE_OLDFILE);
 		errorClosable = true;
 	}
 
-	of_stdin = [[OFStdIOStream alloc] of_initWithHandle: input
-						   closable: inputClosable];
-	of_stdout = [[OFStdIOStream alloc] of_initWithHandle: output
-						    closable: outputClosable];
-	of_stderr = [[OFStdIOStream alloc] of_initWithHandle: error
-						    closable: errorClosable];
+	OFStdIn = [[OFStdIOStream alloc] of_initWithHandle: input
+						  closable: inputClosable];
+	OFStdOut = [[OFStdIOStream alloc] of_initWithHandle: output
+						   closable: outputClosable];
+	OFStdErr = [[OFStdIOStream alloc] of_initWithHandle: error
+						   closable: errorClosable];
 # endif
 }
 #endif
 
 - (instancetype)init