Index: src/IRCConnection.h
==================================================================
--- src/IRCConnection.h
+++ src/IRCConnection.h
@@ -46,36 +46,36 @@
 	didSeeUser: (IRCUser*)user
        joinChannel: (IRCChannel*)channel;
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
       leaveChannel: (IRCChannel*)channel
-	withReason: (OFString*)reason;
+	    reason: (OFString*)reason;
 - (void)connection: (IRCConnection*)connection
         didSeeUser: (IRCUser*)user
   changeNicknameTo: (OFString*)nickname;
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
 	  kickUser: (OFString*)kickedUser
-       fromChannel: (IRCChannel*)channel
-	withReason: (OFString*)reason;
+	   channel: (IRCChannel*)channel
+	    reason: (OFString*)reason;
 - (void)connection: (IRCConnection*)connection
     didSeeUserQuit: (IRCUser*)user
-	withReason: (OFString*)reason;
+	    reason: (OFString*)reason;
 -  (void)connection: (IRCConnection*)connection
   didReceiveMessage: (OFString*)msg
-	   fromUser: (IRCUser*)user
-	  inChannel: (IRCChannel*)channel;
+	       user: (IRCUser*)user
+	    channel: (IRCChannel*)channel;
 -	  (void)connection: (IRCConnection*)connection
   didReceivePrivateMessage: (OFString*)msg
-		  fromUser: (IRCUser*)user;
+		      user: (IRCUser*)user;
 - (void)connection: (IRCConnection*)connection
   didReceiveNotice: (OFString*)notice
-	  fromUser: (IRCUser*)user;
+	      user: (IRCUser*)user;
 - (void)connection: (IRCConnection*)connection
   didReceiveNotice: (OFString*)notice
-	  fromUser: (IRCUser*)user
-	 inChannel: (IRCChannel*)channel;
+	      user: (IRCUser*)user
+	   channel: (IRCChannel*)channel;
 -	   (void)connection: (IRCConnection*)connection
   didReceiveNamesForChannel: (IRCChannel*)channel;
 - (void)connectionWasClosed: (IRCConnection*)connection;
 @end
 
@@ -116,24 +116,24 @@
 - (void)disconnect;
 - (void)disconnectWithReason: (OFString*)reason;
 - (void)joinChannel: (OFString*)channelName;
 - (void)leaveChannel: (IRCChannel*)channel;
 - (void)leaveChannel: (IRCChannel*)channel
-	  withReason: (OFString*)reason;
-- (void)sendMessage: (OFString*)msg
-	  toChannel: (IRCChannel*)channel;
-- (void)sendMessage: (OFString*)msg
-	     toUser: (OFString*)user;
-- (void)sendNotice: (OFString*)notice
-	    toUser: (OFString*)user;
-- (void)sendNotice: (OFString*)notice
-	 toChannel: (IRCChannel*)channel;
-- (void)kickUser: (OFString*)user
-     fromChannel: (IRCChannel*)channel
-      withReason: (OFString*)reason;
+	      reason: (OFString*)reason;
+- (void)sendMessage: (OFString*)msg
+	    channel: (IRCChannel*)channel;
+- (void)sendMessage: (OFString*)msg
+	       user: (OFString*)user;
+- (void)sendNotice: (OFString*)notice
+	      user: (OFString*)user;
+- (void)sendNotice: (OFString*)notice
+	   channel: (IRCChannel*)channel;
+- (void)kickUser: (OFString*)user
+	 channel: (IRCChannel*)channel
+	  reason: (OFString*)reason;
 - (void)changeNicknameTo: (OFString*)nickname;
 - (void)processLine: (OFString*)line;
 - (void)handleConnection;
 @end
 
 @interface OFObject (IRCConnectionDelegate) <IRCConnectionDelegate>
 @end

Index: src/IRCConnection.m
==================================================================
--- src/IRCConnection.m
+++ src/IRCConnection.m
@@ -152,15 +152,15 @@
 }
 
 - (void)leaveChannel: (IRCChannel*)channel
 {
 	[self leaveChannel: channel
-		withReason: nil];
+		    reason: nil];
 }
 
 - (void)leaveChannel: (IRCChannel*)channel
-          withReason: (OFString*)reason
+	      reason: (OFString*)reason
 {
 	if (reason == nil)
 		[self sendLineWithFormat: @"PART %@", [channel name]];
 	else
 		[self sendLineWithFormat: @"PART %@ :%@",
@@ -192,36 +192,36 @@
 
 	[pool release];
 }
 
 - (void)sendMessage: (OFString*)msg
-	  toChannel: (IRCChannel*)channel
+	    channel: (IRCChannel*)channel
 {
 	[self sendLineWithFormat: @"PRIVMSG %@ :%@", [channel name], msg];
 }
 
 - (void)sendMessage: (OFString*)msg
-	     toUser: (OFString*)user
+	       user: (OFString*)user
 {
 	[self sendLineWithFormat: @"PRIVMSG %@ :%@", user, msg];
 }
 
 - (void)sendNotice: (OFString*)notice
-	    toUser: (OFString*)user
+	      user: (OFString*)user
 {
 	[self sendLineWithFormat: @"NOTICE %@ :%@", user, notice];
 }
 
 - (void)sendNotice: (OFString*)notice
-	 toChannel: (IRCChannel*)channel
+	   channel: (IRCChannel*)channel
 {
 	[self sendLineWithFormat: @"NOTICE %@ :%@", [channel name], notice];
 }
 
 - (void)kickUser: (OFString*)user
-     fromChannel: (IRCChannel*)channel
-      withReason: (OFString*)reason
+	 channel: (IRCChannel*)channel
+	  reason: (OFString*)reason
 {
 	[self sendLineWithFormat: @"KICK %@ %@ :%@",
 				  [channel name], user, reason];
 }
 
@@ -347,11 +347,11 @@
 		[channel IRC_removeUser: [user nickname]];
 
 		[delegate connection: self
 			  didSeeUser: user
 			leaveChannel: channel
-			  withReason: reason];
+			      reason: reason];
 
 		return;
 	}
 
 	/* KICK */
@@ -377,12 +377,12 @@
 		[channel IRC_removeUser: [user nickname]];
 
 		[delegate connection: self
 			  didSeeUser: user
 			    kickUser: whom
-			 fromChannel: channel
-			  withReason: reason];
+			     channel: channel
+			      reason: reason];
 
 		return;
 	}
 
 	/* QUIT */
@@ -406,11 +406,11 @@
 		while ((channel = [enumerator nextObject]) != nil)
 			[channel IRC_removeUser: [user nickname]];
 
 		[delegate connection: self
 		      didSeeUserQuit: user
-			  withReason: reason];
+			      reason: reason];
 
 		return;
 	}
 
 	/* NICK */
@@ -467,16 +467,16 @@
 
 			channel = [channels objectForKey: to];
 
 			[delegate connection: self
 			   didReceiveMessage: msg
-				    fromUser: user
-				   inChannel: channel];
+					user: user
+				     channel: channel];
 		} else
 			[delegate	  connection: self
 			    didReceivePrivateMessage: msg
-					    fromUser: user];
+						user: user];
 
 		return;
 	}
 
 	/* NOTICE */
@@ -505,16 +505,16 @@
 
 			channel = [channels objectForKey: to];
 
 			[delegate connection: self
 			    didReceiveNotice: notice
-				    fromUser: user
-				   inChannel: channel];
+					user: user
+				     channel: channel];
 		} else
 			[delegate connection: self
 			    didReceiveNotice: notice
-				    fromUser: user];
+					user: user];
 
 		return;
 	}
 }
 
@@ -603,11 +603,11 @@
 }
 
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
       leaveChannel: (IRCChannel*)channel
-	withReason: (OFString*)reason
+	    reason: (OFString*)reason
 {
 }
 
 - (void)connection: (IRCConnection*)connection
         didSeeUser: (IRCUser*)user
@@ -616,44 +616,44 @@
 }
 
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
 	  kickUser: (OFString*)kickedUser
-       fromChannel: (IRCChannel*)channel
-	withReason: (OFString*)reason
+	   channel: (IRCChannel*)channel
+	    reason: (OFString*)reason
 {
 }
 
 - (void)connection: (IRCConnection*)connection
     didSeeUserQuit: (IRCUser*)user
-	withReason: (OFString*)reason
+	    reason: (OFString*)reason
 {
 }
 
 -  (void)connection: (IRCConnection*)connection
   didReceiveMessage: (OFString*)msg
 	   fromUser: (IRCUser*)user
-	  inChannel: (IRCChannel*)channel
+	    channel: (IRCChannel*)channel
 {
 }
 
 -	  (void)connection: (IRCConnection*)connection
   didReceivePrivateMessage: (OFString*)msg
-		  fromUser: (IRCUser*)user
+		      user: (IRCUser*)user
 {
 }
 
 - (void)connection: (IRCConnection*)connection
   didReceiveNotice: (OFString*)notice
-	  fromUser: (IRCUser*)user
+	      user: (IRCUser*)user
 {
 }
 
 - (void)connection: (IRCConnection*)connection
   didReceiveNotice: (OFString*)notice
-	  fromUser: (IRCUser*)user
-	 inChannel: (IRCChannel*)channel
+	      user: (IRCUser*)user
+	   channel: (IRCChannel*)channel
 {
 }
 
 -	   (void)connection: (IRCConnection*)connection
   didReceiveNamesForChannel: (IRCChannel*)channel