@@ -137,12 +137,12 @@
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: isa];
 #endif
 
 		maxFD = cancelFD[0];
-		FDToStream = [self allocMemoryForNItems: maxFD + 1
-						 ofSize: sizeof(OFStream*)];
+		FDToStream = [self allocMemoryWithItemSize: sizeof(OFStream*)
+						     count: maxFD + 1];
 		FDToStream[cancelFD[0]] = nil;
 
 #ifdef OF_THREADS
 		mutex = [[OFMutex alloc] init];
 #endif
@@ -310,12 +310,12 @@
 			if ((action & QUEUE_ACTION) == QUEUE_ADD) {
 				if (fd > maxFD) {
 					maxFD = fd;
 					FDToStream = [self
 					    resizeMemory: FDToStream
-						toNItems: maxFD + 1
-						  ofSize: sizeof(OFStream*)];
+						itemSize: sizeof(OFStream*)
+						   count: maxFD + 1];
 				}
 
 				FDToStream[fd] = stream;
 			}