@@ -164,21 +164,21 @@
 		if (param.costFactor > SIZE_MAX - 1 ||
 		    (param.costFactor + 1) > SIZE_MAX / 128)
 			@throw [OFOutOfRangeException exception];
 
 		tmp = [[OFSecureData alloc]
-			 initWithItemSize: param.blockSize
-				    count: (param.costFactor + 1) * 128
+			    initWithCount: (param.costFactor + 1) * 128
+				 itemSize: param.blockSize
 		    allowsSwappableMemory: param.allowsSwappableMemory];
 		tmpItems = tmp.mutableItems;
 
 		if (param.parallelization > SIZE_MAX / 128)
 			@throw [OFOutOfRangeException exception];
 
 		buffer = [[OFSecureData alloc]
-			 initWithItemSize: param.blockSize
-				    count: param.parallelization * 128
+			    initWithCount: param.parallelization * 128
+				 itemSize: param.blockSize
 		    allowsSwappableMemory: param.allowsSwappableMemory];
 		bufferItems = buffer.mutableItems;
 
 		HMAC = [[OFHMAC alloc]
 			initWithHashClass: [OFSHA256Hash class]