@@ -282,11 +282,11 @@
 
 	for (i = 0; i < count; i++)
 		if ([[self objectAtIndex: i] isEqual: object])
 			return i;
 
-	return OF_INVALID_INDEX;
+	return OF_NOT_FOUND;
 }
 
 - (size_t)indexOfObjectIdenticalTo: (id)object
 {
 	size_t i, count = [self count];
@@ -293,21 +293,21 @@
 
 	for (i = 0; i < count; i++)
 		if ([self objectAtIndex: i] == object)
 			return i;
 
-	return OF_INVALID_INDEX;
+	return OF_NOT_FOUND;
 }
 
 - (BOOL)containsObject: (id)object
 {
-	return ([self indexOfObject: object] != OF_INVALID_INDEX);
+	return ([self indexOfObject: object] != OF_NOT_FOUND);
 }
 
 - (BOOL)containsObjectIdenticalTo: (id)object
 {
-	return ([self indexOfObjectIdenticalTo: object] != OF_INVALID_INDEX);
+	return ([self indexOfObjectIdenticalTo: object] != OF_NOT_FOUND);
 }
 
 - (id)firstObject
 {
 	if ([self count] > 0)