diff --git a/commands.go b/commands.go
index 6e873f22..6e925afa 100644
--- a/commands.go
+++ b/commands.go
@@ -231,7 +231,7 @@ type Cmdable interface {
 	ClientKillByFilter(keys ...string) *IntCmd
 	ClientList() *StringCmd
 	ClientPause(dur time.Duration) *BoolCmd
-	ClientId() *IntCmd
+	ClientID() *IntCmd
 	ConfigGet(parameter string) *SliceCmd
 	ConfigResetStat() *StatusCmd
 	ConfigSet(parameter, value string) *StatusCmd
@@ -2062,7 +2062,7 @@ func (c *cmdable) ClientPause(dur time.Duration) *BoolCmd {
 	return cmd
 }
 
-func (c *cmdable) ClientId() *IntCmd {
+func (c *cmdable) ClientID() *IntCmd {
 	cmd := NewIntCmd("client", "id")
 	c.process(cmd)
 	return cmd
diff --git a/commands_test.go b/commands_test.go
index ecca35c4..ea646be5 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -121,10 +121,10 @@ var _ = Describe("Commands", func() {
 			Expect(r.Val()).To(Equal(int64(0)))
 		})
 
-		It("should ClientId", func() {
-			err := client.ClientId().Err()
+		It("should ClientID", func() {
+			err := client.ClientID().Err()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(client.ClientId().Val()).To(BeNumerically(">=", 0))
+			Expect(client.ClientID().Val()).To(BeNumerically(">=", 0))
 		})
 
 		It("should ClientPause", func() {