@@ -39,11 +39,11 @@
 	of_unichar_t *ustr;
 	size_t ulen, nlen, clen;
 	size_t i, j, d;
 	char *nstr;
 
-	if (!is_utf8) {
+	if (!isUTF8) {
 		assert(table_size >= 1);
 
 		uint8_t *p = (uint8_t*)string + length;
 		uint8_t t;
 
@@ -129,19 +129,19 @@
 
 	len = strlen(str);
 
 	switch (of_string_check_utf8(str, len)) {
 	case 0:
-		is_utf8 = NO;
+		isUTF8 = NO;
 		break;
 	case 1:
-		is_utf8 = YES;
+		isUTF8 = YES;
 		break;
 	case -1:
 		string = NULL;
 		length = 0;
-		is_utf8 = NO;
+		isUTF8 = NO;
 
 		@throw [OFInvalidEncodingException newWithClass: isa];
 	}
 
 	length = len;
@@ -155,11 +155,11 @@
 
 	strlength = strlen(str);
 
 	switch (of_string_check_utf8(str, strlength)) {
 	case 1:
-		is_utf8 = YES;
+		isUTF8 = YES;
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException newWithClass: isa];
 	}
 
@@ -175,11 +175,11 @@
 	if (len > strlen(str))
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	switch (of_string_check_utf8(str, len)) {
 	case 1:
-		is_utf8 = YES;
+		isUTF8 = YES;
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException newWithClass: isa];
 	}
 
@@ -264,11 +264,11 @@
 		string[i] ^= string[j];
 		string[j] ^= string[i];
 		string[i] ^= string[j];
 	}
 
-	if (!is_utf8) {
+	if (!isUTF8) {
 		madvise(string, len, MADV_NORMAL);
 		return;
 	}
 
 	for (i = 0; i < length; i++) {
@@ -355,11 +355,11 @@
 }
 
 - (void)removeCharactersFromIndex: (size_t)start
 			  toIndex: (size_t)end
 {
-	if (is_utf8) {
+	if (isUTF8) {
 		start = of_string_index_to_position(string, start, length);
 		end = of_string_index_to_position(string, end, length);
 	}
 
 	if (start > end)