@@ -96,20 +96,20 @@
 }
 
 static OFString*
 namespace_for_prefix(OFString *prefix, OFArray *namespaces)
 {
-	OFDictionary **cArray = [namespaces cArray];
+	OFDictionary **objects = [namespaces objects];
 	ssize_t i;
 
 	if (prefix == nil)
 		prefix = @"";
 
 	for (i = [namespaces count] - 1; i >= 0; i--) {
 		OFString *tmp;
 
-		if ((tmp = [cArray[i] objectForKey: prefix]) != nil)
+		if ((tmp = [objects[i] objectForKey: prefix]) != nil)
 			return tmp;
 	}
 
 	return nil;
 }
@@ -668,11 +668,11 @@
 			    i: (size_t*)i
 			 last: (size_t*)last
 {
 	OFAutoreleasePool *pool;
 	OFString *ns;
-	OFXMLAttribute **attributesCArray;
+	OFXMLAttribute **attributesObjects;
 	size_t j, attributesCount;
 
 	if (buffer[*i] != '>' && buffer[*i] != '/') {
 		if (buffer[*i] != ' ' && buffer[*i] != '\t' &&
 		    buffer[*i] != '\n' && buffer[*i] != '\r') {
@@ -682,21 +682,21 @@
 		}
 
 		return;
 	}
 
-	attributesCArray = [attributes cArray];
+	attributesObjects = [attributes objects];
 	attributesCount = [attributes count];
 
 	ns = namespace_for_prefix(prefix, namespaces);
 
 	if (prefix != nil && ns == nil)
 		@throw [OFUnboundNamespaceException exceptionWithClass: isa
 								prefix: prefix];
 
 	for (j = 0; j < attributesCount; j++)
-		resolve_attribute_namespace(attributesCArray[j], namespaces,
+		resolve_attribute_namespace(attributesObjects[j], namespaces,
 		    isa);
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 	[delegate parser: self