@@ -31,12 +31,12 @@
 void
 dictionary_tests()
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFDictionary *dict = [OFMutableDictionary dictionary], *dict2;
-	OFIterator *iter;
-	of_iterator_pair_t pair[3];
+	OFEnumerator *enumerator;
+	of_enumerator_pair_t pair[3];
 	OFArray *akeys, *avalues;
 
 	[dict setObject: values[0]
 		 forKey: keys[0]];
 	[dict setObject: values[1]
@@ -45,16 +45,16 @@
 	TEST(@"-[objectForKey:]",
 	    [[dict objectForKey: keys[0]] isEqual: values[0]] &&
 	    [[dict objectForKey: keys[1]] isEqual: values[1]] &&
 	    [dict objectForKey: @"key3"] == nil)
 
-	TEST(@"-[iterator]", (iter = [dict iterator]))
+	TEST(@"-[enumerator]", (enumerator = [dict enumerator]))
 
-	pair[0] = [iter nextKeyObjectPair];
-	pair[1] = [iter nextKeyObjectPair];
-	pair[2] = [iter nextKeyObjectPair];
-	TEST(@"OFIterator's -[nextKeyObjectPair]",
+	pair[0] = [enumerator nextKeyObjectPair];
+	pair[1] = [enumerator nextKeyObjectPair];
+	pair[2] = [enumerator nextKeyObjectPair];
+	TEST(@"OFEnumerator's -[nextKeyObjectPair]",
 	    [pair[0].key isEqual: keys[0]] &&
 	    [pair[0].object isEqual: values[0]] &&
 	    [pair[1].key isEqual: keys[1]] &&
 	    [pair[1].object isEqual: values[1]] &&
 	    pair[2].key == nil && pair[2].object == nil)