@@ -33,11 +33,11 @@
 OF_APPLICATION_DELEGATE(OFDNS)
 
 static void
 help(OFStream *stream, bool full, int status)
 {
-	[of_stderr writeLine:
+	[OFStdErr writeLine:
 	    OF_LOCALIZED(@"usage",
 	    @"Usage: %[prog] -[chst] domain1 [domain2 ...]",
 	    @"prog", [OFApplication programName])];
 
 	if (full) {
@@ -65,13 +65,13 @@
 	exception: (id)exception
 {
 	_inFlight--;
 
 	if (exception == nil)
-		[of_stdout writeFormat: @"%@\n", response];
+		[OFStdOut writeFormat: @"%@\n", response];
 	else {
-		[of_stderr writeLine: OF_LOCALIZED(
+		[OFStdErr writeLine: OF_LOCALIZED(
 		    @"failed_to_resolve",
 		    @"Failed to resolve: %[exception]",
 		    @"exception", exception)];
 		_errors++;
 	}
@@ -124,25 +124,25 @@
 		switch (option) {
 		case 't':
 			[recordTypes addObject: optionsParser.argument];
 			break;
 		case 'h':
-			help(of_stdout, true, 0);
+			help(OFStdOut, true, 0);
 			break;
 		case ':':
 			if (optionsParser.lastLongOption != nil)
-				[of_stderr writeLine: OF_LOCALIZED(
+				[OFStdErr writeLine: OF_LOCALIZED(
 				    @"long_option_required_argument",
 				    @"%[prog]: Option --%[opt] requires an "
 				    @"argument",
 				    @"prog", [OFApplication programName],
 				    @"opt", optionsParser.lastLongOption)];
 			else {
 				OFString *optStr = [OFString
 				    stringWithFormat: @"%C",
 				    optionsParser.lastOption];
-				[of_stderr writeLine: OF_LOCALIZED(
+				[OFStdErr writeLine: OF_LOCALIZED(
 				    @"option_requires_argument",
 				    @"%[prog]: Option -%[opt] requires an "
 				    @"argument",
 				    @"prog", [OFApplication programName],
 				    @"opt", optStr)];
@@ -150,20 +150,20 @@
 
 			[OFApplication terminateWithStatus: 1];
 			break;
 		case '?':
 			if (optionsParser.lastLongOption != nil)
-				[of_stderr writeLine: OF_LOCALIZED(
+				[OFStdErr writeLine: OF_LOCALIZED(
 				    @"unknown_long_option",
 				    @"%[prog]: Unknown option: --%[opt]",
 				    @"prog", [OFApplication programName],
 				    @"opt", optionsParser.lastLongOption)];
 			else {
 				OFString *optStr = [OFString
 				    stringWithFormat: @"%C",
 				    optionsParser.lastOption];
-				[of_stderr writeLine: OF_LOCALIZED(
+				[OFStdErr writeLine: OF_LOCALIZED(
 				    @"Unknown_option",
 				    @"%[prog]: Unknown option: -%[opt]",
 				    @"prog", [OFApplication programName],
 				    @"opt", optStr)];
 			}
@@ -174,11 +174,11 @@
 	}
 
 	remainingArguments = optionsParser.remainingArguments;
 
 	if (remainingArguments.count < 1)
-		help(of_stderr, false, 1);
+		help(OFStdErr, false, 1);
 
 	resolver = [OFDNSResolver resolver];
 	DNSClass = (DNSClassString != nil
 	    ? OFDNSClassParseName(DNSClassString) : OFDNSClassIN);