@@ -40,11 +40,11 @@
 		Class c = [self class];
 		[self release];
 		@throw [OFInitializationFailedException exceptionWithClass: c];
 	}
 
-	_initialized = YES;
+	_initialized = true;
 
 	return self;
 }
 
 - (void)lock
@@ -52,11 +52,11 @@
 	if (!of_mutex_lock(&_mutex))
 		@throw [OFLockFailedException exceptionWithClass: [self class]
 							    lock: self];
 }
 
-- (BOOL)tryLock
+- (bool)tryLock
 {
 	return of_mutex_trylock(&_mutex);
 }
 
 - (void)unlock
@@ -66,16 +66,16 @@
 							      lock: self];
 }
 
 - (void)setName: (OFString*)name
 {
-	OF_SETTER(_name, name, YES, 1)
+	OF_SETTER(_name, name, true, 1)
 }
 
 - (OFString*)name
 {
-	OF_GETTER(_name, YES)
+	OF_GETTER(_name, true)
 }
 
 - (OFString*)description
 {
 	if (_name == nil)