@@ -44,21 +44,21 @@
 
 OF_DIRECT_MEMBERS
 @interface OFSPXSocketAsyncConnectDelegate: OFObject <OFRunLoopConnectDelegate>
 {
 	OFSPXSocket *_socket;
-	unsigned char _node[IPX_NODE_LEN];
 	uint32_t _network;
+	unsigned char _node[IPX_NODE_LEN];
 	uint16_t _port;
 #ifdef OF_HAVE_BLOCKS
 	OFSPXSocketAsyncConnectBlock _block;
 #endif
 }
 
 - (instancetype)initWithSocket: (OFSPXSocket *)socket
-			  node: (unsigned char [IPX_NODE_LEN])node
 		       network: (uint32_t)network
+			  node: (unsigned char [IPX_NODE_LEN])node
 			  port: (uint16_t)port
 #ifdef OF_HAVE_BLOCKS
 			 block: (OFSPXSocketAsyncConnectBlock)block
 #endif
 ;
@@ -65,23 +65,23 @@
 - (void)startWithRunLoopMode: (OFRunLoopMode)runLoopMode;
 @end
 
 @implementation OFSPXSocketAsyncConnectDelegate
 - (instancetype)initWithSocket: (OFSPXSocket *)sock
-			  node: (unsigned char [IPX_NODE_LEN])node
 		       network: (uint32_t)network
+			  node: (unsigned char [IPX_NODE_LEN])node
 			  port: (uint16_t)port
 #ifdef OF_HAVE_BLOCKS
 			 block: (OFSPXSocketAsyncConnectBlock)block
 #endif
 {
 	self = [super init];
 
 	@try {
 		_socket = [sock retain];
-		memcpy(_node, node, IPX_NODE_LEN);
 		_network = network;
+		memcpy(_node, node, IPX_NODE_LEN);
 		_port = port;
 #ifdef OF_HAVE_BLOCKS
 		_block = [block copy];
 #endif
 	} @catch (id e) {
@@ -103,11 +103,11 @@
 }
 
 - (void)startWithRunLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFSocketAddress address =
-	    OFSocketAddressMakeIPX(_node, _network, _port);
+	    OFSocketAddressMakeIPX(_network, _node, _port);
 	id exception = nil;
 	int errNo;
 
 	if (![_socket of_createSocketForAddress: &address errNo: &errNo]) {
 		exception = [self of_connectionFailedExceptionForErrNo: errNo];
@@ -151,28 +151,28 @@
 	if (_block != NULL)
 		_block(exception);
 	else {
 #endif
 		if ([delegate respondsToSelector:
-		    @selector(socket:didConnectToNode:network:port:exception:)])
-			[delegate     socket: _socket
-			    didConnectToNode: _node
-				     network: _network
-					port: _port
-				   exception: exception];
+		    @selector(socket:didConnectToNetwork:node:port:exception:)])
+			[delegate	 socket: _socket
+			    didConnectToNetwork: _network
+					   node: _node
+					   port: _port
+				      exception: exception];
 #ifdef OF_HAVE_BLOCKS
 	}
 #endif
 }
 
 - (id)of_connectionFailedExceptionForErrNo: (int)errNo
 {
-	return [OFConnectionFailedException exceptionWithNode: _node
-						      network: _network
-							 port: _port
-						       socket: _socket
-							errNo: errNo];
+	return [OFConnectionFailedException exceptionWithNetwork: _network
+							    node: _node
+							    port: _port
+							  socket: _socket
+							   errNo: errNo];
 }
 @end
 
 @implementation OFSPXSocket
 @dynamic delegate;
@@ -221,58 +221,58 @@
 {
 	closesocket(_socket);
 	_socket = OFInvalidSocketHandle;
 }
 
-- (void)connectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
-	      network: (uint32_t)network
-		 port: (uint16_t)port
+- (void)connectToNetwork: (uint32_t)network
+		    node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+		    port: (uint16_t)port
 {
-	OFSocketAddress address = OFSocketAddressMakeIPX(node, network, port);
+	OFSocketAddress address = OFSocketAddressMakeIPX(network, node, port);
 	int errNo;
 
 	if (![self of_createSocketForAddress: &address errNo: &errNo])
 		@throw [OFConnectionFailedException
-		    exceptionWithNode: node
-			      network: network
-				 port: port
-			       socket: self
-				errNo: errNo];
+		    exceptionWithNetwork: network
+				    node: node
+				    port: port
+				  socket: self
+				   errNo: errNo];
 
 	if (![self of_connectSocketToAddress: &address errNo: &errNo]) {
 		[self of_closeSocket];
 
 		@throw [OFConnectionFailedException
-		    exceptionWithNode: node
-			      network: network
-				 port: port
-			       socket: self
-				errNo: errNo];
-	}
-}
-
-- (void)asyncConnectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
-		   network: (uint32_t)network
-		      port: (uint16_t)port
-{
-	[self asyncConnectToNode: node
-			 network: network
-			    port: port
-		     runLoopMode: OFDefaultRunLoopMode];
-}
-
-- (void)asyncConnectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
-		   network: (uint32_t)network
-		      port: (uint16_t)port
-	       runLoopMode: (OFRunLoopMode)runLoopMode
+		    exceptionWithNetwork: network
+				    node: node
+				    port: port
+				  socket: self
+				   errNo: errNo];
+	}
+}
+
+- (void)asyncConnectToNetwork: (uint32_t)network
+			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 port: (uint16_t)port
+{
+	[self asyncConnectToNetwork: network
+			       node: node
+			       port: port
+			runLoopMode: OFDefaultRunLoopMode];
+}
+
+- (void)asyncConnectToNetwork: (uint32_t)network
+			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 port: (uint16_t)port
+		  runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[[[[OFSPXSocketAsyncConnectDelegate alloc]
 	    initWithSocket: self
-		      node: node
 		   network: network
+		      node: node
 		      port: port
 #ifdef OF_HAVE_BLOCKS
 		     block: NULL
 #endif
 	    ] autorelease] startWithRunLoopMode: runLoopMode];
@@ -279,34 +279,34 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)asyncConnectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
-		   network: (uint32_t)network
-		      port: (uint16_t)port
-		     block: (OFSPXSocketAsyncConnectBlock)block
-{
-	[self asyncConnectToNode: node
-			 network: network
-			    port: port
-		     runLoopMode: OFDefaultRunLoopMode
-			   block: block];
-}
-
-- (void)asyncConnectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
-		   network: (uint32_t)network
-		      port: (uint16_t)port
-	       runLoopMode: (OFRunLoopMode)runLoopMode
-		     block: (OFSPXSocketAsyncConnectBlock)block
+- (void)asyncConnectToNetwork: (uint32_t)network
+			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 port: (uint16_t)port
+			block: (OFSPXSocketAsyncConnectBlock)block
+{
+	[self asyncConnectToNetwork: network
+			       node: node
+			       port: port
+			runLoopMode: OFDefaultRunLoopMode
+			      block: block];
+}
+
+- (void)asyncConnectToNetwork: (uint32_t)network
+			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 port: (uint16_t)port
+		  runLoopMode: (OFRunLoopMode)runLoopMode
+			block: (OFSPXSocketAsyncConnectBlock)block
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[[[[OFSPXSocketAsyncConnectDelegate alloc]
 	    initWithSocket: self
-		      node: node
 		   network: network
+		      node: node
 		      port: port
 		     block: block
 	    ] autorelease] startWithRunLoopMode: runLoopMode];
 
 	objc_autoreleasePoolPop(pool);
@@ -322,11 +322,11 @@
 #endif
 
 	if (_socket != OFInvalidSocketHandle)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
-	address = OFSocketAddressMakeIPX(zeroNode, 0, port);
+	address = OFSocketAddressMakeIPX(0, zeroNode, port);
 
 	if ((_socket = socket(address.sockaddr.sockaddr.sa_family,
 	    SOCK_SEQPACKET | SOCK_CLOEXEC, NSPROTO_SPX)) ==
 	    OFInvalidSocketHandle)
 		@throw [OFBindFailedException