@@ -92,36 +92,36 @@
 	[super dealloc];
 }
 
 - (XMPPJID*)JID
 {
-	OF_GETTER(_JID, YES);
+	OF_GETTER(_JID, true)
 }
 
 - (OFString*)node
 {
-	OF_GETTER(_node, YES);
+	OF_GETTER(_node, true)
 }
 
 - (OFString*)name
 {
-	OF_GETTER(_name, YES);
+	OF_GETTER(_name, true)
 }
 
 - (OFSortedList*)identities
 {
-	OF_GETTER(_identities, YES);
+	OF_GETTER(_identities, true)
 }
 
 - (OFSortedList*)features
 {
-	OF_GETTER(_features, YES);
+	OF_GETTER(_features, true)
 }
 
 - (OFDictionary*)childNodes
 {
-	OF_GETTER(_childNodes, YES);
+	OF_GETTER(_childNodes, true)
 }
 
 - (void)addIdentity: (XMPPDiscoIdentity*)identity
 {
 	[_identities insertObject: identity];
@@ -136,11 +136,11 @@
 {
 	[_childNodes setObject: node
 			forKey: [node node]];
 }
 
-- (BOOL)XMPP_handleItemsIQ: (XMPPIQ*)IQ
+- (bool)XMPP_handleItemsIQ: (XMPPIQ*)IQ
 		connection: (XMPPConnection*)connection
 {
 	XMPPIQ *resultIQ;
 	OFXMLElement *response;
 	XMPPDiscoNode *child;
@@ -148,11 +148,11 @@
 	OFXMLElement *query = [IQ elementForName: @"query"
 				       namespace: XMPP_NS_DISCO_ITEMS];
 	OFString *node = [[query attributeForName: @"node"] stringValue];
 
 	if (!(node == _node) && ![node isEqual: _node])
-		return NO;
+		return false;
 
 	resultIQ = [IQ resultIQ];
 	response = [OFXMLElement elementWithName: @"query"
 				       namespace: XMPP_NS_DISCO_ITEMS];
 	[resultIQ addChild: response];
@@ -175,14 +175,14 @@
 		[response addChild: item];
 	}
 
 	[connection sendStanza: resultIQ];
 
-	return YES;
+	return true;
 }
 
-- (BOOL)XMPP_handleInfoIQ: (XMPPIQ*)IQ
+- (bool)XMPP_handleInfoIQ: (XMPPIQ*)IQ
 	       connection: (XMPPConnection*)connection
 {
 	XMPPIQ *resultIQ;
 	OFXMLElement *response;
 	OFEnumerator *enumerator;
@@ -221,8 +221,8 @@
 		[response addChild: featureElement];
 	}
 
 	[connection sendStanza: resultIQ];
 
-	return YES;
+	return true;
 }
 @end