Index: src/OFUDPSocket.h
==================================================================
--- src/OFUDPSocket.h
+++ src/OFUDPSocket.h
@@ -35,11 +35,11 @@
  * 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
  * compare two addresses, you can use
- * @ref OFEqualSocketAddress and you can use @ref OFSocketAddressHash to get a
+ * @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*
  *	    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/socket.m
==================================================================
--- src/socket.m
+++ src/socket.m
@@ -678,11 +678,11 @@
 
 	return hash;
 }
 
 static OFString *
-IPv4AddressString(const OFSocketAddress *address)
+IPv4String(const OFSocketAddress *address)
 {
 	const struct sockaddr_in *addrIn = &address->sockaddr.in;
 	uint32_t addr = OF_BSWAP32_IF_LE(addrIn->sin_addr.s_addr);
 	OFString *string;
 
@@ -692,11 +692,11 @@
 
 	return string;
 }
 
 static OFString *
-IPv6AddressString(const OFSocketAddress *address)
+IPv6String(const OFSocketAddress *address)
 {
 	OFMutableString *string = [OFMutableString string];
 	const struct sockaddr_in6 *addrIn6 = &address->sockaddr.in6;
 	int_fast8_t zerosStart = -1, maxZerosStart = -1;
 	uint_fast8_t zerosCount = 0, maxZerosCount = 0;
@@ -763,13 +763,13 @@
 OFString *
 OFSocketAddressString(const OFSocketAddress *address)
 {
 	switch (address->family) {
 	case OFSocketAddressFamilyIPv4:
-		return IPv4AddressString(address);
+		return IPv4String(address);
 	case OFSocketAddressFamilyIPv6:
-		return IPv6AddressString(address);
+		return IPv6String(address);
 	default:
 		@throw [OFInvalidArgumentException exception];
 	}
 }
 

Index: tests/OFIPXSocketTests.m
==================================================================
--- tests/OFIPXSocketTests.m
+++ tests/OFIPXSocketTests.m
@@ -61,10 +61,10 @@
 
 	TEST(@"-[receiveIntoBuffer:length:sender:]",
 	    [sock receiveIntoBuffer: buffer length: 5 sender: &address2] == 5 &&
 	    memcmp(buffer, "Hello", 5) == 0 &&
 	    OFSocketAddressEqual(&address1, &address2) &&
-	    OFSocketaddressHash(&address1) == OFSocketaddressHash(&address2))
+	    OFSocketAddressHash(&address1) == OFSocketAddressHash(&address2))
 
 	objc_autoreleasePoolPop(pool);
 }
 @end