@@ -109,12 +109,12 @@
 	[cache release];
 	[name release];
 	[prefix release];
 	[ns release];
 	[attrs release];
-	[attr_name release];
-	[attr_prefix release];
+	[attrName release];
+	[attrPrefix release];
 	[previous release];
 
 	[super dealloc];
 }
 
@@ -357,20 +357,20 @@
 				cache_c = [cache cString];
 				cache_len = [cache cStringLength];
 
 				if ((tmp = memchr(cache_c, ':',
 				    cache_len)) != NULL ) {
-					attr_name = [[OFString alloc]
+					attrName = [[OFString alloc]
 					    initWithCString: tmp + 1
 						     length: cache_len - (tmp -
 							     cache_c) - 1];
-					attr_prefix = [[OFString alloc]
+					attrPrefix = [[OFString alloc]
 					    initWithCString: cache_c
 						     length: tmp - cache_c];
 				} else {
-					attr_name = [cache copy];
-					attr_prefix = nil;
+					attrName = [cache copy];
+					attrPrefix = nil;
 				}
 
 				[cache setToCString: ""];
 
 				last = i + 1;
@@ -404,20 +404,20 @@
 
 				pool = [[OFAutoreleasePool alloc] init];
 				attr_val = [cache
 				    stringByXMLUnescapingWithHandler: self];
 				[attrs addObject: [OFXMLAttribute
-				    attributeWithName: attr_name
-					       prefix: attr_prefix
+				    attributeWithName: attrName
+					       prefix: attrPrefix
 					    namespace: nil
 					  stringValue: attr_val]];
 				[pool release];
 
 				[cache setToCString: ""];
-				[attr_name release];
-				[attr_prefix release];
-				attr_name = attr_prefix = nil;
+				[attrName release];
+				[attrPrefix release];
+				attrName = attrPrefix = nil;
 
 				last = i + 1;
 				state = OF_XMLPARSER_IN_TAG;
 			}
 			break;
@@ -510,11 +510,11 @@
 	OFMutableString *ret;
 
 	last = 0;
 	in_entity = NO;
 	ret = [OFMutableString string];
-	((OFString*)ret)->is_utf8 = is_utf8;
+	((OFString*)ret)->isUTF8 = isUTF8;
 
 	for (i = 0; i < length; i++) {
 		if (!in_entity && string[i] == '&') {
 			[ret appendCStringWithoutUTF8Checking: string + last
 						    length: i - last];