@@ -467,42 +467,42 @@
 			  withObject: element];
 
 	[sock writeString: [element XMLString]];
 }
 
--	(void)sendIQ: (XMPPIQ*)iq
-  withCallbackObject: (id)object
-	    selector: (SEL)selector
+-   (void)sendIQ: (XMPPIQ*)iq
+  callbackTarget: (id)target
+	selector: (SEL)selector
 {
 	OFAutoreleasePool *pool;
 	XMPPCallback *callback;
 
 	if (![iq ID])
 		[iq setID: [self generateStanzaID]];
 
 	pool = [[OFAutoreleasePool alloc] init];
-	callback = [XMPPCallback callbackWithCallbackObject: object
-						   selector: selector];
+	callback = [XMPPCallback callbackWithTarget: target
+					   selector: selector];
 	[callbacks setObject: callback
 		      forKey: [iq ID]];
 	[pool release];
 
 	[self sendStanza: iq];
 }
 
 #ifdef OF_HAVE_BLOCKS
--      (void)sendIQ: (XMPPIQ*)iq
-  withCallbackBlock: (xmpp_callback_block_t)block;
+-  (void)sendIQ: (XMPPIQ*)iq
+  callbackBlock: (xmpp_callback_block_t)block
 {
 	OFAutoreleasePool *pool;
 	XMPPCallback *callback;
 
 	if (![iq ID])
 		[iq setID: [self generateStanzaID]];
 
 	pool = [[OFAutoreleasePool alloc] init];
-	callback = [XMPPCallback callbackWithCallbackBlock: block];
+	callback = [XMPPCallback callbackWithBlock: block];
 	[callbacks setObject: callback
 		      forKey: [iq ID]];
 	[pool release];
 
 	[self sendStanza: iq];
@@ -1036,14 +1036,14 @@
 						    namespace: XMPP_NS_BIND
 						  stringValue: resource]];
 
 	[iq addChild: bind];
 
-	[self		sendIQ: iq
-	    withCallbackObject: self
-		      selector: @selector(XMPP_handleResourceBindForConnection:
-				    withIQ:)];
+	[self	    sendIQ: iq
+	    callbackTarget: self
+		  selector: @selector(XMPP_handleResourceBindForConnection:
+				IQ:)];
 }
 
 - (void)XMPP_sendStreamError: (OFString*)condition
 			text: (OFString*)text
 {
@@ -1063,11 +1063,11 @@
 	[self sendStanza: error];
 	[self close];
 }
 
 - (void)XMPP_handleResourceBindForConnection: (XMPPConnection*)connection
-				      withIQ: (XMPPIQ*)iq
+					  IQ: (XMPPIQ*)iq
 {
 	OFXMLElement *bindElement;
 	OFXMLElement *jidElement;
 
 	assert([[iq type] isEqual: @"result"]);
@@ -1097,18 +1097,17 @@
 
 	iq = [XMPPIQ IQWithType: @"set"
 			     ID: [self generateStanzaID]];
 	[iq addChild: [OFXMLElement elementWithName: @"session"
 					  namespace: XMPP_NS_SESSION]];
-	[self		sendIQ: iq
-	    withCallbackObject: self
-		      selector: @selector(
-				    XMPP_handleSessionForConnection:withIQ:)];
+	[self	    sendIQ: iq
+	    callbackTarget: self
+		  selector: @selector(XMPP_handleSessionForConnection:IQ:)];
 }
 
 - (void)XMPP_handleSessionForConnection: (XMPPConnection*)connection
-				 withIQ: (XMPPIQ*)iq
+				     IQ: (XMPPIQ*)iq
 {
 	if (![[iq type] isEqual: @"result"])
 		assert(0);
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)