@@ -42,11 +42,11 @@
 
 #import "OFConnectionFailedException.h"
 #import "OFHTTPRequestFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
-#import "OFInvalidServerReplyException.h"
+#import "OFInvalidServerResponseException.h"
 #import "OFOpenItemFailedException.h"
 #import "OFOutOfRangeException.h"
 #import "OFReadFailedException.h"
 #import "OFResolveHostFailedException.h"
 #import "OFRetrieveItemAttributesFailedException.h"
@@ -832,18 +832,18 @@
 			    @"  Connection failed: %[exception]",
 			    @"prog", [OFApplication programName],
 			    @"url", request.URL.string,
 			    @"exception", exception)];
 		} else if ([exception isKindOfClass:
-		    [OFInvalidServerReplyException class]]) {
+		    [OFInvalidServerResponseException class]]) {
 			if (!_quiet)
 				[OFStdOut writeString: @"\n"];
 
 			[OFStdErr writeLine: OF_LOCALIZED(
-			    @"download_failed_invalid_server_reply",
+			    @"download_failed_invalid_server_response",
 			    @"%[prog]: Failed to download <%[url]>!\n"
-			    @"  Invalid server reply!",
+			    @"  Invalid server response!",
 			    @"prog", [OFApplication programName],
 			    @"url", request.URL.string)];
 		} else if ([exception isKindOfClass:
 		    [OFUnsupportedProtocolException class]]) {
 			if (!_quiet)