@@ -14,11 +14,11 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #import "OFObject.h"
-#import "OFDNSRequest.h"
+#import "OFDNSQuery.h"
 #import "OFDNSResourceRecord.h"
 #import "OFDNSResponse.h"
 #import "OFRunLoop.h"
 #import "OFString.h"
 
@@ -191,28 +191,28 @@
  * @brief Initializes an already allocated OFDNSResolver.
  */
 - (instancetype)init;
 
 /*!
- * @brief Asynchronously performs the specified request.
+ * @brief Asynchronously performs the specified query.
  *
- * @param request The request to perform
+ * @param query The query to perform
  * @param delegate The delegate to use for callbacks
  */
-- (void)asyncPerformRequest: (OFDNSRequest *)request
-		   delegate: (id <OFDNSResolverDelegate>)delegate;
+- (void)asyncPerformQuery: (OFDNSQuery *)query
+		 delegate: (id <OFDNSResolverDelegate>)delegate;
 
 /*!
- * @brief Asynchronously performs the specified request.
+ * @brief Asynchronously performs the specified query.
  *
- * @param request The request to perform
+ * @param query The query to perform
  * @param runLoopMode The run loop mode in which to resolve
  * @param delegate The delegate to use for callbacks
  */
-- (void)asyncPerformRequest: (OFDNSRequest *)request
-		runLoopMode: (of_run_loop_mode_t)runLoopMode
-		   delegate: (id <OFDNSResolverDelegate>)delegate;
+- (void)asyncPerformQuery: (OFDNSQuery *)query
+	      runLoopMode: (of_run_loop_mode_t)runLoopMode
+		 delegate: (id <OFDNSResolverDelegate>)delegate;
 
 /*!
  * @brief Asynchronously resolves the specified host to socket addresses.
  *
  * @param host The host to resolve
@@ -260,11 +260,11 @@
 - (OFData *)resolveSocketAddressesForHost: (OFString *)host
 			    addressFamily: (of_socket_address_family_t)
 					       addressFamily;
 
 /*!
- * @brief Closes all sockets and cancels all ongoing requests.
+ * @brief Closes all sockets and cancels all ongoing queries.
  */
 - (void)close;
 @end
 
 OF_ASSUME_NONNULL_END