@@ -50,11 +50,11 @@
 	of_unichar_t *unicodeString;
 	size_t unicodeLen, newCStringLength, cLen;
 	size_t i, j, d;
 	char *newCString;
 
-	if (!s->isUTF8) {
+	if (!s->UTF8) {
 		assert(tableSize >= 1);
 
 		uint8_t *p = (uint8_t*)s->cString + s->cStringLength;
 		uint8_t t;
 
@@ -148,11 +148,11 @@
 		UTF8StringLength -= 3;
 	}
 
 	switch (of_string_check_utf8(UTF8String, UTF8StringLength, &length)) {
 	case 1:
-		s->isUTF8 = YES;
+		s->UTF8 = YES;
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException newWithClass: isa];
 	}
 
@@ -175,11 +175,11 @@
 		UTF8StringLength -= 3;
 	}
 
 	switch (of_string_check_utf8(UTF8String, UTF8StringLength, &length)) {
 	case 1:
-		s->isUTF8 = YES;
+		s->UTF8 = YES;
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException newWithClass: isa];
 	}
 
@@ -238,12 +238,12 @@
 	s->cStringLength += UTF8StringLength;
 	s->length += string->s->length;
 
 	s->cString[s->cStringLength] = 0;
 
-	if (string->s->isUTF8)
-		s->isUTF8 = YES;
+	if (string->s->UTF8)
+		s->UTF8 = YES;
 }
 
 - (void)appendFormat: (OFConstantString*)format, ...
 {
 	va_list arguments;
@@ -294,11 +294,11 @@
 		s->cString[i] ^= s->cString[j];
 		s->cString[j] ^= s->cString[i];
 		s->cString[i] ^= s->cString[j];
 	}
 
-	if (!s->isUTF8) {
+	if (!s->UTF8) {
 		madvise(s->cString, s->cStringLength, MADV_NORMAL);
 		return;
 	}
 
 	for (i = 0; i < s->cStringLength; i++) {
@@ -393,11 +393,11 @@
 	size_t newCStringLength;
 
 	if (index > s->length)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
-	if (s->isUTF8)
+	if (s->UTF8)
 		index = of_string_index_to_position(s->cString, index,
 		    s->cStringLength);
 
 	newCStringLength = s->cStringLength + [string UTF8StringLength];
 	s->cString = [self resizeMemory: s->cString
@@ -425,11 +425,11 @@
 	if (end > s->length)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	s->length -= end - start;
 
-	if (s->isUTF8) {
+	if (s->UTF8) {
 		start = of_string_index_to_position(s->cString, start,
 		    s->cStringLength);
 		end = of_string_index_to_position(s->cString, end,
 		    s->cStringLength);
 	}
@@ -461,11 +461,11 @@
 	if (end > s->length)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	newLength = s->length - (end - start) + [replacement length];
 
-	if (s->isUTF8) {
+	if (s->UTF8) {
 		start = of_string_index_to_position(s->cString, start,
 		    s->cStringLength);
 		end = of_string_index_to_position(s->cString, end,
 		    s->cStringLength);
 	}