Index: src/XMPPAuthenticator.h
==================================================================
--- src/XMPPAuthenticator.h
+++ src/XMPPAuthenticator.h
@@ -63,17 +63,17 @@
 	 password: (OFString*)password;
 
 /**
  * \return A OFDataAray containing the initial authentication message
  */
-- (OFDataArray*)getClientFirstMessage;
+- (OFDataArray*)clientFirstMessage;
 
 /**
  * \param challenge The challenge to generate a response for
  * \return The response to the given challenge
  */
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge;
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge;
 
 /**
  * Checks whether the servers final message was valid
  *
  * \param  message The servers final message

Index: src/XMPPAuthenticator.m
==================================================================
--- src/XMPPAuthenticator.m
+++ src/XMPPAuthenticator.m
@@ -55,17 +55,17 @@
 	[password release];
 
 	[super dealloc];
 }
 
-- (OFDataArray*)getClientFirstMessage
+- (OFDataArray*)clientFirstMessage
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 

Index: src/XMPPConnection.m
==================================================================
--- src/XMPPConnection.m
+++ src/XMPPConnection.m
@@ -233,11 +233,11 @@
 	authTag = [OFXMLElement elementWithName: @"auth"
 				      namespace: NS_SASL];
 	[authTag addAttributeWithName: @"mechanism"
 			  stringValue: name];
 	[authTag addChild: [OFXMLElement elementWithCharacters:
-	    [[authModule getClientFirstMessage] stringByBase64Encoding]]];
+	    [[authModule clientFirstMessage] stringByBase64Encoding]]];
 
 	[self sendStanza: authTag];
 }
 
 - (void)_sendResourceBind
@@ -312,11 +312,12 @@
 			OFXMLElement *responseTag;
 			OFDataArray *challenge =
 			    [OFDataArray dataArrayWithBase64EncodedString:
 				[elem.children.firstObject stringValue]];
 			OFDataArray *response =
-			    [authModule getResponseWithChallenge: challenge];
+			    [authModule
+			        calculateResponseWithChallenge: challenge];
 
 			responseTag = [OFXMLElement elementWithName: @"response"
 							  namespace: NS_SASL];
 			[responseTag
 			    addChild: [OFXMLElement elementWithCharacters:

Index: src/XMPPPLAINAuth.m
==================================================================
--- src/XMPPPLAINAuth.m
+++ src/XMPPPLAINAuth.m
@@ -38,11 +38,11 @@
 	return [[[self alloc] initWithAuthzid: authzid
 				     authcid: authcid
 				    password: password] autorelease];
 }
 
-- (OFDataArray*)getClientFirstMessage
+- (OFDataArray*)clientFirstMessage
 {
 	OFDataArray *message = [OFDataArray dataArrayWithItemSize: 1];
 	/* authzid */
 	if (authzid)
 		[message addItem: authzid];
@@ -58,11 +58,11 @@
 		fromCArray: [password cString]];
 
 	return message;
 }
 
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
 {
 	@throw [XMPPAuthFailedException
 	    newWithClass: isa
 	      connection: nil
 		  reason: @"Received a challenge during PLAIN auth"];

Index: src/XMPPSCRAMAuth.m
==================================================================
--- src/XMPPSCRAMAuth.m
+++ src/XMPPSCRAMAuth.m
@@ -255,11 +255,11 @@
 		[pool release];
 		[self freeMemory: result];
 	}
 }
 
-- (OFDataArray*)getClientFirstMessage
+- (OFDataArray*)clientFirstMessage
 {
 	OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];
 	[GS2Header release];
 	if (authzid)
 		GS2Header = [[OFString alloc]
@@ -280,11 +280,11 @@
 	    fromCArray: [clientFirstMessageBare cString]];
 
 	return ret;
 }
 
-- (OFDataArray*)getResponseWithChallenge: (OFDataArray*)challenge
+- (OFDataArray*)calculateResponseWithChallenge: (OFDataArray*)challenge
 {
 	size_t i;
 	uint8_t *clientKey, *serverKey, *clientSignature;
 	intmax_t iterCount;
 	OFHash *hash;