Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -183,11 +183,11 @@
 - (OFString*)componentsJoinedByString: (OFString*)separator;
 
 /**
  * \return An OFEnumerator to enumarate through the array's objects
  */
-- (OFEnumerator*)enumerator;
+- (OFEnumerator*)objectEnumerator;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * Executes a block for each object.
  *

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -347,11 +347,11 @@
 	state->mutationsPtr = (unsigned long*)self;
 
 	return count;
 }
 
-- (OFEnumerator*)enumerator
+- (OFEnumerator*)objectEnumerator
 {
 	return [[[OFArrayEnumerator alloc]
 	    initWithDataArray: array
 	     mutationsPointer: NULL] autorelease];
 }

Index: src/OFMutableArray.m
==================================================================
--- src/OFMutableArray.m
+++ src/OFMutableArray.m
@@ -227,11 +227,11 @@
 	state->mutationsPtr = &mutations;
 
 	return count;
 }
 
-- (OFEnumerator*)enumerator
+- (OFEnumerator*)objectEnumerator
 {
 	return [[[OFArrayEnumerator alloc]
 	    initWithDataArray: array
 	     mutationsPointer: &mutations] autorelease];
 }

Index: tests/OFArrayTests.m
==================================================================
--- tests/OFArrayTests.m
+++ tests/OFArrayTests.m
@@ -131,11 +131,11 @@
 
 	m[0] = [[a[0] mutableCopy] autorelease];
 	ok = YES;
 	i = 0;
 
-	TEST(@"-[enumerator]", (enumerator = [m[0] enumerator]))
+	TEST(@"-[objectEnumerator]", (enumerator = [m[0] objectEnumerator]))
 
 	while ((obj = [enumerator nextObject]) != nil) {
 		if (![obj isEqual: c_ary[i]])
 			ok = NO;
 		[m[0] replaceObjectAtIndex: i