diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java
index 19b6f55..26cd8f2 100644
--- a/src/main/java/redis/clients/jedis/BinaryClient.java
+++ b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -561,7 +561,7 @@ public class BinaryClient extends Connection {
 	sendCommand(PUNSUBSCRIBE, patterns);
     }
     
-    public void pubSub(final byte[]... args) {
+    public void pubsub(final byte[]... args) {
     	sendCommand(PUBSUB, args);
     }
     public void zcount(final byte[] key, final double min, final double max) {
diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java
index e596baa..96d0560 100644
--- a/src/main/java/redis/clients/jedis/Client.java
+++ b/src/main/java/redis/clients/jedis/Client.java
@@ -673,16 +673,16 @@ public class Client extends BinaryClient implements Commands {
 	subscribe(cs);
     }
     
-    public void pubSubChannels(String pattern) {
-	pubSub(Protocol.PUBSUB_CHANNELS, pattern);
+    public void pubsubChannels(String pattern) {
+	pubsub(Protocol.PUBSUB_CHANNELS, pattern);
     }
     
-    public void pubSubNumPat() {
-	pubSub(Protocol.PUBSUB_NUM_PAT);
+    public void pubsubNumPat() {
+	pubsub(Protocol.PUBSUB_NUM_PAT);
     }
 
-    public void pubSubNumSub(String... channels) {
-	pubSub(Protocol.PUBSUB_NUMSUB, channels);
+    public void pubsubNumSub(String... channels) {
+	pubsub(Protocol.PUBSUB_NUMSUB, channels);
     }
 
     public void configSet(String parameter, String value) {
@@ -854,13 +854,13 @@ public class Client extends BinaryClient implements Commands {
 	cluster(arg);
     }
     
-    public void pubSub(final String subcommand, final String... args) {
+    public void pubsub(final String subcommand, final String... args) {
     	final byte[][] arg = new byte[args.length+1][];
     	for (int i = 1; i < arg.length; i++) {
     	    arg[i] = SafeEncoder.encode(args[i-1]);
     	}
     	arg[0] = SafeEncoder.encode(subcommand);
-    	pubSub(arg);
+    	pubsub(arg);
     }
 
     public void cluster(final String subcommand, final String... args) {
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 0996359..d5f7283 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -3233,21 +3233,21 @@ public class Jedis extends BinaryJedis implements JedisCommands,
 	return client.getStatusCodeReply();
     }
 
-    public List<String> pubSubChannels(String pattern) {
+    public List<String> pubsubChannels(String pattern) {
 	checkIsInMulti();
-	client.pubSubChannels(pattern);
+	client.pubsubChannels(pattern);
 	return client.getMultiBulkReply();
     }
 
-    public Long pubSubNumPat() {
+    public Long pubsubNumPat() {
 	checkIsInMulti();
-	client.pubSubNumPat();
+	client.pubsubNumPat();
 	return client.getIntegerReply();
     }
 
-    public Map<String, String> pubSubNumSub(String... channels) {
+    public Map<String, String> pubsubNumSub(String... channels) {
 	checkIsInMulti();
-  	client.pubSubNumSub(channels);
+  	client.pubsubNumSub(channels);
   	return BuilderFactory.STRING_MAP
   		.build(client.getBinaryMultiBulkReply());
     }
diff --git a/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java
index 2d3e0d6..5149ff2 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java
@@ -82,7 +82,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
 			//All channels are subscribed
 			if (count == 3) {
 			    	Jedis otherJedis = createJedis();
-			    	List<String> activeChannels = otherJedis.pubSubChannels("test*");
+			    	List<String> activeChannels = otherJedis.pubsubChannels("test*");
 			    	assertTrue(expectedActiveChannels.containsAll(activeChannels));
 			    	unsubscribe();
 			}
@@ -127,7 +127,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
 		count++;
 		if (count == 3) {
 		    Jedis otherJedis = createJedis();
-		    Long numPatterns = otherJedis.pubSubNumPat();
+		    Long numPatterns = otherJedis.pubsubNumPat();
 		    assertEquals(new Long(2l), numPatterns);
 		    punsubscribe();
 		}
@@ -159,7 +159,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
 		count++;
 		if (count == 2) {
 		    Jedis otherJedis = createJedis();
-		    Map<String, String> numSub = otherJedis.pubSubNumSub("testchannel1", "testchannel2");
+		    Map<String, String> numSub = otherJedis.pubsubNumSub("testchannel1", "testchannel2");
 		    assertEquals(expectedNumSub, numSub);
 		    unsubscribe();
 		}