@@ -88,24 +88,24 @@
 		TEST(@"-[bindToPort:]",
 		    R(address1 = [sockServer bindToPort: 0]))
 	} @catch (OFBindFailedException *e) {
 		switch (e.errNo) {
 		case EAFNOSUPPORT:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
 			    @"\r[OFSPXSocket] -[bindToPort:]: "
 			    @"IPX unsupported, skipping tests"];
 			break;
 		case ESOCKTNOSUPPORT:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
 			    @"\r[OFSPXSocket] -[bindToPort:]: "
 			    @"SPX unsupported, skipping tests"];
 			break;
 		case EADDRNOTAVAIL:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
 			    @"\r[OFSPXSocket] -[bindToPort:]: "
 			    @"IPX not configured, skipping tests"];
 			break;
 		default:
 			@throw e;
@@ -170,12 +170,12 @@
 		TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]",
 		    delegate->_accepted && delegate->_connected)
 	} @catch (OFObserveFailedException *e) {
 		switch (e.errNo) {
 		case ENOTSOCK:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
 			    @"\r[OFSPXSocket] -[asyncAccept] & "
 			    @"-[asyncConnectToNode:network:port:]: select() "
 			    @"not supported for SPX, skipping test"];
 			break;
 		default: