@@ -444,12 +444,12 @@
 {
 	OFDataArray *dataArray;
 	char *tmp;
 
 	dataArray = [OFDataArray dataArrayWithItemSize: itemSize];
-	tmp = [self allocMemoryWithItemSize: itemSize
-				      count: nItems];
+	tmp = [self allocMemoryWithSize: itemSize
+				  count: nItems];
 
 	@try {
 		[self readIntoBuffer: tmp
 			 exactLength: nItems * itemSize];
 
@@ -607,11 +607,11 @@
 					 * Append data to cache to prevent loss
 					 * of data due to wrong encoding.
 					 */
 					cache = [self
 					    resizeMemory: cache
-						  toSize: cacheLength +
+						    size: cacheLength +
 							  bufferLength];
 
 					if (cache != NULL)
 						memcpy(cache + cacheLength,
 						    buffer, bufferLength);
@@ -638,15 +638,15 @@
 			}
 		}
 
 		/* There was no newline or \0 */
 		cache = [self resizeMemory: cache
-				    toSize: cacheLength + bufferLength];
+				      size: cacheLength + bufferLength];
 
 		/*
 		 * It's possible that cacheLen + len is 0 and thus cache was
-		 * set to NULL by resizeMemory:toSize:.
+		 * set to NULL by resizeMemory:size:.
 		 */
 		if (cache != NULL)
 			memcpy(cache + cacheLength, buffer, bufferLength);
 
 		cacheLength += bufferLength;
@@ -801,15 +801,15 @@
 			}
 		}
 
 		/* Neither the delimiter nor \0 was found */
 		cache = [self resizeMemory: cache
-				    toSize: cacheLength + bufferLength];
+				      size: cacheLength + bufferLength];
 
 		/*
 		 * It's possible that cacheLen + len is 0 and thus cache was
-		 * set to NULL by resizeMemory:toSize:.
+		 * set to NULL by resizeMemory:size:.
 		 */
 		if (cache != NULL)
 			memcpy(cache + cacheLength, buffer,
 			    bufferLength);
 
@@ -878,11 +878,11 @@
 	if (!writeBufferEnabled)
 		[self _writeBuffer: buffer
 			    length: length];
 	else {
 		writeBuffer = [self resizeMemory: writeBuffer
-					  toSize: writeBufferLength + length];
+					    size: writeBufferLength + length];
 		memcpy(writeBuffer + writeBufferLength, buffer, length);
 		writeBufferLength += length;
 	}
 }
 
@@ -941,12 +941,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint16_t *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(uint16_t)
-				      count: nInt16s];
+	tmp = [self allocMemoryWithSize: sizeof(uint16_t)
+				  count: nInt16s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
@@ -971,12 +971,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint32_t *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(uint32_t)
-				      count: nInt32s];
+	tmp = [self allocMemoryWithSize: sizeof(uint32_t)
+				  count: nInt32s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
@@ -1001,12 +1001,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint64_t *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(uint64_t)
-				      count: nInt64s];
+	tmp = [self allocMemoryWithSize: sizeof(uint64_t)
+				  count: nInt64s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
@@ -1031,12 +1031,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	float *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(float)
-				      count: nFloats];
+	tmp = [self allocMemoryWithSize: sizeof(float)
+				  count: nFloats];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
@@ -1061,12 +1061,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	double *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(double)
-				      count: nDoubles];
+	tmp = [self allocMemoryWithSize: sizeof(double)
+				  count: nDoubles];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)
@@ -1131,12 +1131,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint16_t *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(uint16_t)
-				      count: nInt16s];
+	tmp = [self allocMemoryWithSize: sizeof(uint16_t)
+				  count: nInt16s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
@@ -1161,12 +1161,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint32_t *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(uint32_t)
-				      count: nInt32s];
+	tmp = [self allocMemoryWithSize: sizeof(uint32_t)
+				  count: nInt32s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
@@ -1191,12 +1191,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint64_t *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(uint64_t)
-				      count: nInt64s];
+	tmp = [self allocMemoryWithSize: sizeof(uint64_t)
+				  count: nInt64s];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
@@ -1221,12 +1221,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	float *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(float)
-				      count: nFloats];
+	tmp = [self allocMemoryWithSize: sizeof(float)
+				  count: nFloats];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
@@ -1251,12 +1251,12 @@
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	double *tmp;
 
-	tmp = [self allocMemoryWithItemSize: sizeof(double)
-				      count: nDoubles];
+	tmp = [self allocMemoryWithSize: sizeof(double)
+				  count: nDoubles];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)