@@ -166,15 +166,15 @@
 
 	return [components componentsJoinedByString: @"."];
 }
 
 static OF_KINDOF(OFDNSResourceRecord *)
-parseResourceRecord(OFString *name, of_dns_class_t DNSClass,
-    of_dns_record_type_t recordType, uint32_t TTL, const unsigned char *buffer,
+parseResourceRecord(OFString *name, OFDNSClass DNSClass,
+    OFDNSRecordType recordType, uint32_t TTL, const unsigned char *buffer,
     size_t length, size_t i, uint16_t dataLength)
 {
-	if (recordType == OF_DNS_RECORD_TYPE_A && DNSClass == OF_DNS_CLASS_IN) {
+	if (recordType == OFDNSRecordTypeA && DNSClass == OFDNSClassIN) {
 		OFSocketAddress address;
 
 		if (dataLength != 4)
 			@throw [OFInvalidServerReplyException exception];
 
@@ -187,11 +187,11 @@
 
 		return [[[OFADNSResourceRecord alloc]
 		    initWithName: name
 			 address: &address
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_NS) {
+	} else if (recordType == OFDNSRecordTypeNS) {
 		size_t j = i;
 		OFString *authoritativeHost = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 
 		if (j != i + dataLength)
@@ -200,11 +200,11 @@
 		return [[[OFNSDNSResourceRecord alloc]
 			 initWithName: name
 			     DNSClass: DNSClass
 		    authoritativeHost: authoritativeHost
 				  TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_CNAME) {
+	} else if (recordType == OFDNSRecordTypeCNAME) {
 		size_t j = i;
 		OFString *alias = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 
 		if (j != i + dataLength)
@@ -213,11 +213,11 @@
 		return [[[OFCNAMEDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 			   alias: alias
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_SOA) {
+	} else if (recordType == OFDNSRecordTypeSOA) {
 		size_t j = i;
 		OFString *primaryNameServer = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 		OFString *responsiblePerson;
 		uint32_t serialNumber, refreshInterval, retryInterval;
@@ -254,11 +254,11 @@
 		       refreshInterval: refreshInterval
 			 retryInterval: retryInterval
 		    expirationInterval: expirationInterval
 				minTTL: minTTL
 				   TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_PTR) {
+	} else if (recordType == OFDNSRecordTypePTR) {
 		size_t j = i;
 		OFString *domainName = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 
 		if (j != i + dataLength)
@@ -267,11 +267,11 @@
 		return [[[OFPTRDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 		      domainName: domainName
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_HINFO) {
+	} else if (recordType == OFDNSRecordTypeHINFO) {
 		size_t j = i;
 		OFString *CPU = parseString(buffer, length, &j);
 		OFString *OS;
 
 		if (j > i + dataLength)
@@ -286,11 +286,11 @@
 		    initWithName: name
 			DNSClass: DNSClass
 			     CPU: CPU
 			      OS: OS
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_MX) {
+	} else if (recordType == OFDNSRecordTypeMX) {
 		uint16_t preference;
 		size_t j;
 		OFString *mailExchange;
 
 		if (dataLength < 2)
@@ -309,11 +309,11 @@
 		    initWithName: name
 			DNSClass: DNSClass
 		      preference: preference
 		    mailExchange: mailExchange
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_TXT) {
+	} else if (recordType == OFDNSRecordTypeTXT) {
 		OFMutableArray *textStrings = [OFMutableArray array];
 
 		while (dataLength > 0) {
 			uint_fast8_t stringLength = buffer[i++];
 			dataLength--;
@@ -335,11 +335,11 @@
 		return [[[OFTXTDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 		     textStrings: textStrings
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_RP) {
+	} else if (recordType == OFDNSRecordTypeRP) {
 		size_t j = i;
 		OFString *mailbox = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 		OFString *TXTDomainName;
 
@@ -356,12 +356,12 @@
 		     initWithName: name
 			 DNSClass: DNSClass
 			  mailbox: mailbox
 		    TXTDomainName: TXTDomainName
 			      TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_AAAA &&
-	    DNSClass == OF_DNS_CLASS_IN) {
+	} else if (recordType == OFDNSRecordTypeAAAA &&
+	    DNSClass == OFDNSClassIN) {
 		OFSocketAddress address;
 
 		if (dataLength != 16)
 			@throw [OFInvalidServerReplyException exception];
 
@@ -378,12 +378,12 @@
 
 		return [[[OFAAAADNSResourceRecord alloc]
 		    initWithName: name
 			 address: &address
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RECORD_TYPE_SRV &&
-	    DNSClass == OF_DNS_CLASS_IN) {
+	} else if (recordType == OFDNSRecordTypeSRV &&
+	    DNSClass == OFDNSClassIN) {
 		uint16_t priority, weight, port;
 		size_t j;
 		OFString *target;
 
 		if (dataLength < 6)
@@ -423,12 +423,12 @@
 	OFMutableArray *array;
 
 	for (uint_fast16_t j = 0; j < count; j++) {
 		OFString *name = parseName(buffer, length, i,
 		    MAX_ALLOWED_POINTERS);
-		of_dns_class_t DNSClass;
-		of_dns_record_type_t recordType;
+		OFDNSClass DNSClass;
+		OFDNSRecordType recordType;
 		uint32_t TTL;
 		uint16_t dataLength;
 		OFDNSResourceRecord *record;
 
 		if (*i + 10 > length)
@@ -807,11 +807,11 @@
 		@throw [OFOutOfRangeException exception];
 
 	if (_settings->_nameServers.count == 0) {
 		id exception = [OFDNSQueryFailedException
 		    exceptionWithQuery: query
-				 error: OF_DNS_RESOLVER_ERROR_NO_NAME_SERVER];
+			     errorCode: OFDNSResolverErrorCodeNoNameServer];
 		[delegate  resolver: self
 		    didPerformQuery: query
 			   response: nil
 			  exception: exception];
 		return;
@@ -869,11 +869,11 @@
 	[_IPv6Socket asyncReceiveIntoBuffer: _buffer length: BUFFER_LENGTH];
 #endif
 
 	exception = [OFDNSQueryFailedException
 	    exceptionWithQuery: context->_query
-			 error: OF_DNS_RESOLVER_ERROR_TIMEOUT];
+		     errorCode: OFDNSResolverErrorCodeTimeout];
 
 	[context->_delegate resolver: self
 		     didPerformQuery: context->_query
 			    response: nil
 			   exception: exception];
@@ -910,11 +910,11 @@
 	[context->_cancelTimer release];
 	context->_cancelTimer = nil;
 	[_queries removeObjectForKey: ID];
 
 	@try {
-		of_dns_resolver_error_t error = 0;
+		OFDNSResolverErrorCode errorCode = 0;
 		bool tryNextNameServer = false;
 		const unsigned char *queryDataBuffer;
 		size_t i;
 		uint16_t numQuestions, numAnswers, numAuthorityRecords;
 		uint16_t numAdditionalRecords;
@@ -953,29 +953,29 @@
 		/* RCODE */
 		switch (buffer[3] & 0x0F) {
 		case 0:
 			break;
 		case 1:
-			error = OF_DNS_RESOLVER_ERROR_SERVER_INVALID_FORMAT;
+			errorCode = OFDNSResolverErrorCodeServerInvalidFormat;
 			break;
 		case 2:
-			error = OF_DNS_RESOLVER_ERROR_SERVER_FAILURE;
+			errorCode = OFDNSResolverErrorCodeServerFailure;
 			tryNextNameServer = true;
 			break;
 		case 3:
-			error = OF_DNS_RESOLVER_ERROR_SERVER_NAME_ERROR;
+			errorCode = OFDNSResolverErrorCodeServerNameError;
 			break;
 		case 4:
-			error = OF_DNS_RESOLVER_ERROR_SERVER_NOT_IMPLEMENTED;
+			errorCode = OFDNSResolverErrorCodeServerNotImplemented;
 			tryNextNameServer = true;
 			break;
 		case 5:
-			error = OF_DNS_RESOLVER_ERROR_SERVER_REFUSED;
+			errorCode = OFDNSResolverErrorCodeServerRefused;
 			tryNextNameServer = true;
 			break;
 		default:
-			error = OF_DNS_RESOLVER_ERROR_UNKNOWN;
+			errorCode = OFDNSResolverErrorCodeUnknown;
 			tryNextNameServer = true;
 			break;
 		}
 
 		if (tryNextNameServer) {
@@ -993,11 +993,11 @@
 		}
 
 		if (buffer[3] & 0x0F)
 			@throw [OFDNSQueryFailedException
 			    exceptionWithQuery: context->_query
-					 error: error];
+				     errorCode: errorCode];
 
 		numQuestions = (buffer[4] << 8) | buffer[5];
 		numAnswers = (buffer[6] << 8) | buffer[7];
 		numAuthorityRecords = (buffer[8] << 8) | buffer[9];
 		numAdditionalRecords = (buffer[10] << 8) | buffer[11];
@@ -1255,11 +1255,11 @@
 	while ((context = [enumerator nextObject]) != nil) {
 		OFDNSQueryFailedException *exception;
 
 		exception = [OFDNSQueryFailedException
 		    exceptionWithQuery: context->_query
-				 error: OF_DNS_RESOLVER_ERROR_CANCELED];
+			     errorCode: OFDNSResolverErrorCodeCanceled];
 
 		[context->_delegate resolver: self
 			     didPerformQuery: context->_query
 				    response: nil
 				   exception: exception];