@@ -71,12 +71,12 @@
 @implementation TestsAppDelegate (OFSPXStreamSocketTests)
 - (void)SPXStreamSocketTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSPXStreamSocket *sockClient, *sockServer, *sockAccepted;;
-	of_socket_address_t address1;
-	const of_socket_address_t *address2;
+	OFSocketAddress address1;
+	const OFSocketAddress *address2;
 	unsigned char node[IPX_NODE_LEN], node2[IPX_NODE_LEN];
 	uint32_t network;
 	uint16_t port;
 	char buffer[5];
 	SPXStreamSocketDelegate *delegate;
@@ -113,13 +113,13 @@
 
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
 
-	of_socket_address_get_ipx_node(&address1, node);
-	network = of_socket_address_get_ipx_network(&address1);
-	port = of_socket_address_get_port(&address1);
+	OFSocketAddressIPXNode(&address1, node);
+	network = OFSocketAddressIPXNetwork(&address1);
+	port = OFSocketAddressPort(&address1);
 
 	TEST(@"-[listen]", R([sockServer listen]))
 
 	TEST(@"-[connectToNode:network:port:]",
 	    R([sockClient connectToNode: node network: network port: port]))
@@ -136,13 +136,13 @@
 	    [sockClient readIntoBuffer: buffer length: 3] == 3 &&
 	    memcmp(buffer, "llo", 3) == 0)
 
 	TEST(@"-[remoteAddress]",
 	    (address2 = sockAccepted.remoteAddress) &&
-	    R(of_socket_address_get_ipx_node(address2, node2)) &&
+	    R(OFSocketAddressIPXNode(address2, node2)) &&
 	    memcmp(node, node2, IPX_NODE_LEN) == 0 &&
-	    of_socket_address_get_ipx_network(address2) == network)
+	    OFSocketAddressIPXNetwork(address2) == network)
 
 	delegate = [[[SPXStreamSocketDelegate alloc] init] autorelease];
 
 	sockServer = [OFSPXStreamSocket socket];
 	delegate->_expectedServerSocket = sockServer;
@@ -154,15 +154,15 @@
 
 	address1 = [sockServer bindToPort: 0];
 	[sockServer listen];
 	[sockServer asyncAccept];
 
-	of_socket_address_get_ipx_node(&address1, node);
+	OFSocketAddressIPXNode(&address1, node);
 	memcpy(delegate->_expectedNode, node, IPX_NODE_LEN);
 	delegate->_expectedNetwork = network =
-	    of_socket_address_get_ipx_network(&address1);
-	delegate->_expectedPort = port = of_socket_address_get_port(&address1);
+	    OFSocketAddressIPXNetwork(&address1);
+	delegate->_expectedPort = port = OFSocketAddressPort(&address1);
 
 	@try {
 		[sockClient asyncConnectToNode: node
 				       network: network
 					  port: port];