@@ -40,11 +40,11 @@
 @implementation XMPPSCRAMAuth
 + SCRAMAuthWithAuthcid: (OFString*)authcid
 	      password: (OFString*)password
 	    connection: (XMPPConnection*)connection
 		  hash: (Class)hash
-	 plusAvailable: (BOOL)plusAvailable
+	 plusAvailable: (bool)plusAvailable
 {
 	return [[[self alloc] initWithAuthcid: authcid
 				     password: password
 				   connection: connection
 					 hash: hash
@@ -54,11 +54,11 @@
 + SCRAMAuthWithAuthzid: (OFString*)authzid
 	       authcid: (OFString*)authcid
 	      password: (OFString*)password
 	    connection: (XMPPConnection*)connection
 		  hash: (Class)hash
-	 plusAvailable: (BOOL)plusAvailable
+	 plusAvailable: (bool)plusAvailable
 {
 	return [[[self alloc] initWithAuthzid: authzid
 				      authcid: authcid
 				     password: password
 				   connection: connection
@@ -68,11 +68,11 @@
 
 - initWithAuthcid: (OFString*)authcid
 	 password: (OFString*)password
        connection: (XMPPConnection*)connection
 	     hash: (Class)hash
-    plusAvailable: (BOOL)plusAvailable
+    plusAvailable: (bool)plusAvailable
 {
 	return [self initWithAuthzid: nil
 			     authcid: authcid
 			    password: password
 			  connection: connection
@@ -83,11 +83,11 @@
 - initWithAuthzid: (OFString*)authzid
 	  authcid: (OFString*)authcid
 	 password: (OFString*)password
        connection: (XMPPConnection*)connection
 	     hash: (Class)hash
-    plusAvailable: (BOOL)plusAvailable
+    plusAvailable: (bool)plusAvailable
 {
 	self = [super initWithAuthzid: authzid
 			      authcid: authcid
 			     password: password];
 
@@ -152,11 +152,11 @@
 	_cNonce = nil;
 	[_GS2Header release];
 	_GS2Header = nil;
 	[_serverSignature release];
 	_serverSignature = nil;
-	_authenticated = NO;
+	_authenticated = false;
 
 	if (_authzid)
 		_GS2Header = [[OFString alloc]
 		    initWithFormat: @"%@,a=%@,",
 				    (_plusAvailable ? @"p=tls-unique" : @"y"),
@@ -388,11 +388,11 @@
 		if (![value isEqual: [_serverSignature stringByBase64Encoding]])
 			@throw [XMPPAuthFailedException
 			    exceptionWithConnection: nil
 					     reason: @"Received wrong "
 						     @"ServerSignature"];
-		_authenticated = YES;
+		_authenticated = true;
 	} else
 		@throw [XMPPAuthFailedException exceptionWithConnection: nil
 								 reason: value];
 
 	return nil;