@@ -75,20 +75,20 @@
 	OFDNSQuery *_query;
 	OFNumber *_ID;
 	OFDNSResolverSettings *_settings;
 	size_t _nameServersIndex;
 	unsigned int _attempt;
-	id <OFDNSResolverDelegate> _delegate;
+	id <OFDNSResolverQueryDelegate> _delegate;
 	OFData *_queryData;
 	of_socket_address_t _usedNameServer;
 	OFTimer *_cancelTimer;
 }
 
 - (instancetype)initWithQuery: (OFDNSQuery *)query
 			   ID: (OFNumber *)ID
 		     settings: (OFDNSResolverSettings *)settings
-		     delegate: (id <OFDNSResolverDelegate>)delegate;
+		     delegate: (id <OFDNSResolverQueryDelegate>)delegate;
 @end
 
 static OFString *
 parseString(const unsigned char *buffer, size_t length, size_t *i)
 {
@@ -456,11 +456,11 @@
 
 @implementation OFDNSResolverContext
 - (instancetype)initWithQuery: (OFDNSQuery *)query
 			   ID: (OFNumber *)ID
 		     settings: (OFDNSResolverSettings *)settings
-		     delegate: (id <OFDNSResolverDelegate>)delegate
+		     delegate: (id <OFDNSResolverQueryDelegate>)delegate
 {
 	self = [super init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
@@ -756,20 +756,20 @@
 			      length: BUFFER_LENGTH
 			 runLoopMode: runLoopMode];
 }
 
 - (void)asyncPerformQuery: (OFDNSQuery *)query
-		 delegate: (id <OFDNSResolverDelegate>)delegate
+		 delegate: (id <OFDNSResolverQueryDelegate>)delegate
 {
 	[self asyncPerformQuery: query
 		    runLoopMode: of_run_loop_mode_default
 		       delegate: delegate];
 }
 
 - (void)asyncPerformQuery: (OFDNSQuery *)query
 	      runLoopMode: (of_run_loop_mode_t)runLoopMode
-		 delegate: (id <OFDNSResolverDelegate>)delegate
+		 delegate: (id <OFDNSResolverQueryDelegate>)delegate
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFNumber *ID;
 	OFDNSResolverContext *context;
 
@@ -995,21 +995,21 @@
 
 	return false;
 }
 
 - (void)asyncResolveAddressesForHost: (OFString *)host
-			    delegate: (id <OFDNSResolverDelegate>)delegate
+			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	[self asyncResolveAddressesForHost: host
 			     addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
 			       runLoopMode: of_run_loop_mode_default
 				  delegate: delegate];
 }
 
 - (void)asyncResolveAddressesForHost: (OFString *)host
 		       addressFamily: (of_socket_address_family_t)addressFamily
-			    delegate: (id <OFDNSResolverDelegate>)delegate
+			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	[self asyncResolveAddressesForHost: host
 			     addressFamily: addressFamily
 			       runLoopMode: of_run_loop_mode_default
 				  delegate: delegate];
@@ -1016,11 +1016,11 @@
 }
 
 - (void)asyncResolveAddressesForHost: (OFString *)host
 		       addressFamily: (of_socket_address_family_t)addressFamily
 			 runLoopMode: (of_run_loop_mode_t)runLoopMode
-			    delegate: (id <OFDNSResolverDelegate>)delegate
+			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFHostAddressResolver *resolver = [[[OFHostAddressResolver alloc]
 	    initWithHost: host
 	   addressFamily: addressFamily