@@ -68,17 +68,17 @@
 addressForRecord(OF_KINDOF(OFDNSResourceRecord *) record,
     const OFSocketAddress **address, OFSocketAddressFamily addressFamily)
 {
 	switch ([record recordType]) {
 #ifdef OF_HAVE_IPV6
-	case OF_DNS_RECORD_TYPE_AAAA:
+	case OFDNSRecordTypeAAAA:
 		if (addressFamily != OFSocketAddressFamilyIPv6 &&
 		    addressFamily != OFSocketAddressFamilyAny)
 			return false;
 		break;
 #endif
-	case OF_DNS_RECORD_TYPE_A:
+	case OFDNSRecordTypeA:
 		if (addressFamily != OFSocketAddressFamilyIPv4 &&
 		    addressFamily != OFSocketAddressFamilyAny)
 			return false;
 		break;
 	default:
@@ -164,12 +164,12 @@
 #ifdef OF_HAVE_IPV6
 	if (_addressFamily == OFSocketAddressFamilyIPv6 ||
 	    _addressFamily == OFSocketAddressFamilyAny) {
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: domainName
-			       DNSClass: OF_DNS_CLASS_IN
-			     recordType: OF_DNS_RECORD_TYPE_AAAA];
+			       DNSClass: OFDNSClassIN
+			     recordType: OFDNSRecordTypeAAAA];
 		_numExpectedResponses++;
 		[_resolver asyncPerformQuery: query
 				 runLoopMode: _runLoopMode
 				    delegate: self];
 	}
@@ -177,12 +177,12 @@
 
 	if (_addressFamily == OFSocketAddressFamilyIPv4 ||
 	    _addressFamily == OFSocketAddressFamilyAny) {
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: domainName
-			       DNSClass: OF_DNS_CLASS_IN
-			     recordType: OF_DNS_RECORD_TYPE_A];
+			       DNSClass: OFDNSClassIN
+			     recordType: OFDNSRecordTypeA];
 		_numExpectedResponses++;
 		[_resolver asyncPerformQuery: query
 				 runLoopMode: _runLoopMode
 				    delegate: self];
 	}
@@ -194,11 +194,11 @@
 	exception: (id)exception
 {
 	_numExpectedResponses--;
 
 	if ([exception isKindOfClass: [OFDNSQueryFailedException class]] &&
-	    [exception error] == OF_DNS_RESOLVER_ERROR_SERVER_NAME_ERROR &&
+	    [exception errorCode] == OFDNSResolverErrorCodeServerNameError &&
 	    !_isFQDN && _numExpectedResponses == 0 && _addresses.count == 0 &&
 	    _searchDomainIndex + 1 < _settings->_searchDomains.count) {
 		_searchDomainIndex++;
 		[self sendQueries];
 		return;
@@ -207,24 +207,24 @@
 	for (OF_KINDOF(OFDNSResourceRecord *) record in
 	    [response.answerRecords objectForKey: query.domainName]) {
 		const OFSocketAddress *address = NULL;
 		OFDNSQuery *CNAMEQuery;
 
-		if ([record DNSClass] != OF_DNS_CLASS_IN)
+		if ([record DNSClass] != OFDNSClassIN)
 			continue;
 
 		if (addressForRecord(record, &address, _addressFamily)) {
 			[_addresses addItem: address];
 			continue;
 		}
 
-		if ([record recordType] != OF_DNS_RECORD_TYPE_CNAME)
+		if ([record recordType] != OFDNSRecordTypeCNAME)
 			continue;
 
 		/* FIXME: Check if it's already in answers */
 		CNAMEQuery = [OFDNSQuery queryWithDomainName: [record alias]
-						    DNSClass: OF_DNS_CLASS_IN
+						    DNSClass: OFDNSClassIN
 						  recordType: query.recordType];
 		_numExpectedResponses++;
 		[_resolver asyncPerformQuery: CNAMEQuery
 				 runLoopMode: _runLoopMode
 				    delegate: self];
@@ -242,17 +242,17 @@
 		if ([exception isKindOfClass:
 		    [OFDNSQueryFailedException class]])
 			exception = [OFResolveHostFailedException
 			    exceptionWithHost: _host
 				addressFamily: _addressFamily
-					error: [exception error]];
+				    errorCode: [exception errorCode]];
 
 		if (exception == nil)
 			exception = [OFResolveHostFailedException
 			    exceptionWithHost: _host
 				addressFamily: _addressFamily
-					error: OF_DNS_RESOLVER_ERROR_NO_RESULT];
+				    errorCode: OFDNSResolverErrorCodeNoResult];
 	} else
 		exception = nil;
 
 	if ([_delegate respondsToSelector:
 	    @selector(resolver:didResolveHost:addresses:exception:)])
@@ -314,11 +314,11 @@
 		if (addresses.count == 0) {
 			addresses = nil;
 			exception = [OFResolveHostFailedException
 			    exceptionWithHost: _host
 				addressFamily: _addressFamily
-					error: OF_DNS_RESOLVER_ERROR_NO_RESULT];
+				    errorCode: OFDNSResolverErrorCodeNoResult];
 		}
 
 		callDelegateInMode(_runLoopMode, _delegate, _resolver, _host,
 		    addresses, exception);