@@ -319,22 +319,22 @@
 #endif
 
 	[self didConnect];
 }
 
--	(void)resolver: (OFDNSResolver *)resolver
-  didResolveDomainName: (OFString *)domainName
-       socketAddresses: (OFData *)socketAddresses
-	     exception: (id)exception
+- (void)resolver: (OFDNSResolver *)resolver
+  didResolveHost: (OFString *)host
+       addresses: (OFData *)addresses
+       exception: (id)exception
 {
 	if (exception != nil) {
 		_exception = [exception retain];
 		[self didConnect];
 		return;
 	}
 
-	_socketAddresses = [socketAddresses copy];
+	_socketAddresses = [addresses copy];
 
 	[self tryNextAddressWithRunLoopMode:
 	    [OFRunLoop currentRunLoop].currentMode];
 }
 
@@ -367,14 +367,14 @@
 		return;
 	} @catch (OFInvalidFormatException *e) {
 	}
 
 	[[OFThread DNSResolver]
-	    asyncResolveSocketAddressesForHost: host
-				 addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
-				   runLoopMode: runLoopMode
-				      delegate: self];
+	    asyncResolveAddressesForHost: host
+			   addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
+			     runLoopMode: runLoopMode
+				delegate: self];
 }
 
 - (void)sendSOCKS5Request
 {
 	OFData *data = [OFData dataWithItems: "\x05\x01\x00"
@@ -810,12 +810,12 @@
 	if (_SOCKS5Host != nil)
 		@throw [OFNotImplementedException exceptionWithSelector: _cmd
 								 object: self];
 
 	socketAddresses = [[OFThread DNSResolver]
-	    resolveSocketAddressesForHost: host
-			    addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY];
+	    resolveAddressesForHost: host
+		      addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY];
 
 	address = *(of_socket_address_t *)[socketAddresses itemAtIndex: 0];
 	of_socket_address_set_port(&address, port);
 
 	if ((_socket = socket(address.sockaddr.sockaddr.sa_family,