@@ -340,11 +340,11 @@
 
 	switch (encoding) {
 	case OF_STRING_ENCODING_UTF_8:
 		switch (of_string_check_utf8(str, length)) {
 		case 1:
-			is_utf8 = YES;
+			isUTF8 = YES;
 			break;
 		case -1:;
 			/*
 			 * We can't use [super dealloc] on OS X here.
 			 * Compiler bug? Anyway, [self dealloc] will do here as
@@ -404,11 +404,11 @@
 					[self dealloc];
 					@throw [OFInvalidEncodingException
 					    newWithClass: c];
 				}
 
-				is_utf8 = YES;
+				isUTF8 = YES;
 				chr_bytes = of_string_unicode_to_utf8(chr, buf);
 
 				if (chr_bytes == 0) {
 					/*
 					 * We can't use [super dealloc] on OS X
@@ -507,11 +507,11 @@
 	}
 	length = t;
 
 	switch (of_string_check_utf8(string, length)) {
 	case 1:
-		is_utf8 = YES;
+		isUTF8 = YES;
 		break;
 	case -1:;
 		Class c = isa;
 		free(string);
 		[super dealloc];
@@ -552,11 +552,11 @@
 	self = [super init];
 
 	len = [first cStringLength];
 	switch (of_string_check_utf8([first cString], len)) {
 	case 1:
-		is_utf8 = YES;
+		isUTF8 = YES;
 		break;
 	case -1:
 		c = isa;
 		[self dealloc];
 		@throw [OFInvalidEncodingException newWithClass: c];
@@ -568,11 +568,11 @@
 		len = [component cStringLength];
 		length += 1 + len;
 
 		switch (of_string_check_utf8([component cString], len)) {
 		case 1:
-			is_utf8 = YES;
+			isUTF8 = YES;
 			break;
 		case -1:
 			c = isa;
 			[self dealloc];
 			@throw [OFInvalidEncodingException newWithClass: c];
@@ -609,11 +609,11 @@
 	string = (char*)[str cString];
 	length = [str cStringLength];
 
 	switch (of_string_check_utf8(string, length)) {
 	case 1:
-		is_utf8 = YES;
+		isUTF8 = YES;
 		break;
 	case -1:;
 		Class c = isa;
 		[self dealloc];
 		@throw [OFInvalidEncodingException newWithClass: c];