Index: src/OFIPXSocket.h
==================================================================
--- src/OFIPXSocket.h
+++ src/OFIPXSocket.h
@@ -34,11 +34,11 @@
  *
  * Addresses are of type @ref OFSocketAddress. You can use
  * @ref OFSocketAddressMakeIPX to create an address or
  * @ref OFSocketAddressIPXNetwork to get the IPX network,
  * @ref OFSocketAddressIPXNode to get the IPX node and
- * @ref OFSocketAddressPort to get the port (sometimes also called
+ * @ref OFSocketAddressIPXPort to get the port (sometimes also called
  * socket number).
  *
  * @warning Even though the OFCopying protocol is implemented, it does *not*
  *	    return an independent copy of the socket, but instead retains it.
  *	    This is so that the socket can be used as a key for a dictionary,

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -355,11 +355,11 @@
 			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) {
 				port = rnd;

Index: src/OFUDPSocket.h
==================================================================
--- src/OFUDPSocket.h
+++ src/OFUDPSocket.h
@@ -33,11 +33,11 @@
  * @brief A class which provides methods to create and use UDP sockets.
  *
  * Addresses are of type @ref OFSocketAddress. You can use the current thread's
  * @ref OFDNSResolver to create an address for a host / port pair,
  * @ref OFSocketAddressString to get the IP address string for an address and
- * @ref OFSocketAddressPort to get the port for an address. If you want to
+ * @ref OFSocketAddressIPPort to get the port for an address. If you want to
  * compare two addresses, you can use
  * @ref OFSocketAddressEqual and you can use @ref OFSocketAddressHash to get a
  * hash to use in e.g. @ref OFMapTable.
  *
  * @warning Even though the OFCopying protocol is implemented, it does *not*

Index: src/OFUDPSocket.m
==================================================================
--- src/OFUDPSocket.m
+++ src/OFUDPSocket.m
@@ -90,11 +90,11 @@
 			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;