@@ -440,28 +440,28 @@
 }
 
 - (OFDataArray*)readDataArrayWithItemSize: (size_t)itemSize
 				andNItems: (size_t)nItems
 {
-	OFDataArray *da;
+	OFDataArray *dataArray;
 	char *tmp;
 
-	da = [OFDataArray dataArrayWithItemSize: itemSize];
+	dataArray = [OFDataArray dataArrayWithItemSize: itemSize];
 	tmp = [self allocMemoryForNItems: nItems
 				  ofSize: itemSize];
 
 	@try {
 		[self readExactlyNBytes: nItems * itemSize
 			     intoBuffer: tmp];
 
-		[da addNItems: nItems
-		   fromCArray: tmp];
+		[dataArray addItemsFromCArray: tmp
+					count: nItems];
 	} @finally {
 		[self freeMemory: tmp];
 	}
 
-	return da;
+	return dataArray;
 }
 
 - (OFDataArray*)readDataArrayTillEndOfStream
 {
 	OFDataArray *dataArray;
@@ -474,12 +474,12 @@
 		while (![self isAtEndOfStream]) {
 			size_t length;
 
 			length = [self readNBytes: of_pagesize
 				       intoBuffer: buffer];
-			[dataArray addNItems: length
-				  fromCArray: buffer];
+			[dataArray addItemsFromCArray: buffer
+						count: length];
 		}
 	} @finally {
 		[self freeMemory: buffer];
 	}