@@ -375,16 +375,16 @@
 	[self removeItemsInRange: of_range(index, 1)];
 }
 
 - (void)removeItemsInRange: (of_range_t)range
 {
-	if (range.start + range.length > count)
+	if (range.location + range.length > count)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	memmove(data + range.start * itemSize,
-	    data + (range.start + range.length) * itemSize,
-	    (count - range.start - range.length) * itemSize);
+	memmove(data + range.location * itemSize,
+	    data + (range.location + range.length) * itemSize,
+	    (count - range.location - range.length) * itemSize);
 
 	count -= range.length;
 	@try {
 		data = [self resizeMemory: data
 				     size: itemSize
@@ -638,16 +638,16 @@
 
 - (void)removeItemsInRange: (of_range_t)range
 {
 	size_t newSize, lastPageByte;
 
-	if (range.start + range.length > count)
+	if (range.location + range.length > count)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	memmove(data + range.start * itemSize,
-	    data + (range.start + range.length) * itemSize,
-	    (count - range.start - range.length) * itemSize);
+	memmove(data + range.location * itemSize,
+	    data + (range.location + range.length) * itemSize,
+	    (count - range.location - range.length) * itemSize);
 
 	count -= range.length;
 	lastPageByte = of_pagesize - 1;
 	newSize = (count * itemSize + lastPageByte) & ~lastPageByte;