@@ -78,11 +78,11 @@
 	int i;
 	const of_unichar_t *ua;
 	const uint16_t *u16a;
 	EntityHandler *h;
 #ifdef OF_HAVE_BLOCKS
-	__block BOOL ok;
+	__block bool ok;
 #endif
 
 	s[0] = [OFMutableString stringWithString: @"täs€"];
 	s[1] = [OFMutableString string];
 	s[2] = [[s[0] copy] autorelease];
@@ -107,11 +107,11 @@
 	    [@"ß" caseInsensitiveCompare: @"→"] == OF_ORDERED_ASCENDING &&
 	    [@"AA" caseInsensitiveCompare: @"z"] == OF_ORDERED_ASCENDING &&
 	    [[OFString stringWithUTF8String: "ABC"] caseInsensitiveCompare:
 	    [OFString stringWithUTF8String: "AbD"]] == [@"abc" compare: @"abd"])
 
-	TEST(@"-[hash] is the same if -[isEqual:] is YES",
+	TEST(@"-[hash] is the same if -[isEqual:] is true",
 	    [s[0] hash] == [s[2] hash])
 
 	TEST(@"-[description]", [[s[0] description] isEqual: s[0]])
 
 	TEST(@"-[appendString:] and -[appendUTF8String:]",
@@ -587,30 +587,30 @@
 			    return @"bar";
 
 		    return nil;
 	    }] isEqual: @"xbary"])
 
-	ok = YES;
+	ok = true;
 	[@"foo\nbar\nbaz" enumerateLinesUsingBlock:
-	    ^ (OFString *line, BOOL *stop) {
+	    ^ (OFString *line, bool *stop) {
 		static int i = 0;
 
 		switch (i) {
 		case 0:
 			if (![line isEqual: @"foo"])
-				ok = NO;
+				ok = false;
 			break;
 		case 1:
 			if (![line isEqual: @"bar"])
-				ok = NO;
+				ok = false;
 			break;
 		case 2:
 			if (![line isEqual: @"baz"])
-				ok = NO;
+				ok = false;
 			break;
 		default:
-			ok = NO;
+			ok = false;
 		}
 
 		i++;
 	}];
 	TEST(@"-[enumerateLinesUsingBlock:]", ok)