@@ -37,12 +37,12 @@
 		TEST(@"-[bindToHost:port:]",
 		    (port = [server bindToHost: @"127.0.0.1" port: 0]))
 	} @catch (OFBindFailedException *e) {
 		switch (e.errNo) {
 		case EPROTONOSUPPORT:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
 			    @"[OFSCTPSocket] -[bindToHost:port:]: "
 			    @"SCTP unsupported, skipping tests"];
 			break;
 		default:
 			@throw e;
@@ -58,11 +58,11 @@
 	    R([client connectToHost: @"127.0.0.1" port: port]))
 
 	TEST(@"-[accept]", (accepted = [server accept]))
 
 	TEST(@"-[remoteAddress]",
-	    [of_socket_address_ip_string(accepted.remoteAddress, NULL)
+	    [OFSocketAddressString(accepted.remoteAddress)
 	    isEqual: @"127.0.0.1"])
 
 	TEST(@"-[sendBuffer:length:]",
 	    R([client sendBuffer: "Hello!" length: 6]))