@@ -157,11 +157,11 @@
 	ivars->cStringLength = _cStringLength;
 
 	switch (of_string_utf8_check(ivars->cString, ivars->cStringLength,
 	    &ivars->length)) {
 	case 1:
-		ivars->isUTF8 = YES;
+		ivars->isUTF8 = true;
 		break;
 	case -1:
 		free(ivars);
 		@throw [OFInvalidEncodingException
 		    exceptionWithClass: [self class]];
@@ -267,11 +267,11 @@
 
 	return [self compare: object];
 }
 
 /* From OFObject, but reimplemented in OFString */
-- (BOOL)isEqual: (id)object
+- (bool)isEqual: (id)object
 {
 	[self finishInitialization];
 
 	return [self isEqual: object];
 }
@@ -385,11 +385,11 @@
 	return [self rangeOfString: string
 			   options: options
 			     range: range];
 }
 
-- (BOOL)containsString: (OFString*)string
+- (bool)containsString: (OFString*)string
 {
 	[self finishInitialization];
 
 	return [self containsString: string];
 }
@@ -493,18 +493,18 @@
 	[self finishInitialization];
 
 	return [self stringByDeletingEnclosingWhitespaces];
 }
 
-- (BOOL)hasPrefix: (OFString*)prefix
+- (bool)hasPrefix: (OFString*)prefix
 {
 	[self finishInitialization];
 
 	return [self hasPrefix: prefix];
 }
 
-- (BOOL)hasSuffix: (OFString*)suffix
+- (bool)hasSuffix: (OFString*)suffix
 {
 	[self finishInitialization];
 
 	return [self hasSuffix: suffix];
 }