@@ -98,11 +98,11 @@
 	[super dealloc];
 }
 
 - (void)listFiles
 {
-	[of_stderr writeLine: OF_LOCALIZED(@"cannot_list_gz",
+	[OFStdErr writeLine: OF_LOCALIZED(@"cannot_list_gz",
 	    @"Cannot list files of a .gz archive!")];
 	app->_exitStatus = 1;
 }
 
 - (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files
@@ -109,11 +109,11 @@
 {
 	OFString *fileName;
 	OFFile *output;
 
 	if (files.count != 0) {
-		[of_stderr writeLine:
+		[OFStdErr writeLine:
 		    OF_LOCALIZED(@"cannot_extract_specific_file_from_gz",
 		    @"Cannot extract a specific file of a .gz archive!")];
 		app->_exitStatus = 1;
 		return;
 	}
@@ -120,11 +120,11 @@
 
 	fileName = app->_archivePath.lastPathComponent
 	    .stringByDeletingPathExtension;
 
 	if (app->_outputLevel >= 0)
-		[of_stdout writeString: OF_LOCALIZED(@"extracting_file",
+		[OFStdOut writeString: OF_LOCALIZED(@"extracting_file",
 		    @"Extracting %[file]...",
 		    @"file", fileName)];
 
 	if (![app shouldExtractFile: fileName outFileName: fileName])
 		return;
@@ -145,12 +145,12 @@
 
 	[output close];
 	setModificationDate(fileName, _stream);
 
 	if (app->_outputLevel >= 0) {
-		[of_stdout writeString: @"\r"];
-		[of_stdout writeLine: OF_LOCALIZED(@"extracting_file_done",
+		[OFStdOut writeString: @"\r"];
+		[OFStdOut writeLine: OF_LOCALIZED(@"extracting_file_done",
 		    @"Extracting %[file]... done",
 		    @"file", fileName)];
 	}
 }
 
@@ -158,24 +158,24 @@
 {
 	OFString *fileName = app->_archivePath.lastPathComponent
 	    .stringByDeletingPathExtension;
 
 	if (files.count > 0) {
-		[of_stderr writeLine: OF_LOCALIZED(
+		[OFStdErr writeLine: OF_LOCALIZED(
 		    @"cannot_print_specific_file_from_gz",
 		    @"Cannot print a specific file of a .gz archive!")];
 		app->_exitStatus = 1;
 		return;
 	}
 
 	while (!_stream.atEndOfStream) {
 		ssize_t length = [app copyBlockFromStream: _stream
-						 toStream: of_stdout
+						 toStream: OFStdOut
 						 fileName: fileName];
 
 		if (length < 0) {
 			app->_exitStatus = 1;
 			return;
 		}
 	}
 }
 @end