@@ -1521,12 +1521,12 @@
 	int compare;
 
 	if ((prefixLength = [prefix length]) > [self length])
 		return NO;
 
-	tmp = [self allocMemoryForNItems: prefixLength
-				  ofSize: sizeof(of_unichar_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(of_unichar_t)
+				      count: prefixLength];
 	@try {
 		OFAutoreleasePool *pool;
 
 		[self getCharacters: tmp
 			    inRange: of_range(0, prefixLength)];
@@ -1555,12 +1555,12 @@
 	if ((suffixLength = [suffix length]) > [self length])
 		return NO;
 
 	length = [self length];
 
-	tmp = [self allocMemoryForNItems: suffixLength
-				  ofSize: sizeof(of_unichar_t)];
+	tmp = [self allocMemoryWithItemSize: sizeof(of_unichar_t)
+				      count: suffixLength];
 	@try {
 		OFAutoreleasePool *pool;
 
 		[self getCharacters: tmp
 			    inRange: of_range(length - suffixLength,
@@ -1957,12 +1957,12 @@
 {
 	OFObject *object = [[[OFObject alloc] init] autorelease];
 	size_t length = [self length];
 	of_unichar_t *ret;
 
-	ret = [object allocMemoryForNItems: length + 1
-				    ofSize: sizeof(of_unichar_t)];
+	ret = [object allocMemoryWithItemSize: sizeof(of_unichar_t)
+					count: length + 1];
 	[self getCharacters: ret
 		    inRange: of_range(0, length)];
 	ret[length] = 0;
 
 	return ret;
@@ -1976,12 +1976,12 @@
 	size_t length = [self length];
 	uint16_t *ret;
 	size_t i, j;
 
 	/* Allocate memory for the worst case */
-	ret = [object allocMemoryForNItems: length * 2 + 1
-				    ofSize: sizeof(uint16_t)];
+	ret = [object allocMemoryWithItemSize: sizeof(uint16_t)
+					count: length * 2 + 1];
 
 	j = 0;
 
 	for (i = 0; i < length; i++) {
 		of_unichar_t c = unicodeString[i];
@@ -2000,12 +2000,12 @@
 
 	ret[j] = 0;
 
 	@try {
 		ret = [object resizeMemory: ret
-				  toNItems: j + 1
-				    ofSize: sizeof(uint16_t)];
+				  itemSize: sizeof(uint16_t)
+				     count: j + 1];
 	} @catch (OFOutOfMemoryException *e) {
 		/* We don't care, as we only tried to make it smaller */
 	}
 
 	[pool release];