@@ -18,11 +18,11 @@
 
 #import "OFHTTPResponse.h"
 #import "OFString.h"
 #import "OFDictionary.h"
 #import "OFArray.h"
-#import "OFDataArray.h"
+#import "OFData.h"
 
 #import "OFInvalidEncodingException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
@@ -209,20 +209,20 @@
 
 - (OFString *)stringWithEncoding: (of_string_encoding_t)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *contentType, *contentLength, *ret;
-	OFDataArray *data;
+	OFData *data;
 
 	if (encoding == OF_STRING_ENCODING_AUTODETECT &&
 	    (contentType = [_headers objectForKey: @"Content-Type"]) != nil)
 		encoding = encodingForContentType(contentType);
 
 	if (encoding == OF_STRING_ENCODING_AUTODETECT)
 		encoding = OF_STRING_ENCODING_UTF_8;
 
-	data = [self readDataArrayTillEndOfStream];
+	data = [self readDataUntilEndOfStream];
 
 	if ((contentLength = [_headers objectForKey: @"Content-Length"]) != nil)
 		if ([data count] != (size_t)[contentLength decimalValue])
 			@throw [OFTruncatedDataException exception];