@@ -26,12 +26,12 @@
  * @brief A class representing a DNS query.
  */
 @interface OFDNSQuery: OFObject <OFCopying>
 {
 	OFString *_domainName;
-	of_dns_class_t _DNSClass;
-	of_dns_record_type_t _recordType;
+	OFDNSClass _DNSClass;
+	OFDNSRecordType _recordType;
 	OF_RESERVE_IVARS(OFDNSQuery, 4)
 }
 
 /**
  * @brief The domain name of the query.
@@ -39,16 +39,16 @@
 @property (readonly, nonatomic) OFString *domainName;
 
 /**
  * @brief The DNS class of the query.
  */
-@property (readonly, nonatomic) of_dns_class_t DNSClass;
+@property (readonly, nonatomic) OFDNSClass DNSClass;
 
 /**
  * @brief The record type of the query.
  */
-@property (readonly, nonatomic) of_dns_record_type_t recordType;
+@property (readonly, nonatomic) OFDNSRecordType recordType;
 
 /**
  * @brief Creates a new, autoreleased OFDNSQuery.
  *
  * @param domainName The domain name to query
@@ -55,12 +55,12 @@
  * @param DNSClass The DNS class of the query
  * @param recordType The record type of the query
  * @return A new, autoreleased OFDNSQuery
  */
 + (instancetype)queryWithDomainName: (OFString *)domainName
-			   DNSClass: (of_dns_class_t)DNSClass
-			 recordType: (of_dns_record_type_t)recordType;
+			   DNSClass: (OFDNSClass)DNSClass
+			 recordType: (OFDNSRecordType)recordType;
 
 /**
  * @brief Initializes an already allocated OFDNSQuery.
  *
  * @param domainName The domain name to query
@@ -67,13 +67,13 @@
  * @param DNSClass The DNS class of the query
  * @param recordType The record type of the query
  * @return An initialized OFDNSQuery
  */
 - (instancetype)initWithDomainName: (OFString *)domainName
-			  DNSClass: (of_dns_class_t)DNSClass
-			recordType: (of_dns_record_type_t)recordType
+			  DNSClass: (OFDNSClass)DNSClass
+			recordType: (OFDNSRecordType)recordType
     OF_DESIGNATED_INITIALIZER;
 
 - (instancetype)init OF_UNAVAILABLE;
 @end
 
 OF_ASSUME_NONNULL_END