@@ -36,11 +36,11 @@
 
 #import "OFDNSQueryFailedException.h"
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
-#import "OFInvalidServerReplyException.h"
+#import "OFInvalidServerResponseException.h"
 #import "OFNotImplementedException.h"
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 
 #ifndef SOCK_DNS
@@ -126,21 +126,21 @@
 		if (componentLength & 0xC0) {
 			size_t j;
 			OFString *suffix;
 
 			if (pointerLevel == 0)
-				@throw [OFInvalidServerReplyException
+				@throw [OFInvalidServerResponseException
 				    exception];
 
 			if (*i >= length)
 				@throw [OFTruncatedDataException exception];
 
 			j = ((componentLength & 0x3F) << 8) | buffer[(*i)++];
 
 			if (j == *i - 2)
 				/* Pointing to itself?! */
-				@throw [OFInvalidServerReplyException
+				@throw [OFInvalidServerResponseException
 				    exception];
 
 			suffix = parseName(buffer, length, &j,
 			    pointerLevel - 1);
 
@@ -173,11 +173,11 @@
 {
 	if (recordType == OFDNSRecordTypeA && DNSClass == OFDNSClassIN) {
 		OFSocketAddress address;
 
 		if (dataLength != 4)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		memset(&address, 0, sizeof(address));
 		address.family = OFSocketAddressFamilyIPv4;
 		address.length = sizeof(address.sockaddr.in);
 
@@ -192,11 +192,11 @@
 		size_t j = i;
 		OFString *authoritativeHost = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFNSDNSResourceRecord alloc]
 			 initWithName: name
 			     DNSClass: DNSClass
 		    authoritativeHost: authoritativeHost
@@ -205,11 +205,11 @@
 		size_t j = i;
 		OFString *alias = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFCNAMEDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 			   alias: alias
@@ -221,17 +221,17 @@
 		OFString *responsiblePerson;
 		uint32_t serialNumber, refreshInterval, retryInterval;
 		uint32_t expirationInterval, minTTL;
 
 		if (j > i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		responsiblePerson = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 
 		if (dataLength - (j - i) != 20)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		serialNumber = (buffer[j] << 24) | (buffer[j + 1] << 16) |
 		    (buffer[j + 2] << 8) | buffer[j + 3];
 		refreshInterval = (buffer[j + 4] << 24) |
 		    (buffer[j + 5] << 16) | (buffer[j + 6] << 8) |
@@ -259,11 +259,11 @@
 		size_t j = i;
 		OFString *domainName = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFPTRDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 		      domainName: domainName
@@ -272,16 +272,16 @@
 		size_t j = i;
 		OFString *CPU = parseString(buffer, length, &j);
 		OFString *OS;
 
 		if (j > i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		OS = parseString(buffer, length, &j);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFHINFODNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 			     CPU: CPU
@@ -291,20 +291,20 @@
 		uint16_t preference;
 		size_t j;
 		OFString *mailExchange;
 
 		if (dataLength < 2)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		preference = (buffer[i] << 8) | buffer[i + 1];
 
 		j = i + 2;
 		mailExchange = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFMXDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 		      preference: preference
@@ -316,11 +316,11 @@
 		while (dataLength > 0) {
 			uint_fast8_t stringLength = buffer[i++];
 			dataLength--;
 
 			if (stringLength > dataLength)
-				@throw [OFInvalidServerReplyException
+				@throw [OFInvalidServerResponseException
 				    exception];
 
 			[textStrings addObject:
 			    [OFData dataWithItems: buffer + i
 					    count: stringLength]];
@@ -341,17 +341,17 @@
 		OFString *mailbox = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 		OFString *TXTDomainName;
 
 		if (j > i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		TXTDomainName = parseName(buffer, length, &j,
 		    maxAllowedPointers);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFRPDNSResourceRecord alloc]
 		     initWithName: name
 			 DNSClass: DNSClass
 			  mailbox: mailbox
@@ -360,11 +360,11 @@
 	} else if (recordType == OFDNSRecordTypeAAAA &&
 	    DNSClass == OFDNSClassIN) {
 		OFSocketAddress address;
 
 		if (dataLength != 16)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		memset(&address, 0, sizeof(address));
 		address.family = OFSocketAddressFamilyIPv6;
 		address.length = sizeof(address.sockaddr.in6);
 
@@ -384,21 +384,21 @@
 		uint16_t priority, weight, port;
 		size_t j;
 		OFString *target;
 
 		if (dataLength < 6)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		priority = (buffer[i] << 8) | buffer[i + 1];
 		weight = (buffer[i + 2] << 8) | buffer[i + 3];
 		port = (buffer[i + 4] << 8) | buffer[i + 5];
 
 		j = i + 6;
 		target = parseName(buffer, length, &j, maxAllowedPointers);
 
 		if (j != i + dataLength)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		return [[[OFSRVDNSResourceRecord alloc]
 		    initWithName: name
 			priority: priority
 			  weight: weight
@@ -935,15 +935,15 @@
 
 		queryDataBuffer = context->_queryData.items;
 
 		/* QR */
 		if ((buffer[2] & 0x80) == 0)
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		/* Opcode */
 		if ((buffer[2] & 0x78) != (queryDataBuffer[2] & 0x78))
-			@throw [OFInvalidServerReplyException exception];
+			@throw [OFInvalidServerResponseException exception];
 
 		/* TC */
 		if (buffer[2] & 0x02) {
 			OFRunLoopMode runLoopMode;