diff --git a/src/IRCConnection.h b/src/IRCConnection.h
index 6b7fcf2..68b8f8e 100644
--- a/src/IRCConnection.h
+++ b/src/IRCConnection.h
@@ -48,32 +48,32 @@
 - (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;
@@ -118,18 +118,18 @@
 - (void)joinChannel: (OFString*)channelName;
 - (void)leaveChannel: (IRCChannel*)channel;
 - (void)leaveChannel: (IRCChannel*)channel
-	  withReason: (OFString*)reason;
+	      reason: (OFString*)reason;
 - (void)sendMessage: (OFString*)msg
-	  toChannel: (IRCChannel*)channel;
+	    channel: (IRCChannel*)channel;
 - (void)sendMessage: (OFString*)msg
-	     toUser: (OFString*)user;
+	       user: (OFString*)user;
 - (void)sendNotice: (OFString*)notice
-	    toUser: (OFString*)user;
+	      user: (OFString*)user;
 - (void)sendNotice: (OFString*)notice
-	 toChannel: (IRCChannel*)channel;
+	   channel: (IRCChannel*)channel;
 - (void)kickUser: (OFString*)user
-     fromChannel: (IRCChannel*)channel
-      withReason: (OFString*)reason;
+	 channel: (IRCChannel*)channel
+	  reason: (OFString*)reason;
 - (void)changeNicknameTo: (OFString*)nickname;
 - (void)processLine: (OFString*)line;
 - (void)handleConnection;
diff --git a/src/IRCConnection.m b/src/IRCConnection.m
index 7f4473d..e5d4106 100644
--- a/src/IRCConnection.m
+++ b/src/IRCConnection.m
@@ -154,11 +154,11 @@
 - (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]];
@@ -194,32 +194,32 @@
 }
 
 - (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];
@@ -349,7 +349,7 @@
 		[delegate connection: self
 			  didSeeUser: user
 			leaveChannel: channel
-			  withReason: reason];
+			      reason: reason];
 
 		return;
 	}
@@ -379,8 +379,8 @@
 		[delegate connection: self
 			  didSeeUser: user
 			    kickUser: whom
-			 fromChannel: channel
-			  withReason: reason];
+			     channel: channel
+			      reason: reason];
 
 		return;
 	}
@@ -408,7 +408,7 @@
 
 		[delegate connection: self
 		      didSeeUserQuit: user
-			  withReason: reason];
+			      reason: reason];
 
 		return;
 	}
@@ -469,12 +469,12 @@
 
 			[delegate connection: self
 			   didReceiveMessage: msg
-				    fromUser: user
-				   inChannel: channel];
+					user: user
+				     channel: channel];
 		} else
 			[delegate	  connection: self
 			    didReceivePrivateMessage: msg
-					    fromUser: user];
+						user: user];
 
 		return;
 	}
@@ -507,12 +507,12 @@
 
 			[delegate connection: self
 			    didReceiveNotice: notice
-				    fromUser: user
-				   inChannel: channel];
+					user: user
+				     channel: channel];
 		} else
 			[delegate connection: self
 			    didReceiveNotice: notice
-				    fromUser: user];
+					user: user];
 
 		return;
 	}
@@ -605,7 +605,7 @@
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
       leaveChannel: (IRCChannel*)channel
-	withReason: (OFString*)reason
+	    reason: (OFString*)reason
 {
 }
 
@@ -618,40 +618,40 @@
 - (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
 {
 }