@@ -60,33 +60,33 @@
 - (id)objectAtIndex: (size_t)index
 {
 	if (index >= range.length)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	return [array objectAtIndex: index + range.start];
+	return [array objectAtIndex: index + range.location];
 }
 
 - (void)getObjects: (id*)buffer
 	   inRange: (of_range_t)range_
 {
-	if (range_.start + range_.length > range.length)
+	if (range_.location + range_.length > range.length)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	range_.start += range.start;
+	range_.location += range.location;
 
 	return [array getObjects: buffer
 			 inRange: range_];
 }
 
 - (size_t)indexOfObject: (id)object
 {
 	size_t index = [array indexOfObject: object];
 
-	if (index < range.start)
+	if (index < range.location)
 		return OF_INVALID_INDEX;
 
-	index -= range.start;
+	index -= range.location;
 
 	if (index >= range.length)
 		return OF_INVALID_INDEX;
 
 	return index;
@@ -94,26 +94,26 @@
 
 - (size_t)indexOfObjectIdenticalTo: (id)object
 {
 	size_t index = [array indexOfObjectIdenticalTo: object];
 
-	if (index < range.start)
+	if (index < range.location)
 		return OF_INVALID_INDEX;
 
-	index -= range.start;
+	index -= range.location;
 
 	if (index >= range.length)
 		return OF_INVALID_INDEX;
 
 	return index;
 }
 
 - (OFArray*)objectsInRange: (of_range_t)range_
 {
-	if (range_.start + range_.length > range.length)
+	if (range_.location + range_.length > range.length)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	range_.start += range.start;
+	range_.location += range.location;
 
 	return [array objectsInRange: range_];
 }
 @end