@@ -33,11 +33,11 @@
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 #import "OFThread.h"
 
 #import "OFAlreadyConnectedException.h"
-#import "OFBindFailedException.h"
+#import "OFBindIPSocketFailedException.h"
 
 @implementation OFUDPSocket
 @dynamic delegate;
 
 - (uint16_t)of_bindToAddress: (OFSocketAddress *)address
@@ -50,13 +50,13 @@
 #endif
 
 	if ((_socket = socket(
 	    ((struct sockaddr *)&address->sockaddr)->sa_family,
 	    SOCK_DGRAM | SOCK_CLOEXEC | extraType, 0)) == OFInvalidSocketHandle)
-		@throw [OFBindFailedException
+		@throw [OFBindIPSocketFailedException
 		    exceptionWithHost: OFSocketAddressString(address)
-				 port: OFSocketAddressPort(address)
+				 port: OFSocketAddressIPPort(address)
 			       socket: self
 				errNo: OFSocketErrNo()];
 
 	_canBlock = true;
 
@@ -66,22 +66,22 @@
 		fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
 	}
 #endif
 
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
-	if (OFSocketAddressPort(address) != 0) {
+	if (OFSocketAddressIPPort(address) != 0) {
 #endif
 		if (bind(_socket, (struct sockaddr *)&address->sockaddr,
 		    address->length) != 0) {
 			int errNo = OFSocketErrNo();
 
 			closesocket(_socket);
 			_socket = OFInvalidSocketHandle;
 
-			@throw [OFBindFailedException
+			@throw [OFBindIPSocketFailedException
 			    exceptionWithHost: OFSocketAddressString(address)
-					 port: OFSocketAddressPort(address)
+					 port: OFSocketAddressIPPort(address)
 				       socket: self
 					errNo: errNo];
 		}
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	} else {
@@ -90,26 +90,26 @@
 			int ret;
 
 			while (rnd < 1024)
 				rnd = (uint16_t)rand();
 
-			OFSocketAddressSetPort(address, rnd);
+			OFSocketAddressSetIPPort(address, rnd);
 
 			if ((ret = bind(_socket,
 			    (struct sockaddr *)&address->sockaddr,
 			    address->length)) == 0)
 				break;
 
 			if (OFSocketErrNo() != EADDRINUSE) {
 				int errNo = OFSocketErrNo();
 				OFString *host = OFSocketAddressString(address);
-				port = OFSocketAddressPort(address);
+				port = OFSocketAddressIPPort(address);
 
 				closesocket(_socket);
 				_socket = OFInvalidSocketHandle;
 
-				@throw [OFBindFailedException
+				@throw [OFBindIPSocketFailedException
 				    exceptionWithHost: host
 						 port: port
 					       socket: self
 						errNo: errNo];
 			}
@@ -117,11 +117,11 @@
 	}
 #endif
 
 	objc_autoreleasePoolPop(pool);
 
-	if ((port = OFSocketAddressPort(address)) > 0)
+	if ((port = OFSocketAddressIPPort(address)) > 0)
 		return port;
 
 #if !defined(OF_HPUX) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	memset(address, 0, sizeof(*address));
 
@@ -131,13 +131,13 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException
+		@throw [OFBindIPSocketFailedException
 		    exceptionWithHost: OFSocketAddressString(address)
-				 port: OFSocketAddressPort(address)
+				 port: OFSocketAddressIPPort(address)
 			       socket: self
 				errNo: errNo];
 	}
 
 	switch (((struct sockaddr *)&address->sockaddr)->sa_family) {
@@ -149,23 +149,23 @@
 # endif
 	default:
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException
+		@throw [OFBindIPSocketFailedException
 		    exceptionWithHost: OFSocketAddressString(address)
-				 port: OFSocketAddressPort(address)
+				 port: OFSocketAddressIPPort(address)
 			       socket: self
 				errNo: EAFNOSUPPORT];
 	}
 #else
 	closesocket(_socket);
 	_socket = OFInvalidSocketHandle;
 
-	@throw [OFBindFailedException
+	@throw [OFBindIPSocketFailedException
 	    exceptionWithHost: OFSocketAddressString(address)
-			 port: OFSocketAddressPort(address)
+			 port: OFSocketAddressIPPort(address)
 		       socket: self
 			errNo: EADDRNOTAVAIL];
 #endif
 }
 
@@ -181,14 +181,14 @@
 	socketAddresses = [[OFThread DNSResolver]
 	    resolveAddressesForHost: host
 		      addressFamily: OFSocketAddressFamilyAny];
 
 	address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0];
-	OFSocketAddressSetPort(&address, port);
+	OFSocketAddressSetIPPort(&address, port);
 
 	port = [self of_bindToAddress: &address extraType: 0];
 
 	objc_autoreleasePoolPop(pool);
 
 	return port;
 }
 @end