@@ -311,62 +311,62 @@
 }
 
 - (OFArray*)allKeys
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	id *cArray = [self allocMemoryForNItems: [self count]
-					 ofSize: sizeof(id)];
+	id *keys = [self allocMemoryForNItems: [self count]
+				       ofSize: sizeof(id)];
 	OFArray *ret;
 	OFEnumerator *enumerator;
 	id key;
 	size_t i = 0;
 
 	pool = [[OFAutoreleasePool alloc] init];
 	enumerator = [self keyEnumerator];
 
 	while ((key = [enumerator nextObject]) != nil)
-		cArray[i++] = key;
+		keys[i++] = key;
 
 	assert(i == [self count]);
 
 	[pool release];
 
 	@try {
-		ret = [OFArray arrayWithCArray: cArray
-					length: [self count]];
+		ret = [OFArray arrayWithObjects: keys
+					  count: [self count]];
 	} @finally {
-		[self freeMemory: cArray];
+		[self freeMemory: keys];
 	}
 
 	return ret;
 }
 
 - (OFArray*)allObjects
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	id *cArray = [self allocMemoryForNItems: [self count]
-					 ofSize: sizeof(id)];
+	id *objects = [self allocMemoryForNItems: [self count]
+					  ofSize: sizeof(id)];
 	OFArray *ret;
 	OFEnumerator *enumerator;
 	id object;
 	size_t i = 0;
 
 	pool = [[OFAutoreleasePool alloc] init];
 	enumerator = [self objectEnumerator];
 
 	while ((object = [enumerator nextObject]) != nil)
-		cArray[i++] = object;
+		objects[i++] = object;
 
 	assert(i == [self count]);
 
 	[pool release];
 
 	@try {
-		ret = [OFArray arrayWithCArray: cArray
-					length: [self count]];
+		ret = [OFArray arrayWithObjects: objects
+					  count: [self count]];
 	} @finally {
-		[self freeMemory: cArray];
+		[self freeMemory: objects];
 	}
 
 	return ret;
 }