diff --git a/client/commands.go b/client/commands.go
index 9584dbe..83d6cd3 100644
--- a/client/commands.go
+++ b/client/commands.go
@@ -100,7 +100,7 @@ func (conn *Conn) User(ident, name string) {
 func (conn *Conn) Join(channel string) { conn.Raw(JOIN + " " + channel) }
 
 // JoinKey() sends a JOIN command to the server with a key
-func (conn *Conn) JoinKey(channel string, key string) { conn.Raw(JOIN + " " + channel + " " + key) }
+func (conn *Conn) JoinWithKey(channel string, key string) { conn.Raw(JOIN + " " + channel + " " + key) }
 
 // Part() sends a PART command to the server with an optional part message
 func (conn *Conn) Part(channel string, message ...string) {
diff --git a/client/commands_test.go b/client/commands_test.go
index bfd88ba..8182395 100644
--- a/client/commands_test.go
+++ b/client/commands_test.go
@@ -98,7 +98,7 @@ func TestClientCommands(t *testing.T) {
 	c.Join("#foo")
 	s.nc.Expect("JOIN #foo")
 
-	c.JoinKey("#foo", "bar")
+	c.JoinWithKey("#foo", "bar")
 	s.nc.Expect("JOIN #foo bar")
 
 	c.Part("#foo")