@@ -239,12 +239,12 @@
 
 	@try {
 		id *objectsCArray, *keysCArray;
 		uint32_t i, j, newSize;
 
-		keysCArray = [keys cArray];
-		objectsCArray = [objects cArray];
+		keysCArray = [keys objects];
+		objectsCArray = [objects objects];
 		count = [keys count];
 
 		if (count > UINT32_MAX)
 			@throw [OFOutOfRangeException exceptionWithClass: isa];
 
@@ -628,48 +628,48 @@
 }
 
 - (OFArray*)allKeys
 {
 	OFArray *ret;
-	id *cArray = [self allocMemoryForNItems: count
-					 ofSize: sizeof(id)];
+	id *keys = [self allocMemoryForNItems: count
+				       ofSize: sizeof(id)];
 	size_t i, j;
 
 	for (i = j = 0; i < size; i++)
 		if (data[i] != NULL && data[i] != DELETED)
-			cArray[j++] = data[i]->key;
+			keys[j++] = data[i]->key;
 
 	assert(j == count);
 
 	@try {
-		ret = [OFArray arrayWithCArray: cArray
-					length: count];
+		ret = [OFArray arrayWithObjects: keys
+					  count: count];
 	} @finally {
-		[self freeMemory: cArray];
+		[self freeMemory: keys];
 	}
 
 	return ret;
 }
 
 - (OFArray*)allObjects
 {
 	OFArray *ret;
-	id *cArray = [self allocMemoryForNItems: count
-					 ofSize: sizeof(id)];
+	id *objects = [self allocMemoryForNItems: count
+					  ofSize: sizeof(id)];
 	size_t i, j;
 
 	for (i = j = 0; i < size; i++)
 		if (data[i] != NULL && data[i] != DELETED)
-			cArray[j++] = data[i]->object;
+			objects[j++] = data[i]->object;
 
 	assert(j == count);
 
 	@try {
-		ret = [OFArray arrayWithCArray: cArray
-					length: count];
+		ret = [OFArray arrayWithObjects: objects
+					  count: count];
 	} @finally {
-		[self freeMemory: cArray];
+		[self freeMemory: objects];
 	}
 
 	return ret;
 }