@@ -93,11 +93,11 @@
 	OFMutableArray OF_GENERIC(OFString *) *recordTypes;
 	OFOptionsParser *optionsParser;
 	OFUnichar option;
 	OFArray OF_GENERIC(OFString *) *remainingArguments;
 	OFDNSResolver *resolver;
-	of_dns_class_t DNSClass;
+	OFDNSClass DNSClass;
 
 #ifdef OF_HAVE_FILES
 # ifndef OF_AMIGAOS
 	[OFLocale addLanguageDirectory: @LANGUAGE_DIR];
 # else
@@ -178,12 +178,11 @@
 	if (remainingArguments.count < 1)
 		help(of_stderr, false, 1);
 
 	resolver = [OFDNSResolver resolver];
 	DNSClass = (DNSClassString != nil
-	    ? of_dns_class_parse(DNSClassString)
-	    : OF_DNS_CLASS_IN);
+	    ? OFDNSClassParseName(DNSClassString) : OFDNSClassIN);
 
 	if (recordTypes.count == 0)
 		[recordTypes addObject: @"ALL"];
 
 	if (server != nil) {
@@ -191,12 +190,12 @@
 		resolver.nameServers = [OFArray arrayWithObject: server];
 	}
 
 	for (OFString *domainName in remainingArguments) {
 		for (OFString *recordTypeString in recordTypes) {
-			of_dns_record_type_t recordType =
-			    of_dns_record_type_parse(recordTypeString);
+			OFDNSRecordType recordType =
+			    OFDNSRecordTypeParseName(recordTypeString);
 			OFDNSQuery *query =
 			    [OFDNSQuery queryWithDomainName: domainName
 						   DNSClass: DNSClass
 						 recordType: recordType];