@@ -444,12 +444,12 @@
 {
 	OFDataArray *dataArray;
 	char *tmp;
 
 	dataArray = [OFDataArray dataArrayWithItemSize: itemSize];
-	tmp = [self allocMemoryForNItems: nItems
-				  ofSize: itemSize];
+	tmp = [self allocMemoryWithItemSize: itemSize
+				      count: nItems];
 
 	@try {
 		[self readExactlyNBytes: nItems * itemSize
 			     intoBuffer: tmp];
 
@@ -941,12 +941,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	uint16_t *tmp;
 
-	tmp = [self allocMemoryForNItems: nInt16s
-				  ofSize: sizeof(uint16_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(uint16_t)
+				      count: nInt16s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
@@ -971,12 +971,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	uint32_t *tmp;
 
-	tmp = [self allocMemoryForNItems: nInt32s
-				  ofSize: sizeof(uint32_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(uint32_t)
+				      count: nInt32s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
@@ -1001,12 +1001,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	uint64_t *tmp;
 
-	tmp = [self allocMemoryForNItems: nInt64s
-				  ofSize: sizeof(uint64_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(uint64_t)
+				      count: nInt64s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
@@ -1031,12 +1031,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	float *tmp;
 
-	tmp = [self allocMemoryForNItems: nFloats
-				  ofSize: sizeof(float)];
+	tmp = [self allocMemoryWithItemSize: sizeof(float)
+				      count: nFloats];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
@@ -1061,12 +1061,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	double *tmp;
 
-	tmp = [self allocMemoryForNItems: nDoubles
-				  ofSize: sizeof(double)];
+	tmp = [self allocMemoryWithItemSize: sizeof(double)
+				      count: nDoubles];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)
@@ -1131,12 +1131,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	uint16_t *tmp;
 
-	tmp = [self allocMemoryForNItems: nInt16s
-				  ofSize: sizeof(uint16_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(uint16_t)
+				      count: nInt16s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
@@ -1161,12 +1161,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	uint32_t *tmp;
 
-	tmp = [self allocMemoryForNItems: nInt32s
-				  ofSize: sizeof(uint32_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(uint32_t)
+				      count: nInt32s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
@@ -1191,12 +1191,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	uint64_t *tmp;
 
-	tmp = [self allocMemoryForNItems: nInt64s
-				  ofSize: sizeof(uint64_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(uint64_t)
+				      count: nInt64s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
@@ -1221,12 +1221,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	float *tmp;
 
-	tmp = [self allocMemoryForNItems: nFloats
-				  ofSize: sizeof(float)];
+	tmp = [self allocMemoryWithItemSize: sizeof(float)
+				      count: nFloats];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
@@ -1251,12 +1251,12 @@
 	[self writeNBytes: size
 	       fromBuffer: buffer];
 #else
 	double *tmp;
 
-	tmp = [self allocMemoryForNItems: nDoubles
-				  ofSize: sizeof(double)];
+	tmp = [self allocMemoryWithItemSize: sizeof(double)
+				      count: nDoubles];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)