@@ -57,14 +57,14 @@
 
 	other = (class == [OFDataArray class]
 	    ? [OFBigDataArray class]
 	    : [OFDataArray class]);
 	TEST(@"-[isEqual:]", (array[1] = [other dataArrayWithItemSize: 4096]) &&
-	    R([array[1] addNItems: [array[0] count]
-		       fromCArray: [array[0] cArray]]) &&
+	    R([array[1] addItemsFromCArray: [array[0] cArray]
+				     count: [array[0] count]]) &&
 	    [array[1] isEqual: array[0]] &&
-	    R([array[1] removeNItems: 1]) && ![array[0] isEqual: array[1]])
+	    R([array[1] removeLastItem]) && ![array[0] isEqual: array[1]])
 
 	TEST(@"-[copy]", (array[1] = [[array[0] copy] autorelease]) &&
 	    [array[0] isEqual: array[1]])
 
 	array[2] = [OFDataArray dataArray];
@@ -71,34 +71,33 @@
 	array[3] = [OFDataArray dataArray];
 	[array[2] addItem: "a"];
 	[array[2] addItem: "a"];
 	[array[3] addItem: "z"];
 	TEST(@"-[compare]", [array[0] compare: array[1]] == 0 &&
-	    R([array[1] removeNItems: 1]) &&
+	    R([array[1] removeLastItem]) &&
 	    [array[0] compare: array[1]] == OF_ORDERED_DESCENDING &&
 	    [array[1] compare: array[0]] == OF_ORDERED_ASCENDING &&
 	    [array[2] compare: array[3]] == OF_ORDERED_ASCENDING)
 
 	TEST(@"-[hash]", [array[0] hash] == 0x634A529F)
 
 	array[0] = [class dataArray];
-	[array[0] addNItems: 6
-		 fromCArray: "abcdef"];
+	[array[0] addItemsFromCArray: "abcdef"
+			       count: 6];
 
-	TEST(@"-[removeNItems:]", R([array[0] removeNItems: 1]) &&
+	TEST(@"-[removeLastItem]", R([array[0] removeLastItem]) &&
 	    [array[0] count] == 5 &&
 	    !memcmp([array[0] cArray], "abcde", 5))
 
-	TEST(@"-[removeNItems:atIndex:]",
-	    R([array[0] removeNItems: 2
-			     atIndex: 1]) && [array[0] count] == 3 &&
-	    !memcmp([array[0] cArray], "ade", 3))
-
-	TEST(@"-[addNItems:atIndex:]",
-	    R([array[0] addNItems: 2
-		       fromCArray: "bc"
-			  atIndex: 1]) && [array[0] count] == 5 &&
+	TEST(@"-[removeItemsInRange:]",
+	    R([array[0] removeItemsInRange: of_range(1, 2)]) &&
+	    [array[0] count] == 3 && !memcmp([array[0] cArray], "ade", 3))
+
+	TEST(@"-[insertItemsFromCArray:atIndex:count:]",
+	    R([array[0] insertItemsFromCArray: "bc"
+				      atIndex: 1
+					count: 2]) && [array[0] count] == 5 &&
 	    !memcmp([array[0] cArray], "abcde", 5))
 
 	TEST(@"-[MD5Hash]", [[array[0] MD5Hash] isEqual: [@"abcde" MD5Hash]])
 
 	TEST(@"-[SHA1Hash]", [[array[0] SHA1Hash] isEqual: [@"abcde" SHA1Hash]])
@@ -110,24 +109,25 @@
 	    !memcmp([[class dataArrayWithBase64EncodedString: @"YWJjZGU="]
 	    cArray], "abcde", 5))
 
 	TEST(@"Building strings",
 	    (array[0] = [class dataArray]) &&
-	    R([array[0] addNItems: 6
-		       fromCArray: (void*)str]) && R([array[0] addItem: ""]) &&
+	    R([array[0] addItemsFromCArray: (void*)str
+				     count: 6]) && R([array[0] addItem: ""]) &&
 	    !strcmp([array[0] cArray], str))
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[itemAtIndex:]",
 	    OFOutOfRangeException, [array[0] itemAtIndex: [array[0] count]])
 
-	EXPECT_EXCEPTION(@"Detect out of range in -[addNItems:fromCArray:]",
-	    OFOutOfRangeException, [array[0] addNItems: SIZE_MAX
-					    fromCArray: NULL])
+	EXPECT_EXCEPTION(@"Detect out of range in "
+	    @"-[addItemsFromCArray:count:]",
+	    OFOutOfRangeException, [array[0] addItemsFromCArray: NULL
+							  count: SIZE_MAX])
 
-	EXPECT_EXCEPTION(@"Detect out of range in -[removeNItems:]",
+	EXPECT_EXCEPTION(@"Detect out of range in -[removeItemsInRange:]",
 	    OFOutOfRangeException,
-	    [array[0] removeNItems: [array[0] count] + 1])
+	    [array[0] removeItemsInRange: of_range([array[0] count], 1)])
 }
 
 - (void)dataArrayTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];