From 5efe26ea7e842ef2445a4b04563fa0a0bb319a08 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Mon, 22 May 2023 00:37:37 +0600
Subject: [PATCH 1/7] Reformat sorted set methods

- zdiff, zinter, zunion methods now return List instead of Set
- ...store methods are renamed to ...Store
- ...card methods are renamed to ...Card
---
 .../redis/clients/jedis/BuilderFactory.java   |  15 --
 .../redis/clients/jedis/CommandObjects.java   | 112 ++++++-------
 src/main/java/redis/clients/jedis/Jedis.java  | 150 +++++++++---------
 .../clients/jedis/MultiNodePipelineBase.java  | 120 +++++++-------
 .../java/redis/clients/jedis/Pipeline.java    | 120 +++++++-------
 .../redis/clients/jedis/TransactionBase.java  | 120 +++++++-------
 .../redis/clients/jedis/UnifiedJedis.java     | 120 +++++++-------
 .../jedis/commands/SetBinaryCommands.java     |  10 +-
 .../clients/jedis/commands/SetCommands.java   |  10 +-
 .../commands/SetPipelineBinaryCommands.java   |  10 +-
 .../jedis/commands/SetPipelineCommands.java   |  10 +-
 .../commands/SortedSetBinaryCommands.java     |  26 +--
 .../jedis/commands/SortedSetCommands.java     |  26 +--
 .../SortedSetPipelineBinaryCommands.java      |  26 +--
 .../commands/SortedSetPipelineCommands.java   |  26 +--
 .../clients/jedis/ClusterPipeliningTest.java  |   6 +-
 .../jedis/commands/jedis/SetCommandsTest.java |  20 +--
 .../commands/jedis/SortedSetCommandsTest.java |  59 ++++---
 .../commands/unified/SetCommandsTestBase.java |  20 +--
 .../unified/SortedSetCommandsTestBase.java    |  67 ++++----
 20 files changed, 529 insertions(+), 544 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
index a305b58474..19dd088bfa 100644
--- a/src/main/java/redis/clients/jedis/BuilderFactory.java
+++ b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -323,21 +323,6 @@ public String toString() {
     }
   };
 
-  public static final Builder<Set<String>> STRING_ORDERED_SET = new Builder<Set<String>>() {
-    @Override
-    @SuppressWarnings("unchecked")
-    public Set<String> build(Object data) {
-      if (null == data) return null;
-      return ((List<Object>) data).stream().map(STRING::build)
-          .collect(Collectors.toCollection(LinkedHashSet::new));
-    }
-
-    @Override
-    public String toString() {
-      return "Set<String>";
-    }
-  };
-
   public static final Builder<Map<String, String>> STRING_MAP = new Builder<Map<String, String>>() {
     @Override
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
index 940f407044..5b9f2d1bad 100644
--- a/src/main/java/redis/clients/jedis/CommandObjects.java
+++ b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -1222,7 +1222,7 @@ public final CommandObject<Set<String>> sdiff(String... keys) {
     return new CommandObject<>(commandArguments(SDIFF).keys((Object[]) keys), BuilderFactory.STRING_SET);
   }
 
-  public final CommandObject<Long> sdiffstore(String dstkey, String... keys) {
+  public final CommandObject<Long> sdiffStore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(SDIFFSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1230,7 +1230,7 @@ public final CommandObject<Set<byte[]>> sdiff(byte[]... keys) {
     return new CommandObject<>(commandArguments(SDIFF).keys((Object[]) keys), BuilderFactory.BINARY_SET);
   }
 
-  public final CommandObject<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
+  public final CommandObject<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
     return new CommandObject<>(commandArguments(SDIFFSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1238,15 +1238,15 @@ public final CommandObject<Set<String>> sinter(String... keys) {
     return new CommandObject<>(commandArguments(SINTER).keys((Object[]) keys), BuilderFactory.STRING_SET);
   }
 
-  public final CommandObject<Long> sinterstore(String dstkey, String... keys) {
+  public final CommandObject<Long> sinterStore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(SINTERSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sintercard(String... keys) {
+  public final CommandObject<Long> sinterCard(String... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sintercard(int limit, String... keys) {
+  public final CommandObject<Long> sinterCard(int limit, String... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys).add(LIMIT).add(limit),BuilderFactory.LONG);
   }
 
@@ -1254,15 +1254,15 @@ public final CommandObject<Set<byte[]>> sinter(byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTER).keys((Object[]) keys), BuilderFactory.BINARY_SET);
   }
 
-  public final CommandObject<Long> sinterstore(byte[] dstkey, byte[]... keys) {
+  public final CommandObject<Long> sinterStore(byte[] dstkey, byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTERSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sintercard(byte[]... keys) {
+  public final CommandObject<Long> sinterCard(byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sintercard(int limit, byte[]... keys) {
+  public final CommandObject<Long> sinterCard(int limit, byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys).add(LIMIT).add(limit),BuilderFactory.LONG);
   }
 
@@ -1270,7 +1270,7 @@ public final CommandObject<Set<String>> sunion(String... keys) {
     return new CommandObject<>(commandArguments(SUNION).keys((Object[]) keys), BuilderFactory.STRING_SET);
   }
 
-  public final CommandObject<Long> sunionstore(String dstkey, String... keys) {
+  public final CommandObject<Long> sunionStore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(SUNIONSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1278,7 +1278,7 @@ public final CommandObject<Set<byte[]>> sunion(byte[]... keys) {
     return new CommandObject<>(commandArguments(SUNION).keys((Object[]) keys), BuilderFactory.BINARY_SET);
   }
 
-  public final CommandObject<Long> sunionstore(byte[] dstkey, byte[]... keys) {
+  public final CommandObject<Long> sunionStore(byte[] dstkey, byte[]... keys) {
     return new CommandObject<>(commandArguments(SUNIONSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1534,7 +1534,7 @@ public final CommandObject<List<Tuple>> zrangeWithScores(String key, ZRangeParam
     return new CommandObject<>(commandArguments(ZRANGE).key(key).addParams(zRangeParams).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
+  public final CommandObject<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
     return new CommandObject<>(commandArguments(ZRANGESTORE).key(dest).add(src).addParams(zRangeParams), BuilderFactory.LONG);
   }
 
@@ -1640,7 +1640,7 @@ public final CommandObject<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParam
     return new CommandObject<>(commandArguments(ZRANGE).key(key).addParams(zRangeParams).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+  public final CommandObject<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
     return new CommandObject<>(commandArguments(ZRANGESTORE).key(dest).add(src).addParams(zRangeParams), BuilderFactory.LONG);
   }
 
@@ -1804,26 +1804,28 @@ public final CommandObject<ScanResult<Tuple>> zscan(byte[] key, byte[] cursor, S
     return new CommandObject<>(commandArguments(ZSCAN).key(key).add(cursor).addParams(params), BuilderFactory.ZSCAN_RESPONSE);
   }
 
-  public final CommandObject<Set<String>> zdiff(String... keys) {
-    return new CommandObject<>(commandArguments(ZDIFF).add(keys.length).keys((Object[]) keys), BuilderFactory.STRING_ORDERED_SET);
+  public final CommandObject<List<String>> zdiff(String... keys) {
+    return new CommandObject<>(commandArguments(ZDIFF).add(keys.length).keys((Object[]) keys),
+        BuilderFactory.STRING_LIST);
   }
 
-  public final CommandObject<Set<Tuple>> zdiffWithScores(String... keys) {
+  public final CommandObject<List<Tuple>> zdiffWithScores(String... keys) {
     return new CommandObject<>(commandArguments(ZDIFF).add(keys.length).keys((Object[]) keys)
-        .add(WITHSCORES), getTupleSetBuilder());
+        .add(WITHSCORES), getTupleListBuilder());
   }
 
   public final CommandObject<Long> zdiffStore(String dstkey, String... keys) {
-    return new CommandObject<>(commandArguments(ZDIFFSTORE).key(dstkey).add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
+    return new CommandObject<>(commandArguments(ZDIFFSTORE).key(dstkey)
+        .add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Set<byte[]>> zdiff(byte[]... keys) {
-    return new CommandObject<>(commandArguments(ZDIFF).add(keys.length).keys((Object[]) keys), BuilderFactory.BINARY_SET);
+  public final CommandObject<List<byte[]>> zdiff(byte[]... keys) {
+    return new CommandObject<>(commandArguments(ZDIFF).add(keys.length).keys((Object[]) keys), BuilderFactory.BINARY_LIST);
   }
 
-  public final CommandObject<Set<Tuple>> zdiffWithScores(byte[]... keys) {
+  public final CommandObject<List<Tuple>> zdiffWithScores(byte[]... keys) {
     return new CommandObject<>(commandArguments(ZDIFF).add(keys.length).keys((Object[]) keys)
-        .add(WITHSCORES), getTupleSetBuilder());
+        .add(WITHSCORES), getTupleListBuilder());
   }
 
   public final CommandObject<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
@@ -1831,104 +1833,104 @@ public final CommandObject<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
         .add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterstore(String dstkey, String... sets) {
-    return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
-        .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
+  public final CommandObject<List<String>> zinter(ZParams params, String... keys) {
+    return new CommandObject<>(commandArguments(ZINTER).add(keys.length).keys((Object[]) keys)
+        .addParams(params), BuilderFactory.STRING_LIST);
   }
 
-  public final CommandObject<Long> zinterstore(String dstkey, ZParams params, String... sets) {
-    return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
-        .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
+  public final CommandObject<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
+    return new CommandObject<>(commandArguments(ZINTER).add(keys.length).keys((Object[]) keys)
+        .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Set<String>> zinter(ZParams params, String... keys) {
-    return new CommandObject<>(commandArguments(ZINTER).add(keys.length).keys((Object[]) keys)
-        .addParams(params), BuilderFactory.STRING_ORDERED_SET);
+  public final CommandObject<Long> zinterStore(String dstkey, String... keys) {
+    return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
+        .add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Set<Tuple>> zinterWithScores(ZParams params, String... keys) {
-    return new CommandObject<>(commandArguments(ZINTER).add(keys.length).keys((Object[]) keys)
-        .addParams(params).add(WITHSCORES), getTupleSetBuilder());
+  public final CommandObject<Long> zinterStore(String dstkey, ZParams params, String... keys) {
+    return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
+        .add(keys.length).keys((Object[]) keys).addParams(params), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zintercard(String... keys) {
+  public final CommandObject<Long> zinterCard(String... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zintercard(long limit, String... keys) {
+  public final CommandObject<Long> zinterCard(long limit, String... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys).add(LIMIT).add(limit), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterstore(byte[] dstkey, byte[]... sets) {
+  public final CommandObject<Long> zinterStore(byte[] dstkey, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
+  public final CommandObject<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zintercard(byte[]... keys) {
+  public final CommandObject<Long> zinterCard(byte[]... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zintercard(long limit, byte[]... keys) {
+  public final CommandObject<Long> zinterCard(long limit, byte[]... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys).add(LIMIT).add(limit), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Set<byte[]>> zinter(ZParams params, byte[]... keys) {
+  public final CommandObject<List<byte[]>> zinter(ZParams params, byte[]... keys) {
     return new CommandObject<>(commandArguments(ZINTER).add(keys.length).keys((Object[]) keys)
-        .addParams(params), BuilderFactory.BINARY_SET);
+        .addParams(params), BuilderFactory.BINARY_LIST);
   }
 
-  public final CommandObject<Set<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
+  public final CommandObject<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
     return new CommandObject<>(commandArguments(ZINTER).add(keys.length).keys((Object[]) keys)
-        .addParams(params).add(WITHSCORES), getTupleSetBuilder());
+        .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zunionstore(String dstkey, String... sets) {
+  public final CommandObject<Long> zunionStore(String dstkey, String... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zunionstore(String dstkey, ZParams params, String... sets) {
+  public final CommandObject<Long> zunionStore(String dstkey, ZParams params, String... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Set<String>> zunion(ZParams params, String... keys) {
+  public final CommandObject<List<String>> zunion(ZParams params, String... keys) {
     return new CommandObject<>(commandArguments(ZUNION).add(keys.length).keys((Object[]) keys)
-        .addParams(params), BuilderFactory.STRING_ORDERED_SET);
+        .addParams(params), BuilderFactory.STRING_LIST);
   }
 
-  public final CommandObject<Set<Tuple>> zunionWithScores(ZParams params, String... keys) {
+  public final CommandObject<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
     return new CommandObject<>(commandArguments(ZUNION).add(keys.length).keys((Object[]) keys)
-        .addParams(params).add(WITHSCORES), getTupleSetBuilder());
+        .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zunionstore(byte[] dstkey, byte[]... sets) {
+  public final CommandObject<Long> zunionStore(byte[] dstkey, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
+  public final CommandObject<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Set<byte[]>> zunion(ZParams params, byte[]... keys) {
+  public final CommandObject<List<byte[]>> zunion(ZParams params, byte[]... keys) {
     return new CommandObject<>(commandArguments(ZUNION).add(keys.length).keys((Object[]) keys)
-        .addParams(params), BuilderFactory.BINARY_SET);
+        .addParams(params), BuilderFactory.BINARY_LIST);
   }
 
-  public final CommandObject<Set<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
+  public final CommandObject<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
     return new CommandObject<>(commandArguments(ZUNION).add(keys.length).keys((Object[]) keys)
-        .addParams(params).add(WITHSCORES), getTupleSetBuilder());
+        .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
   public final CommandObject<KeyValue<String, List<Tuple>>> zmpop(SortedSetOption option, String... keys) {
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index d9bd2c56f1..701d3cd933 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -1859,9 +1859,9 @@ public Set<byte[]> sinter(final byte[]... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sinterstore(final byte[] dstkey, final byte[]... keys) {
+  public long sinterStore(final byte[] dstkey, final byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterstore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   /**
@@ -1873,9 +1873,9 @@ public long sinterstore(final byte[] dstkey, final byte[]... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sintercard(byte[]... keys) {
+  public long sinterCard(byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sintercard(keys));
+    return connection.executeCommand(commandObjects.sinterCard(keys));
   }
 
   /**
@@ -1889,9 +1889,9 @@ public long sintercard(byte[]... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sintercard(int limit, byte[]... keys) {
+  public long sinterCard(int limit, byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sintercard(limit, keys));
+    return connection.executeCommand(commandObjects.sinterCard(limit, keys));
   }
 
   /**
@@ -1924,9 +1924,9 @@ public Set<byte[]> sunion(final byte[]... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sunionstore(final byte[] dstkey, final byte[]... keys) {
+  public long sunionStore(final byte[] dstkey, final byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sunionstore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   /**
@@ -1963,9 +1963,9 @@ public Set<byte[]> sdiff(final byte[]... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sdiffstore(final byte[] dstkey, final byte[]... keys) {
+  public long sdiffStore(final byte[] dstkey, final byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sdiffstore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   /**
@@ -2189,9 +2189,9 @@ public List<Tuple> zrangeWithScores(byte[] key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+  public long zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+    return connection.executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2688,13 +2688,13 @@ public long zcount(final byte[] key, final byte[] min, final byte[] max) {
   }
 
   @Override
-  public Set<byte[]> zdiff(final byte[]... keys) {
+  public List<byte[]> zdiff(final byte[]... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Set<Tuple> zdiffWithScores(final byte[]... keys) {
+  public List<Tuple> zdiffWithScores(final byte[]... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zdiffWithScores(keys));
   }
@@ -3048,26 +3048,26 @@ public long zremrangeByScore(final byte[] key, final byte[] min, final byte[] ma
 
   /**
    * Add multiple sorted sets, This command is similar to ZUNIONSTORE, but instead of storing the
- resulting sorted set, it is returned to the connection.
+   * resulting sorted set, it is returned to the connection.
    * @param params
    * @param keys
    * @return The result of the union
    */
   @Override
-  public Set<byte[]> zunion(final ZParams params, final byte[]... keys) {
+  public List<byte[]> zunion(final ZParams params, final byte[]... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zunion(params, keys));
   }
 
   /**
-   * Add multiple sorted sets with scores, This command is similar to ZUNIONSTORE, but instead of storing the
-   * resulting sorted set, it is returned to the connection.
+   * Add multiple sorted sets with scores, This command is similar to ZUNIONSTORE, but instead of
+   * storing the resulting sorted set, it is returned to the connection.
    * @param params
    * @param keys
    * @return The result of the union with their scores
    */
   @Override
-  public Set<Tuple> zunionWithScores(final ZParams params, final byte[]... keys) {
+  public List<Tuple> zunionWithScores(final ZParams params, final byte[]... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zunionWithScores(params, keys));
   }
@@ -3098,9 +3098,9 @@ public Set<Tuple> zunionWithScores(final ZParams params, final byte[]... keys) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionstore(final byte[] dstkey, final byte[]... sets) {
+  public long zunionStore(final byte[] dstkey, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionstore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   /**
@@ -3131,9 +3131,9 @@ public long zunionstore(final byte[] dstkey, final byte[]... sets) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionstore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
+  public long zunionStore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionstore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   /**
@@ -3144,7 +3144,7 @@ public long zunionstore(final byte[] dstkey, final ZParams params, final byte[].
    * @return The result of the intersection
    */
   @Override
-  public Set<byte[]> zinter(final ZParams params, final byte[]... keys) {
+  public List<byte[]> zinter(final ZParams params, final byte[]... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zinter(params, keys));
   }
@@ -3157,7 +3157,7 @@ public Set<byte[]> zinter(final ZParams params, final byte[]... keys) {
    * @return The result of the intersection with scores
    */
   @Override
-  public Set<Tuple> zinterWithScores(final ZParams params, final byte[]... keys) {
+  public List<Tuple> zinterWithScores(final ZParams params, final byte[]... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zinterWithScores(params, keys));
   }
@@ -3189,9 +3189,9 @@ public Set<Tuple> zinterWithScores(final ZParams params, final byte[]... keys) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterstore(final byte[] dstkey, final byte[]... sets) {
+  public long zinterStore(final byte[] dstkey, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterstore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   /**
@@ -3222,21 +3222,21 @@ public long zinterstore(final byte[] dstkey, final byte[]... sets) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterstore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
+  public long zinterStore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterstore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
-  public long zintercard(byte[]... keys) {
+  public long zinterCard(byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zintercard(keys));
+    return connection.executeCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public long zintercard(long limit, byte[]... keys) {
+  public long zinterCard(long limit, byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zintercard(limit, keys));
+    return connection.executeCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
@@ -6242,9 +6242,9 @@ public Set<String> sinter(final String... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sinterstore(final String dstkey, final String... keys) {
+  public long sinterStore(final String dstkey, final String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterstore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   /**
@@ -6256,9 +6256,9 @@ public long sinterstore(final String dstkey, final String... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sintercard(String... keys) {
+  public long sinterCard(String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sintercard(keys));
+    return connection.executeCommand(commandObjects.sinterCard(keys));
   }
 
   /**
@@ -6272,9 +6272,9 @@ public long sintercard(String... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sintercard(int limit, String... keys) {
+  public long sinterCard(int limit, String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sintercard(limit, keys));
+    return connection.executeCommand(commandObjects.sinterCard(limit, keys));
   }
 
   /**
@@ -6307,9 +6307,9 @@ public Set<String> sunion(final String... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sunionstore(final String dstkey, final String... keys) {
+  public long sunionStore(final String dstkey, final String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sunionstore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   /**
@@ -6346,9 +6346,9 @@ public Set<String> sdiff(final String... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sdiffstore(final String dstkey, final String... keys) {
+  public long sdiffStore(final String dstkey, final String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sdiffstore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   /**
@@ -6434,13 +6434,13 @@ public Double zaddIncr(final String key, final double score, final String member
   }
 
   @Override
-  public Set<String> zdiff(String... keys) {
+  public List<String> zdiff(String... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Set<Tuple> zdiffWithScores(String... keys) {
+  public List<Tuple> zdiffWithScores(String... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zdiffWithScores(keys));
   }
@@ -6602,9 +6602,9 @@ public List<Tuple> zrangeWithScores(String key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangestore(String dest, String src, ZRangeParams zRangeParams) {
+  public long zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+    return connection.executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -7426,7 +7426,7 @@ public long zremrangeByScore(final String key, final String min, final String ma
    * @return A set with members of the resulting set
    */
   @Override
-  public Set<String> zunion(ZParams params, String... keys) {
+  public List<String> zunion(ZParams params, String... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zunion(params, keys));
   }
@@ -7439,7 +7439,7 @@ public Set<String> zunion(ZParams params, String... keys) {
    * @return A set with members of the resulting set with scores
    */
   @Override
-  public Set<Tuple> zunionWithScores(ZParams params, String... keys) {
+  public List<Tuple> zunionWithScores(ZParams params, String... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zunionWithScores(params, keys));
   }
@@ -7451,7 +7451,7 @@ public Set<Tuple> zunionWithScores(ZParams params, String... keys) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7466,8 +7466,8 @@ public Set<Tuple> zunionWithScores(ZParams params, String... keys) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String...)
-   * @see Jedis#zunionstore(String, ZParams, String...)
+   * @see Jedis#zunionStore(String, String[])
+   * @see Jedis#zunionStore(String, ZParams, String[])
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7475,9 +7475,9 @@ public Set<Tuple> zunionWithScores(ZParams params, String... keys) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionstore(final String dstkey, final String... sets) {
+  public long zunionStore(final String dstkey, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionstore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   /**
@@ -7487,7 +7487,7 @@ public long zunionstore(final String dstkey, final String... sets) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7502,8 +7502,8 @@ public long zunionstore(final String dstkey, final String... sets) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String...)
-   * @see Jedis#zunionstore(String, ZParams, String...)
+   * @see Jedis#zunionStore(String, String[])
+   * @see Jedis#zunionStore(String, ZParams, String[])
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7512,9 +7512,9 @@ public long zunionstore(final String dstkey, final String... sets) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionstore(final String dstkey, final ZParams params, final String... sets) {
+  public long zunionStore(final String dstkey, final ZParams params, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionstore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   /**
@@ -7525,7 +7525,7 @@ public long zunionstore(final String dstkey, final ZParams params, final String.
    * @return A set with members of the resulting set
    */
   @Override
-  public Set<String> zinter(final ZParams params, final String... keys) {
+  public List<String> zinter(final ZParams params, final String... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zinter(params, keys));
   }
@@ -7538,21 +7538,21 @@ public Set<String> zinter(final ZParams params, final String... keys) {
    * @return A set with members of the resulting set with scores
    */
   @Override
-  public Set<Tuple> zinterWithScores(final ZParams params, final String... keys) {
+  public List<Tuple> zinterWithScores(final ZParams params, final String... keys) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public long zintercard(String... keys) {
+  public long zinterCard(String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zintercard(keys));
+    return connection.executeCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public long zintercard(long limit, String... keys) {
+  public long zinterCard(long limit, String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zintercard(limit, keys));
+    return connection.executeCommand(commandObjects.zinterCard(limit, keys));
   }
 
   /**
@@ -7562,7 +7562,7 @@ public long zintercard(long limit, String... keys) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7577,8 +7577,8 @@ public long zintercard(long limit, String... keys) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String...)
-   * @see Jedis#zunionstore(String, ZParams, String...)
+   * @see Jedis#zunionStore(String, String[])
+   * @see Jedis#zunionStore(String, ZParams, String[])
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7586,9 +7586,9 @@ public long zintercard(long limit, String... keys) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterstore(final String dstkey, final String... sets) {
+  public long zinterStore(final String dstkey, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterstore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   /**
@@ -7598,7 +7598,7 @@ public long zinterstore(final String dstkey, final String... sets) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7613,8 +7613,8 @@ public long zinterstore(final String dstkey, final String... sets) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String...)
-   * @see Jedis#zunionstore(String, ZParams, String...)
+   * @see Jedis#zunionStore(String, String[])
+   * @see Jedis#zunionStore(String, ZParams, String[])
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7623,9 +7623,9 @@ public long zinterstore(final String dstkey, final String... sets) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterstore(final String dstkey, final ZParams params, final String... sets) {
+  public long zinterStore(final String dstkey, final ZParams params, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterstore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
index 38f1dc77ff..b0c463dd8d 100644
--- a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
+++ b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
@@ -882,8 +882,8 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sdiffstore(dstKey, keys));
+  public Response<Long> sdiffStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sdiffStore(dstKey, keys));
   }
 
   @Override
@@ -892,18 +892,18 @@ public Response<Set<String>> sinter(String... keys) {
   }
 
   @Override
-  public Response<Long> sinterstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sinterstore(dstKey, keys));
+  public Response<Long> sinterStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sinterStore(dstKey, keys));
   }
 
   @Override
-  public Response<Long> sintercard(String... keys){
-    return appendCommand(commandObjects.sintercard(keys));
+  public Response<Long> sinterCard(String... keys){
+    return appendCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public Response<Long> sintercard(int limit, String... keys){
-    return appendCommand(commandObjects.sintercard(limit, keys));
+  public Response<Long> sinterCard(int limit, String... keys){
+    return appendCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -912,8 +912,8 @@ public Response<Set<String>> sunion(String... keys) {
   }
 
   @Override
-  public Response<Long> sunionstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sunionstore(dstKey, keys));
+  public Response<Long> sunionStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sunionStore(dstKey, keys));
   }
 
   @Override
@@ -1012,8 +1012,8 @@ public Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -1238,12 +1238,12 @@ public Response<KeyValue<String, List<Tuple>>> bzmpop(long timeout, SortedSetOpt
   }
 
   @Override
-  public Response<Set<String>> zdiff(String... keys) {
+  public Response<List<String>> zdiff(String... keys) {
     return appendCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zdiffWithScores(String... keys) {
+  public Response<List<Tuple>> zdiffWithScores(String... keys) {
     return appendCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -1253,53 +1253,53 @@ public Response<Long> zdiffStore(String dstKey, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterstore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zinterstore(dstKey, sets));
+  public Response<Long> zinterStore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zinterStore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zinterstore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zinterstore(dstKey, params, sets));
+  public Response<Long> zinterStore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zinterStore(dstKey, params, sets));
   }
 
   @Override
-  public Response<Set<String>> zinter(ZParams params, String... keys) {
+  public Response<List<String>> zinter(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zinterWithScores(ZParams params, String... keys) {
+  public Response<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zintercard(String... keys) {
-    return appendCommand(commandObjects.zintercard(keys));
+  public Response<Long> zinterCard(String... keys) {
+    return appendCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public Response<Long> zintercard(long limit, String... keys) {
-    return appendCommand(commandObjects.zintercard(limit, keys));
+  public Response<Long> zinterCard(long limit, String... keys) {
+    return appendCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Response<Set<String>> zunion(ZParams params, String... keys) {
+  public Response<List<String>> zunion(ZParams params, String... keys) {
     return appendCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zunionWithScores(ZParams params, String... keys) {
+  public Response<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zunionstore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zunionstore(dstKey, sets));
+  public Response<Long> zunionStore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zunionStore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zunionstore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zunionstore(dstKey, params, sets));
+  public Response<Long> zunionStore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zunionStore(dstKey, params, sets));
   }
 
   @Override
@@ -2631,8 +2631,8 @@ public Response<Set<byte[]>> sdiff(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sdiffstore(dstkey, keys));
+  public Response<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   @Override
@@ -2641,18 +2641,18 @@ public Response<Set<byte[]>> sinter(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sinterstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sinterstore(dstkey, keys));
+  public Response<Long> sinterStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   @Override
-  public Response<Long> sintercard(byte[]... keys){
-    return appendCommand(commandObjects.sintercard(keys));
+  public Response<Long> sinterCard(byte[]... keys){
+    return appendCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public Response<Long> sintercard(int limit, byte[]... keys){
-    return appendCommand(commandObjects.sintercard(limit, keys));
+  public Response<Long> sinterCard(int limit, byte[]... keys){
+    return appendCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -2661,8 +2661,8 @@ public Response<Set<byte[]>> sunion(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sunionstore(dstkey, keys));
+  public Response<Long> sunionStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   @Override
@@ -2761,8 +2761,8 @@ public Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2986,12 +2986,12 @@ public Response<KeyValue<byte[], List<Tuple>>> bzmpop(long timeout, SortedSetOpt
   }
 
   @Override
-  public Response<Set<byte[]>> zdiff(byte[]... keys) {
+  public Response<List<byte[]>> zdiff(byte[]... keys) {
     return appendCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zdiffWithScores(byte[]... keys) {
+  public Response<List<Tuple>> zdiffWithScores(byte[]... keys) {
     return appendCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -3001,53 +3001,53 @@ public Response<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
   }
 
   @Override
-  public Response<Set<byte[]>> zinter(ZParams params, byte[]... keys) {
+  public Response<List<byte[]>> zinter(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
+  public Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zinterstore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zinterstore(dstkey, sets));
+  public Response<Long> zinterStore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zinterstore(dstkey, params, sets));
+  public Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
-  public Response<Long> zintercard(byte[]... keys) {
-    return appendCommand(commandObjects.zintercard(keys));
+  public Response<Long> zinterCard(byte[]... keys) {
+    return appendCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public Response<Long> zintercard(long limit, byte[]... keys) {
-    return appendCommand(commandObjects.zintercard(limit, keys));
+  public Response<Long> zinterCard(long limit, byte[]... keys) {
+    return appendCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Response<Set<byte[]>> zunion(ZParams params, byte[]... keys) {
+  public Response<List<byte[]>> zunion(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
+  public Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zunionstore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zunionstore(dstkey, sets));
+  public Response<Long> zunionStore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zunionstore(dstkey, params, sets));
+  public Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
index 0a0a9577af..8c733cb245 100644
--- a/src/main/java/redis/clients/jedis/Pipeline.java
+++ b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -836,8 +836,8 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sdiffstore(dstKey, keys));
+  public Response<Long> sdiffStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sdiffStore(dstKey, keys));
   }
 
   @Override
@@ -846,18 +846,18 @@ public Response<Set<String>> sinter(String... keys) {
   }
 
   @Override
-  public Response<Long> sinterstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sinterstore(dstKey, keys));
+  public Response<Long> sinterStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sinterStore(dstKey, keys));
   }
 
   @Override
-  public Response<Long> sintercard(String... keys) {
-    return appendCommand(commandObjects.sintercard(keys));
+  public Response<Long> sinterCard(String... keys) {
+    return appendCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public Response<Long> sintercard(int limit, String... keys) {
-    return appendCommand(commandObjects.sintercard(limit, keys));
+  public Response<Long> sinterCard(int limit, String... keys) {
+    return appendCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -866,8 +866,8 @@ public Response<Set<String>> sunion(String... keys) {
   }
 
   @Override
-  public Response<Long> sunionstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sunionstore(dstKey, keys));
+  public Response<Long> sunionStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sunionStore(dstKey, keys));
   }
 
   @Override
@@ -1107,8 +1107,8 @@ public Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -1192,12 +1192,12 @@ public Response<KeyValue<String, List<Tuple>>> bzmpop(long timeout, SortedSetOpt
   }
 
   @Override
-  public Response<Set<String>> zdiff(String... keys) {
+  public Response<List<String>> zdiff(String... keys) {
     return appendCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zdiffWithScores(String... keys) {
+  public Response<List<Tuple>> zdiffWithScores(String... keys) {
     return appendCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -1207,52 +1207,52 @@ public Response<Long> zdiffStore(String dstKey, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterstore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zinterstore(dstKey, sets));
+  public Response<Long> zinterStore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zinterStore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zinterstore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zinterstore(dstKey, params, sets));
+  public Response<Long> zinterStore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zinterStore(dstKey, params, sets));
   }
 
   @Override
-  public Response<Set<String>> zinter(ZParams params, String... keys) {
+  public Response<List<String>> zinter(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zinterWithScores(ZParams params, String... keys) {
+  public Response<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
   @Override
-  public Response<Long> zintercard(String... keys) {
-    return appendCommand(commandObjects.zintercard(keys));
+  public Response<Long> zinterCard(String... keys) {
+    return appendCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public Response<Long> zintercard(long limit, String... keys) {
-    return appendCommand(commandObjects.zintercard(limit, keys));
+  public Response<Long> zinterCard(long limit, String... keys) {
+    return appendCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Response<Set<String>> zunion(ZParams params, String... keys) {
+  public Response<List<String>> zunion(ZParams params, String... keys) {
     return appendCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zunionWithScores(ZParams params, String... keys) {
+  public Response<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zunionstore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zunionstore(dstKey, sets));
+  public Response<Long> zunionStore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zunionStore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zunionstore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zunionstore(dstKey, params, sets));
+  public Response<Long> zunionStore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zunionStore(dstKey, params, sets));
   }
 
   @Override
@@ -2584,8 +2584,8 @@ public Response<Set<byte[]>> sdiff(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sdiffstore(dstkey, keys));
+  public Response<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   @Override
@@ -2594,18 +2594,18 @@ public Response<Set<byte[]>> sinter(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sinterstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sinterstore(dstkey, keys));
+  public Response<Long> sinterStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   @Override
-  public Response<Long> sintercard(byte[]... keys) {
-    return appendCommand(commandObjects.sintercard(keys));
+  public Response<Long> sinterCard(byte[]... keys) {
+    return appendCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public Response<Long> sintercard(int limit, byte[]... keys) {
-    return appendCommand(commandObjects.sintercard(limit, keys));
+  public Response<Long> sinterCard(int limit, byte[]... keys) {
+    return appendCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -2614,8 +2614,8 @@ public Response<Set<byte[]>> sunion(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sunionstore(dstkey, keys));
+  public Response<Long> sunionStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   @Override
@@ -2894,8 +2894,8 @@ public Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2939,12 +2939,12 @@ public Response<KeyValue<byte[], List<Tuple>>> bzmpop(long timeout, SortedSetOpt
   }
 
   @Override
-  public Response<Set<byte[]>> zdiff(byte[]... keys) {
+  public Response<List<byte[]>> zdiff(byte[]... keys) {
     return appendCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zdiffWithScores(byte[]... keys) {
+  public Response<List<Tuple>> zdiffWithScores(byte[]... keys) {
     return appendCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -2954,53 +2954,53 @@ public Response<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
   }
 
   @Override
-  public Response<Set<byte[]>> zinter(ZParams params, byte[]... keys) {
+  public Response<List<byte[]>> zinter(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
+  public Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zinterstore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zinterstore(dstkey, sets));
+  public Response<Long> zinterStore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zinterstore(dstkey, params, sets));
+  public Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
-  public Response<Long> zintercard(byte[]... keys) {
-    return appendCommand(commandObjects.zintercard(keys));
+  public Response<Long> zinterCard(byte[]... keys) {
+    return appendCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public Response<Long> zintercard(long limit, byte[]... keys) {
-    return appendCommand(commandObjects.zintercard(limit, keys));
+  public Response<Long> zinterCard(long limit, byte[]... keys) {
+    return appendCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Response<Set<byte[]>> zunion(ZParams params, byte[]... keys) {
+  public Response<List<byte[]>> zunion(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
+  public Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zunionstore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zunionstore(dstkey, sets));
+  public Response<Long> zunionStore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zunionstore(dstkey, params, sets));
+  public Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
index 929fdc6583..b975960dd2 100644
--- a/src/main/java/redis/clients/jedis/TransactionBase.java
+++ b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -931,8 +931,8 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sdiffstore(dstKey, keys));
+  public Response<Long> sdiffStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sdiffStore(dstKey, keys));
   }
 
   @Override
@@ -941,18 +941,18 @@ public Response<Set<String>> sinter(String... keys) {
   }
 
   @Override
-  public Response<Long> sinterstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sinterstore(dstKey, keys));
+  public Response<Long> sinterStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sinterStore(dstKey, keys));
   }
 
   @Override
-  public Response<Long> sintercard(String... keys) {
-    return appendCommand(commandObjects.sintercard(keys));
+  public Response<Long> sinterCard(String... keys) {
+    return appendCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public Response<Long> sintercard(int limit, String... keys) {
-    return appendCommand(commandObjects.sintercard(limit, keys));
+  public Response<Long> sinterCard(int limit, String... keys) {
+    return appendCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -961,8 +961,8 @@ public Response<Set<String>> sunion(String... keys) {
   }
 
   @Override
-  public Response<Long> sunionstore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sunionstore(dstKey, keys));
+  public Response<Long> sunionStore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sunionStore(dstKey, keys));
   }
 
   @Override
@@ -1061,8 +1061,8 @@ public Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -1287,12 +1287,12 @@ public Response<KeyValue<String, List<Tuple>>> bzmpop(long timeout, SortedSetOpt
   }
 
   @Override
-  public Response<Set<String>> zdiff(String... keys) {
+  public Response<List<String>> zdiff(String... keys) {
     return appendCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zdiffWithScores(String... keys) {
+  public Response<List<Tuple>> zdiffWithScores(String... keys) {
     return appendCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -1302,53 +1302,53 @@ public Response<Long> zdiffStore(String dstKey, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterstore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zinterstore(dstKey, sets));
+  public Response<Long> zinterStore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zinterStore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zinterstore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zinterstore(dstKey, params, sets));
+  public Response<Long> zinterStore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zinterStore(dstKey, params, sets));
   }
 
   @Override
-  public Response<Set<String>> zinter(ZParams params, String... keys) {
+  public Response<List<String>> zinter(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zinterWithScores(ZParams params, String... keys) {
+  public Response<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zintercard(String... keys) {
-    return appendCommand(commandObjects.zintercard(keys));
+  public Response<Long> zinterCard(String... keys) {
+    return appendCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public Response<Long> zintercard(long limit, String... keys) {
-    return appendCommand(commandObjects.zintercard(limit, keys));
+  public Response<Long> zinterCard(long limit, String... keys) {
+    return appendCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Response<Set<String>> zunion(ZParams params, String... keys) {
+  public Response<List<String>> zunion(ZParams params, String... keys) {
     return appendCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zunionWithScores(ZParams params, String... keys) {
+  public Response<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zunionstore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zunionstore(dstKey, sets));
+  public Response<Long> zunionStore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zunionStore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zunionstore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zunionstore(dstKey, params, sets));
+  public Response<Long> zunionStore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zunionStore(dstKey, params, sets));
   }
 
   @Override
@@ -2681,8 +2681,8 @@ public Response<Set<byte[]>> sdiff(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sdiffstore(dstkey, keys));
+  public Response<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   @Override
@@ -2691,18 +2691,18 @@ public Response<Set<byte[]>> sinter(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sinterstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sinterstore(dstkey, keys));
+  public Response<Long> sinterStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   @Override
-  public Response<Long> sintercard(byte[]... keys) {
-    return appendCommand(commandObjects.sintercard(keys));
+  public Response<Long> sinterCard(byte[]... keys) {
+    return appendCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public Response<Long> sintercard(int limit, byte[]... keys) {
-    return appendCommand(commandObjects.sintercard(limit, keys));
+  public Response<Long> sinterCard(int limit, byte[]... keys) {
+    return appendCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -2711,8 +2711,8 @@ public Response<Set<byte[]>> sunion(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sunionstore(dstkey, keys));
+  public Response<Long> sunionStore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   @Override
@@ -2811,8 +2811,8 @@ public Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -3036,12 +3036,12 @@ public Response<KeyValue<byte[], List<Tuple>>> bzmpop(long timeout, SortedSetOpt
   }
 
   @Override
-  public Response<Set<byte[]>> zdiff(byte[]... keys) {
+  public Response<List<byte[]>> zdiff(byte[]... keys) {
     return appendCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zdiffWithScores(byte[]... keys) {
+  public Response<List<Tuple>> zdiffWithScores(byte[]... keys) {
     return appendCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -3051,53 +3051,53 @@ public Response<Long> zdiffStore(byte[] dstkey, byte[]... keys) {
   }
 
   @Override
-  public Response<Set<byte[]>> zinter(ZParams params, byte[]... keys) {
+  public Response<List<byte[]>> zinter(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
+  public Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zinterstore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zinterstore(dstkey, sets));
+  public Response<Long> zinterStore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zinterstore(dstkey, params, sets));
+  public Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
-  public Response<Long> zintercard(byte[]... keys) {
-    return appendCommand(commandObjects.zintercard(keys));
+  public Response<Long> zinterCard(byte[]... keys) {
+    return appendCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public Response<Long> zintercard(long limit, byte[]... keys) {
-    return appendCommand(commandObjects.zintercard(limit, keys));
+  public Response<Long> zinterCard(long limit, byte[]... keys) {
+    return appendCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Response<Set<byte[]>> zunion(ZParams params, byte[]... keys) {
+  public Response<List<byte[]>> zunion(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Response<Set<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
+  public Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
     return appendCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public Response<Long> zunionstore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zunionstore(dstkey, sets));
+  public Response<Long> zunionStore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zunionstore(dstkey, params, sets));
+  public Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
index 4fc54ac458..f27c6ea4d7 100644
--- a/src/main/java/redis/clients/jedis/UnifiedJedis.java
+++ b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -1674,8 +1674,8 @@ public Set<String> sdiff(String... keys) {
   }
 
   @Override
-  public long sdiffstore(String dstkey, String... keys) {
-    return executeCommand(commandObjects.sdiffstore(dstkey, keys));
+  public long sdiffStore(String dstkey, String... keys) {
+    return executeCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   @Override
@@ -1684,18 +1684,18 @@ public Set<String> sinter(String... keys) {
   }
 
   @Override
-  public long sinterstore(String dstkey, String... keys) {
-    return executeCommand(commandObjects.sinterstore(dstkey, keys));
+  public long sinterStore(String dstkey, String... keys) {
+    return executeCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   @Override
-  public long sintercard(String... keys) {
-    return executeCommand(commandObjects.sintercard(keys));
+  public long sinterCard(String... keys) {
+    return executeCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public long sintercard(int limit, String... keys) {
-    return executeCommand(commandObjects.sintercard(limit, keys));
+  public long sinterCard(int limit, String... keys) {
+    return executeCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -1704,8 +1704,8 @@ public Set<String> sunion(String... keys) {
   }
 
   @Override
-  public long sunionstore(String dstkey, String... keys) {
-    return executeCommand(commandObjects.sunionstore(dstkey, keys));
+  public long sunionStore(String dstkey, String... keys) {
+    return executeCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   @Override
@@ -1719,8 +1719,8 @@ public Set<byte[]> sdiff(byte[]... keys) {
   }
 
   @Override
-  public long sdiffstore(byte[] dstkey, byte[]... keys) {
-    return executeCommand(commandObjects.sdiffstore(dstkey, keys));
+  public long sdiffStore(byte[] dstkey, byte[]... keys) {
+    return executeCommand(commandObjects.sdiffStore(dstkey, keys));
   }
 
   @Override
@@ -1729,18 +1729,18 @@ public Set<byte[]> sinter(byte[]... keys) {
   }
 
   @Override
-  public long sinterstore(byte[] dstkey, byte[]... keys) {
-    return executeCommand(commandObjects.sinterstore(dstkey, keys));
+  public long sinterStore(byte[] dstkey, byte[]... keys) {
+    return executeCommand(commandObjects.sinterStore(dstkey, keys));
   }
 
   @Override
-  public long sintercard(byte[]... keys) {
-    return executeCommand(commandObjects.sintercard(keys));
+  public long sinterCard(byte[]... keys) {
+    return executeCommand(commandObjects.sinterCard(keys));
   }
 
   @Override
-  public long sintercard(int limit, byte[]... keys) {
-    return executeCommand(commandObjects.sintercard(limit, keys));
+  public long sinterCard(int limit, byte[]... keys) {
+    return executeCommand(commandObjects.sinterCard(limit, keys));
   }
 
   @Override
@@ -1749,8 +1749,8 @@ public Set<byte[]> sunion(byte[]... keys) {
   }
 
   @Override
-  public long sunionstore(byte[] dstkey, byte[]... keys) {
-    return executeCommand(commandObjects.sunionstore(dstkey, keys));
+  public long sunionStore(byte[] dstkey, byte[]... keys) {
+    return executeCommand(commandObjects.sunionStore(dstkey, keys));
   }
 
   @Override
@@ -2031,8 +2031,8 @@ public List<Tuple> zrangeWithScores(String key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangestore(String dest, String src, ZRangeParams zRangeParams) {
-    return executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public long zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
+    return executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2146,8 +2146,8 @@ public List<Tuple> zrangeWithScores(byte[] key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
+  public long zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2351,12 +2351,12 @@ public List<Object> bzpopmin(double timeout, byte[]... keys) {
   }
 
   @Override
-  public Set<String> zdiff(String... keys) {
+  public List<String> zdiff(String... keys) {
     return executeCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Set<Tuple> zdiffWithScores(String... keys) {
+  public List<Tuple> zdiffWithScores(String... keys) {
     return executeCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -2366,12 +2366,12 @@ public long zdiffStore(String dstkey, String... keys) {
   }
 
   @Override
-  public Set<byte[]> zdiff(byte[]... keys) {
+  public List<byte[]> zdiff(byte[]... keys) {
     return executeCommand(commandObjects.zdiff(keys));
   }
 
   @Override
-  public Set<Tuple> zdiffWithScores(byte[]... keys) {
+  public List<Tuple> zdiffWithScores(byte[]... keys) {
     return executeCommand(commandObjects.zdiffWithScores(keys));
   }
 
@@ -2381,103 +2381,103 @@ public long zdiffStore(byte[] dstkey, byte[]... keys) {
   }
 
   @Override
-  public long zinterstore(String dstkey, String... sets) {
-    return executeCommand(commandObjects.zinterstore(dstkey, sets));
+  public long zinterStore(String dstkey, String... sets) {
+    return executeCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   @Override
-  public long zinterstore(String dstkey, ZParams params, String... sets) {
-    return executeCommand(commandObjects.zinterstore(dstkey, params, sets));
+  public long zinterStore(String dstkey, ZParams params, String... sets) {
+    return executeCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
-  public Set<String> zinter(ZParams params, String... keys) {
+  public List<String> zinter(ZParams params, String... keys) {
     return executeCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Set<Tuple> zinterWithScores(ZParams params, String... keys) {
+  public List<Tuple> zinterWithScores(ZParams params, String... keys) {
     return executeCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public long zinterstore(byte[] dstkey, byte[]... sets) {
-    return executeCommand(commandObjects.zinterstore(dstkey, sets));
+  public long zinterStore(byte[] dstkey, byte[]... sets) {
+    return executeCommand(commandObjects.zinterStore(dstkey, sets));
   }
 
   @Override
-  public long zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return executeCommand(commandObjects.zinterstore(dstkey, params, sets));
+  public long zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return executeCommand(commandObjects.zinterStore(dstkey, params, sets));
   }
 
   @Override
-  public long zintercard(byte[]... keys) {
-    return executeCommand(commandObjects.zintercard(keys));
+  public long zinterCard(byte[]... keys) {
+    return executeCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public long zintercard(long limit, byte[]... keys) {
-    return executeCommand(commandObjects.zintercard(limit, keys));
+  public long zinterCard(long limit, byte[]... keys) {
+    return executeCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public long zintercard(String... keys) {
-    return executeCommand(commandObjects.zintercard(keys));
+  public long zinterCard(String... keys) {
+    return executeCommand(commandObjects.zinterCard(keys));
   }
 
   @Override
-  public long zintercard(long limit, String... keys) {
-    return executeCommand(commandObjects.zintercard(limit, keys));
+  public long zinterCard(long limit, String... keys) {
+    return executeCommand(commandObjects.zinterCard(limit, keys));
   }
 
   @Override
-  public Set<byte[]> zinter(ZParams params, byte[]... keys) {
+  public List<byte[]> zinter(ZParams params, byte[]... keys) {
     return executeCommand(commandObjects.zinter(params, keys));
   }
 
   @Override
-  public Set<Tuple> zinterWithScores(ZParams params, byte[]... keys) {
+  public List<Tuple> zinterWithScores(ZParams params, byte[]... keys) {
     return executeCommand(commandObjects.zinterWithScores(params, keys));
   }
 
   @Override
-  public Set<String> zunion(ZParams params, String... keys) {
+  public List<String> zunion(ZParams params, String... keys) {
     return executeCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Set<Tuple> zunionWithScores(ZParams params, String... keys) {
+  public List<Tuple> zunionWithScores(ZParams params, String... keys) {
     return executeCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public long zunionstore(String dstkey, String... sets) {
-    return executeCommand(commandObjects.zunionstore(dstkey, sets));
+  public long zunionStore(String dstkey, String... sets) {
+    return executeCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   @Override
-  public long zunionstore(String dstkey, ZParams params, String... sets) {
-    return executeCommand(commandObjects.zunionstore(dstkey, params, sets));
+  public long zunionStore(String dstkey, ZParams params, String... sets) {
+    return executeCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   @Override
-  public Set<byte[]> zunion(ZParams params, byte[]... keys) {
+  public List<byte[]> zunion(ZParams params, byte[]... keys) {
     return executeCommand(commandObjects.zunion(params, keys));
   }
 
   @Override
-  public Set<Tuple> zunionWithScores(ZParams params, byte[]... keys) {
+  public List<Tuple> zunionWithScores(ZParams params, byte[]... keys) {
     return executeCommand(commandObjects.zunionWithScores(params, keys));
   }
 
   @Override
-  public long zunionstore(byte[] dstkey, byte[]... sets) {
-    return executeCommand(commandObjects.zunionstore(dstkey, sets));
+  public long zunionStore(byte[] dstkey, byte[]... sets) {
+    return executeCommand(commandObjects.zunionStore(dstkey, sets));
   }
 
   @Override
-  public long zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return executeCommand(commandObjects.zunionstore(dstkey, params, sets));
+  public long zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return executeCommand(commandObjects.zunionStore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java
index 7420d4fabf..dce0a67876 100644
--- a/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java
@@ -36,11 +36,11 @@ default ScanResult<byte[]> sscan(byte[] key, byte[] cursor) {
 
   Set<byte[]> sdiff(byte[]... keys);
 
-  long sdiffstore(byte[] dstkey, byte[]... keys);
+  long sdiffStore(byte[] dstkey, byte[]... keys);
 
   Set<byte[]> sinter(byte[]... keys);
 
-  long sinterstore(byte[] dstkey, byte[]... keys);
+  long sinterStore(byte[] dstkey, byte[]... keys);
 
   /**
    * This command works exactly like {@link SetBinaryCommands#sinter(byte[][]) SINTER} but instead of returning
@@ -50,7 +50,7 @@ default ScanResult<byte[]> sscan(byte[] key, byte[] cursor) {
    * @param keys
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sintercard(byte[]... keys);
+  long sinterCard(byte[]... keys);
 
   /**
    * This command works exactly like {@link SetBinaryCommands#sinter(byte[][]) SINTER} but instead of returning
@@ -62,11 +62,11 @@ default ScanResult<byte[]> sscan(byte[] key, byte[] cursor) {
    * @param keys
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sintercard(int limit, byte[]... keys);
+  long sinterCard(int limit, byte[]... keys);
 
   Set<byte[]> sunion(byte[]... keys);
 
-  long sunionstore(byte[] dstkey, byte[]... keys);
+  long sunionStore(byte[] dstkey, byte[]... keys);
 
   long smove(byte[] srckey, byte[] dstkey, byte[] member);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SetCommands.java b/src/main/java/redis/clients/jedis/commands/SetCommands.java
index e412598e00..f6c6aa464b 100644
--- a/src/main/java/redis/clients/jedis/commands/SetCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetCommands.java
@@ -159,7 +159,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting set
    */
-  long sdiffstore(String dstkey, String... keys);
+  long sdiffStore(String dstkey, String... keys);
 
   /**
    * Return the members of a set resulting from the intersection of all the sets hold at the
@@ -188,7 +188,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting set
    */
-  long sinterstore(String dstkey, String... keys);
+  long sinterStore(String dstkey, String... keys);
 
   /**
    * This command works exactly like {@link SetCommands#sinter(String[]) SINTER} but instead of returning
@@ -198,7 +198,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sintercard(String... keys);
+  long sinterCard(String... keys);
 
   /**
    * This command works exactly like {@link SetCommands#sinter(String[]) SINTER} but instead of returning
@@ -210,7 +210,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sintercard(int limit, String... keys);
+  long sinterCard(int limit, String... keys);
 
   /**
    * Return the members of a set resulting from the union of all the sets hold at the specified
@@ -237,7 +237,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting set
    */
-  long sunionstore(String dstkey, String... keys);
+  long sunionStore(String dstkey, String... keys);
 
   /**
    * Move the specified member from the set at srckey to the set at dstkey. This operation is
diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java
index 6268077203..d298d62111 100644
--- a/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java
@@ -37,19 +37,19 @@ default Response<ScanResult<byte[]>> sscan(byte[] key, byte[] cursor) {
 
   Response<Set<byte[]>> sdiff(byte[]... keys);
 
-  Response<Long> sdiffstore(byte[] dstkey, byte[]... keys);
+  Response<Long> sdiffStore(byte[] dstkey, byte[]... keys);
 
   Response<Set<byte[]>> sinter(byte[]... keys);
 
-  Response<Long> sinterstore(byte[] dstkey, byte[]... keys);
+  Response<Long> sinterStore(byte[] dstkey, byte[]... keys);
 
-  Response<Long> sintercard(byte[]... keys);
+  Response<Long> sinterCard(byte[]... keys);
 
-  Response<Long> sintercard(int limit, byte[]... keys);
+  Response<Long> sinterCard(int limit, byte[]... keys);
 
   Response<Set<byte[]>> sunion(byte[]... keys);
 
-  Response<Long> sunionstore(byte[] dstkey, byte[]... keys);
+  Response<Long> sunionStore(byte[] dstkey, byte[]... keys);
 
   Response<Long> smove(byte[] srckey, byte[] dstkey, byte[] member);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
index ce1d4a7f43..d887e2ea3b 100644
--- a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
@@ -37,19 +37,19 @@ default Response<ScanResult<String>> sscan(String key, String cursor) {
 
   Response<Set<String>> sdiff(String... keys);
 
-  Response<Long> sdiffstore(String dstKey, String... keys);
+  Response<Long> sdiffStore(String dstKey, String... keys);
 
   Response<Set<String>> sinter(String... keys);
 
-  Response<Long> sinterstore(String dstKey, String... keys);
+  Response<Long> sinterStore(String dstKey, String... keys);
 
-  Response<Long> sintercard(String... keys);
+  Response<Long> sinterCard(String... keys);
 
-  Response<Long> sintercard(int limit, String... keys);
+  Response<Long> sinterCard(int limit, String... keys);
 
   Response<Set<String>> sunion(String... keys);
 
-  Response<Long> sunionstore(String dstKey, String... keys);
+  Response<Long> sunionStore(String dstKey, String... keys);
 
   Response<Long> smove(String srckey, String dstKey, String member);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java
index 204f399d08..9555547e61 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java
@@ -48,7 +48,7 @@ public interface SortedSetBinaryCommands {
 
   List<Tuple> zrangeWithScores(byte[] key, ZRangeParams zRangeParams);
 
-  long zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
+  long zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
 
   byte[] zrandmember(byte[] key);
 
@@ -134,19 +134,19 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
 
   List<Object> bzpopmin(double timeout, byte[]... keys);
 
-  Set<byte[]> zdiff(byte[]... keys);
+  List<byte[]> zdiff(byte[]... keys);
 
-  Set<Tuple> zdiffWithScores(byte[]... keys);
+  List<Tuple> zdiffWithScores(byte[]... keys);
 
   long zdiffStore(byte[] dstkey, byte[]... keys);
 
-  Set<byte[]> zinter(ZParams params, byte[]... keys);
+  List<byte[]> zinter(ZParams params, byte[]... keys);
 
-  Set<Tuple> zinterWithScores(ZParams params, byte[]... keys);
+  List<Tuple> zinterWithScores(ZParams params, byte[]... keys);
 
-  long zinterstore(byte[] dstkey, byte[]... sets);
+  long zinterStore(byte[] dstkey, byte[]... sets);
 
-  long zinterstore(byte[] dstkey, ZParams params, byte[]... sets);
+  long zinterStore(byte[] dstkey, ZParams params, byte[]... sets);
 
   /**
    * Similar to {@link SortedSetBinaryCommands#zinter(ZParams, byte[]...) ZINTER}, but
@@ -158,7 +158,7 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zintercard(byte[]... keys);
+  long zinterCard(byte[]... keys);
 
   /**
    * Similar to {@link SortedSetBinaryCommands#zinter(ZParams, byte[]...) ZINTER}, but
@@ -172,15 +172,15 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zintercard(long limit, byte[]... keys);
+  long zinterCard(long limit, byte[]... keys);
 
-  Set<byte[]> zunion(ZParams params, byte[]... keys);
+  List<byte[]> zunion(ZParams params, byte[]... keys);
 
-  Set<Tuple> zunionWithScores(ZParams params, byte[]... keys);
+  List<Tuple> zunionWithScores(ZParams params, byte[]... keys);
 
-  long zunionstore(byte[] dstkey, byte[]... sets);
+  long zunionStore(byte[] dstkey, byte[]... sets);
 
-  long zunionstore(byte[] dstkey, ZParams params, byte[]... sets);
+  long zunionStore(byte[] dstkey, ZParams params, byte[]... sets);
 
   KeyValue<byte[], List<Tuple>> zmpop(SortedSetOption option, byte[]... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java
index 64776de919..fdafe3f302 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java
@@ -243,7 +243,7 @@ public interface SortedSetCommands {
    * @param zRangeParams {@link ZRangeParams}
    * @return The number of elements in the resulting sorted set
    */
-  long zrangestore(String dest, String src, ZRangeParams zRangeParams);
+  long zrangeStore(String dest, String src, ZRangeParams zRangeParams);
 
   /**
    * Return a random element from the sorted set value stored at key.
@@ -686,14 +686,14 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The result of the difference
    */
-  Set<String> zdiff(String... keys);
+  List<String> zdiff(String... keys);
 
   /**
    * Compute the difference between all the sets in the given keys. Return the result with scores.
    * @param keys group of sets
    * @return The result of the difference with their scores
    */
-  Set<Tuple> zdiffWithScores(String... keys);
+  List<Tuple> zdiffWithScores(String... keys);
 
   /**
    * Compute the difference between all the sets in the given keys. Store the result in dstkey.
@@ -712,7 +712,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The result of the intersection
    */
-  Set<String> zinter(ZParams params, String... keys);
+  List<String> zinter(ZParams params, String... keys);
 
   /**
    * Compute the intersection between all the sets in the given keys. Return the result with scores.
@@ -720,7 +720,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The result of the intersection with their scores
    */
-  Set<Tuple> zinterWithScores(ZParams params, String... keys);
+  List<Tuple> zinterWithScores(ZParams params, String... keys);
 
   /**
    * Compute the intersection between all the sets in the given keys. Store the result in dstkey.
@@ -728,7 +728,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zinterstore(String dstkey, String... sets);
+  long zinterStore(String dstkey, String... sets);
 
   /**
    * Compute the intersection between all the sets in the given keys. Store the result in dstkey.
@@ -737,7 +737,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zinterstore(String dstkey, ZParams params, String... sets);
+  long zinterStore(String dstkey, ZParams params, String... sets);
 
   /**
    * Similar to {@link SortedSetCommands#zinter(ZParams, String...) ZINTER}, but
@@ -749,7 +749,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zintercard(String... keys);
+  long zinterCard(String... keys);
 
   /**
    * Similar to {@link SortedSetCommands#zinter(ZParams, String...) ZINTER}, but
@@ -763,7 +763,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zintercard(long limit, String... keys);
+  long zinterCard(long limit, String... keys);
 
   /**
    * Compute the union between all the sets in the given keys.
@@ -774,7 +774,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The result of the union
    */
-  Set<String> zunion(ZParams params, String... keys);
+  List<String> zunion(ZParams params, String... keys);
 
   /**
    * Compute the union between all the sets in the given keys. Return the result with scores.
@@ -782,7 +782,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The result of the union with their scores
    */
-  Set<Tuple> zunionWithScores(ZParams params, String... keys);
+  List<Tuple> zunionWithScores(ZParams params, String... keys);
 
   /**
    * Compute the union between all the sets in the given keys. Store the result in dstkey.
@@ -790,7 +790,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zunionstore(String dstkey, String... sets);
+  long zunionStore(String dstkey, String... sets);
 
   /**
    * Compute the union between all the sets in the given keys. Store the result in dstkey.
@@ -799,7 +799,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zunionstore(String dstkey, ZParams params, String... sets);
+  long zunionStore(String dstkey, ZParams params, String... sets);
 
   KeyValue<String, List<Tuple>> zmpop(SortedSetOption option, String... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java
index 72cac6cafa..7397ea30f4 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java
@@ -121,7 +121,7 @@ public interface SortedSetPipelineBinaryCommands {
 
   Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangeParams);
 
-  Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
+  Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
 
   Response<Long> zremrangeByLex(byte[] key, byte[] min, byte[] max);
 
@@ -135,31 +135,31 @@ default Response<ScanResult<Tuple>> zscan(byte[] key, byte[] cursor) {
 
   Response<List<Object>> bzpopmin(double timeout, byte[]... keys);
 
-  Response<Set<byte[]>> zdiff(byte[]... keys);
+  Response<List<byte[]>> zdiff(byte[]... keys);
 
-  Response<Set<Tuple>> zdiffWithScores(byte[]... keys);
+  Response<List<Tuple>> zdiffWithScores(byte[]... keys);
 
   Response<Long> zdiffStore(byte[] dstkey, byte[]... keys);
 
-  Response<Set<byte[]>> zinter(ZParams params, byte[]... keys);
+  Response<List<byte[]>> zinter(ZParams params, byte[]... keys);
 
-  Response<Set<Tuple>> zinterWithScores(ZParams params, byte[]... keys);
+  Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys);
 
-  Response<Long> zinterstore(byte[] dstkey, byte[]... sets);
+  Response<Long> zinterStore(byte[] dstkey, byte[]... sets);
 
-  Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets);
+  Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets);
 
-  Response<Long> zintercard(byte[]... keys);
+  Response<Long> zinterCard(byte[]... keys);
 
-  Response<Long> zintercard(long limit, byte[]... keys);
+  Response<Long> zinterCard(long limit, byte[]... keys);
 
-  Response<Set<byte[]>> zunion(ZParams params, byte[]... keys);
+  Response<List<byte[]>> zunion(ZParams params, byte[]... keys);
 
-  Response<Set<Tuple>> zunionWithScores(ZParams params, byte[]... keys);
+  Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys);
 
-  Response<Long> zunionstore(byte[] dstkey, byte[]... sets);
+  Response<Long> zunionStore(byte[] dstkey, byte[]... sets);
 
-  Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets);
+  Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets);
 
   Response<KeyValue<byte[], List<Tuple>>> zmpop(SortedSetOption option, byte[]... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java
index c1b3f3b5e3..4cfbccb56f 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java
@@ -106,7 +106,7 @@ public interface SortedSetPipelineCommands {
 
   Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangeParams);
 
-  Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams);
+  Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams);
 
   Response<Long> zremrangeByRank(String key, long start, long stop);
 
@@ -136,31 +136,31 @@ default Response<ScanResult<Tuple>> zscan(String key, String cursor) {
 
   Response<KeyedZSetElement> bzpopmin(double timeout, String... keys);
 
-  Response<Set<String>> zdiff(String... keys);
+  Response<List<String>> zdiff(String... keys);
 
-  Response<Set<Tuple>> zdiffWithScores(String... keys);
+  Response<List<Tuple>> zdiffWithScores(String... keys);
 
   Response<Long> zdiffStore(String dstKey, String... keys);
 
-  Response<Long> zinterstore(String dstKey, String... sets);
+  Response<Long> zinterStore(String dstKey, String... sets);
 
-  Response<Long> zinterstore(String dstKey, ZParams params, String... sets);
+  Response<Long> zinterStore(String dstKey, ZParams params, String... sets);
 
-  Response<Set<String>> zinter(ZParams params, String... keys);
+  Response<List<String>> zinter(ZParams params, String... keys);
 
-  Response<Set<Tuple>> zinterWithScores(ZParams params, String... keys);
+  Response<List<Tuple>> zinterWithScores(ZParams params, String... keys);
 
-  Response<Long> zintercard(String... keys);
+  Response<Long> zinterCard(String... keys);
 
-  Response<Long> zintercard(long limit, String... keys);
+  Response<Long> zinterCard(long limit, String... keys);
 
-  Response<Set<String>> zunion(ZParams params, String... keys);
+  Response<List<String>> zunion(ZParams params, String... keys);
 
-  Response<Set<Tuple>> zunionWithScores(ZParams params, String... keys);
+  Response<List<Tuple>> zunionWithScores(ZParams params, String... keys);
 
-  Response<Long> zunionstore(String dstKey, String... sets);
+  Response<Long> zunionStore(String dstKey, String... sets);
 
-  Response<Long> zunionstore(String dstKey, ZParams params, String... sets);
+  Response<Long> zunionStore(String dstKey, ZParams params, String... sets);
 
   Response<KeyValue<String, List<Tuple>>> zmpop(SortedSetOption option, String... keys);
 
diff --git a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
index 44f2f2a279..56b6243246 100644
--- a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
+++ b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
@@ -519,13 +519,13 @@ public void clusterPipelineSet() {
     Response<Long> r1 = p.sadd("my{set}", "hello", "hello", "world", "foo", "bar");
     p.sadd("mynew{set}", "hello", "hello", "world");
     Response<Set<String>> r2 = p.sdiff("my{set}", "mynew{set}");
-    Response<Long> r3 = p.sdiffstore("diffset{set}", "my{set}", "mynew{set}");
+    Response<Long> r3 = p.sdiffStore("diffset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r4 = p.smembers("diffset{set}");
     Response<Set<String>> r5 = p.sinter("my{set}", "mynew{set}");
-    Response<Long> r6 = p.sinterstore("interset{set}", "my{set}", "mynew{set}");
+    Response<Long> r6 = p.sinterStore("interset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r7 = p.smembers("interset{set}");
     Response<Set<String>> r8 = p.sunion("my{set}", "mynew{set}");
-    Response<Long> r9 = p.sunionstore("unionset{set}", "my{set}", "mynew{set}");
+    Response<Long> r9 = p.sunionStore("unionset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r10 = p.smembers("unionset{set}");
     Response<Boolean> r11 = p.sismember("my{set}", "foo");
     Response<List<Boolean>> r12 = p.smismember("my{set}", "foo", "foobar");
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java
index 4d29392fce..9735681486 100644
--- a/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java
@@ -333,7 +333,7 @@ public void sinterstore() {
     Set<String> expected = new HashSet<String>();
     expected.add("b");
 
-    long status = jedis.sinterstore("car", "foo", "bar");
+    long status = jedis.sinterStore("car", "foo", "bar");
     assertEquals(1, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -348,7 +348,7 @@ public void sinterstore() {
     Set<byte[]> bexpected = new HashSet<byte[]>();
     bexpected.add(bb);
 
-    long bstatus = jedis.sinterstore(bcar, bfoo, bbar);
+    long bstatus = jedis.sinterStore(bcar, bfoo, bbar);
     assertEquals(1, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -364,9 +364,9 @@ public void sintercard() {
     jedis.sadd("bar", "b");
     jedis.sadd("bar", "c");
 
-    long card = jedis.sintercard("foo", "bar");
+    long card = jedis.sinterCard("foo", "bar");
     assertEquals(2, card);
-    long limitedCard = jedis.sintercard(1, "foo", "bar");
+    long limitedCard = jedis.sinterCard(1, "foo", "bar");
     assertEquals(1, limitedCard);
 
     // Binary
@@ -377,9 +377,9 @@ public void sintercard() {
     jedis.sadd(bbar, bb);
     jedis.sadd(bbar, bc);
 
-    long bcard = jedis.sintercard(bfoo, bbar);
+    long bcard = jedis.sinterCard(bfoo, bbar);
     assertEquals(2, bcard);
-    long blimitedCard = jedis.sintercard(1, bfoo, bbar);
+    long blimitedCard = jedis.sinterCard(1, bfoo, bbar);
     assertEquals(1, blimitedCard);
   }
 
@@ -429,7 +429,7 @@ public void sunionstore() {
     expected.add("b");
     expected.add("c");
 
-    long status = jedis.sunionstore("car", "foo", "bar");
+    long status = jedis.sunionStore("car", "foo", "bar");
     assertEquals(3, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -446,7 +446,7 @@ public void sunionstore() {
     bexpected.add(bc);
     bexpected.add(ba);
 
-    long bstatus = jedis.sunionstore(bcar, bfoo, bbar);
+    long bstatus = jedis.sunionStore(bcar, bfoo, bbar);
     assertEquals(3, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -508,7 +508,7 @@ public void sdiffstore() {
     expected.add("x");
     expected.add("b");
 
-    long status = jedis.sdiffstore("tar", "foo", "bar", "car");
+    long status = jedis.sdiffStore("tar", "foo", "bar", "car");
     assertEquals(2, status);
     assertEquals(expected, jedis.smembers("tar"));
 
@@ -527,7 +527,7 @@ public void sdiffstore() {
     bexpected.add(bx);
     bexpected.add(bb);
 
-    long bstatus = jedis.sdiffstore("tar".getBytes(), bfoo, bbar, bcar);
+    long bstatus = jedis.sdiffStore("tar".getBytes(), bfoo, bbar, bcar);
     assertEquals(2, bstatus);
     assertByteArraySetEquals(bexpected, jedis.smembers("tar".getBytes()));
 
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
index 58e33f90f0..29ed36bec1 100644
--- a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
@@ -1,5 +1,6 @@
 package redis.clients.jedis.commands.jedis;
 
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.*;
 import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START;
 import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY;
@@ -10,10 +11,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.junit.Test;
 
@@ -1028,7 +1027,7 @@ public void zrangestore() {
     jedis.zadd("foo", 2, "c");
     jedis.zadd("foo", 3, "bb");
 
-    long stored = jedis.zrangestore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
+    long stored = jedis.zrangeStore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
     assertEquals(2, stored);
 
     List<String> range = jedis.zrange("bar", 0, -1);
@@ -1043,7 +1042,7 @@ public void zrangestore() {
     jedis.zadd(bfoo, 0.1d, bc);
     jedis.zadd(bfoo, 2d, ba);
 
-    long bstored = jedis.zrangestore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
+    long bstored = jedis.zrangeStore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
     assertEquals(2, bstored);
 
     List<byte[]> brange = jedis.zrevrange(bbar, 0, 1);
@@ -1233,12 +1232,12 @@ public void zunion() {
     ZParams params = new ZParams();
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
-    Set<String> expected = new LinkedHashSet<>();
+    List<String> expected = new ArrayList<>();
     expected.add("a");
     expected.add("b");
     assertEquals(expected, jedis.zunion(params, "foo", "bar"));
 
-    Set<Tuple> expectedTuple = new LinkedHashSet<>();
+    List<Tuple> expectedTuple = new ArrayList<>();
     expectedTuple.add(new Tuple("b", new Double(9)));
     expectedTuple.add(new Tuple("a", new Double(7)));
     assertEquals(expectedTuple, jedis.zunionWithScores(params, "foo", "bar"));
@@ -1252,12 +1251,12 @@ public void zunion() {
     ZParams bparams = new ZParams();
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
-    Set<byte[]> bexpected = new LinkedHashSet<>();
+    List<byte[]> bexpected = new ArrayList<>();
     bexpected.add(bb);
     bexpected.add(ba);
-    AssertUtil.assertByteArraySetEquals(bexpected, jedis.zunion(params, bfoo, bbar));
+    AssertUtil.assertByteArrayListEquals(bexpected, jedis.zunion(params, bfoo, bbar));
 
-    Set<Tuple> bexpectedTuple = new LinkedHashSet<>();
+    List<Tuple> bexpectedTuple = new ArrayList<>();
     bexpectedTuple.add(new Tuple(bb, new Double(9)));
     bexpectedTuple.add(new Tuple(ba, new Double(7)));
     assertEquals(bexpectedTuple, jedis.zunionWithScores(bparams, bfoo, bbar));
@@ -1270,7 +1269,7 @@ public void zunionstore() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 2, "b");
 
-    assertEquals(2, jedis.zunionstore("dst", "foo", "bar"));
+    assertEquals(2, jedis.zunionStore("dst", "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(3)));
@@ -1284,7 +1283,7 @@ public void zunionstore() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(3)));
@@ -1304,7 +1303,7 @@ public void zunionstoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionstore("dst", params, "foo", "bar"));
+    assertEquals(2, jedis.zunionStore("dst", params, "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(7)));
@@ -1322,7 +1321,7 @@ public void zunionstoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(7)));
@@ -1340,9 +1339,9 @@ public void zinter() {
     ZParams params = new ZParams();
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
-    assertEquals(Collections.singleton("a"), jedis.zinter(params, "foo", "bar"));
+    assertEquals(singletonList("a"), jedis.zinter(params, "foo", "bar"));
 
-    assertEquals(Collections.singleton(new Tuple("a", new Double(7))),
+    assertEquals(singletonList(new Tuple("a", new Double(7))),
       jedis.zinterWithScores(params, "foo", "bar"));
 
     // Binary
@@ -1353,9 +1352,9 @@ public void zinter() {
     ZParams bparams = new ZParams();
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
-    AssertUtil.assertByteArraySetEquals(Collections.singleton(ba), jedis.zinter(params, bfoo, bbar));
+    AssertUtil.assertByteArrayListEquals(singletonList(ba), jedis.zinter(params, bfoo, bbar));
 
-    assertEquals(Collections.singleton(new Tuple(ba, new Double(7))),
+    assertEquals(singletonList(new Tuple(ba, new Double(7))),
       jedis.zinterWithScores(bparams, bfoo, bbar));
   }
 
@@ -1365,7 +1364,7 @@ public void zinterstore() {
     jedis.zadd("foo", 2, "b");
     jedis.zadd("bar", 2, "a");
 
-    assertEquals(1, jedis.zinterstore("dst", "foo", "bar"));
+    assertEquals(1, jedis.zinterStore("dst", "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(3)));
@@ -1377,7 +1376,7 @@ public void zinterstore() {
     jedis.zadd(bfoo, 2, bb);
     jedis.zadd(bbar, 2, ba);
 
-    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(3)));
@@ -1395,7 +1394,7 @@ public void zintertoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterstore("dst", params, "foo", "bar"));
+    assertEquals(1, jedis.zinterStore("dst", params, "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(7)));
@@ -1411,7 +1410,7 @@ public void zintertoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(7)));
@@ -1426,8 +1425,8 @@ public void zintercard() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 1, "b");
 
-    assertEquals(2, jedis.zintercard("foo", "bar"));
-    assertEquals(1, jedis.zintercard(1, "foo", "bar"));
+    assertEquals(2, jedis.zinterCard("foo", "bar"));
+    assertEquals(1, jedis.zinterCard(1, "foo", "bar"));
 
     // Binary
     jedis.zadd(bfoo, 1, ba);
@@ -1435,8 +1434,8 @@ public void zintercard() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zintercard(bfoo, bbar));
-    assertEquals(1, jedis.zintercard(1, bfoo, bbar));
+    assertEquals(2, jedis.zinterCard(bfoo, bbar));
+    assertEquals(1, jedis.zinterCard(1, bfoo, bbar));
   }
 
   @Test
@@ -1572,8 +1571,8 @@ public void zdiff() {
     jedis.zadd("bar", 1.0, "a");
 
     assertEquals(0, jedis.zdiff("bar1", "bar2").size());
-    assertEquals(Collections.singleton("b"), jedis.zdiff("foo", "bar"));
-    assertEquals(Collections.singleton(new Tuple("b", 2.0d)), jedis.zdiffWithScores("foo", "bar"));
+    assertEquals(singletonList("b"), jedis.zdiff("foo", "bar"));
+    assertEquals(singletonList(new Tuple("b", 2.0d)), jedis.zdiffWithScores("foo", "bar"));
 
     // binary
 
@@ -1582,10 +1581,10 @@ public void zdiff() {
     jedis.zadd(bbar, 1.0, ba);
 
     assertEquals(0, jedis.zdiff(bbar1, bbar2).size());
-    Set<byte[]> bactual = jedis.zdiff(bfoo, bbar);
+    List<byte[]> bactual = jedis.zdiff(bfoo, bbar);
     assertEquals(1, bactual.size());
     assertArrayEquals(bb, bactual.iterator().next());
-    assertEquals(Collections.singleton(new Tuple(bb, 2.0d)), jedis.zdiffWithScores(bfoo, bbar));
+    assertEquals(singletonList(new Tuple(bb, 2.0d)), jedis.zdiffWithScores(bfoo, bbar));
   }
 
   @Test
@@ -1596,7 +1595,7 @@ public void zdiffStore() {
 
     assertEquals(0, jedis.zdiffStore("bar3", "bar1", "bar2"));
     assertEquals(1, jedis.zdiffStore("bar3", "foo", "bar"));
-    assertEquals(Collections.singletonList("b"), jedis.zrange("bar3", 0, -1));
+    assertEquals(singletonList("b"), jedis.zrange("bar3", 0, -1));
 
     // binary
 
diff --git a/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java
index eed0801a86..66472c856a 100644
--- a/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java
+++ b/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java
@@ -333,7 +333,7 @@ public void sinterstore() {
     Set<String> expected = new HashSet<String>();
     expected.add("b");
 
-    long status = jedis.sinterstore("car", "foo", "bar");
+    long status = jedis.sinterStore("car", "foo", "bar");
     assertEquals(1, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -348,7 +348,7 @@ public void sinterstore() {
     Set<byte[]> bexpected = new HashSet<byte[]>();
     bexpected.add(bb);
 
-    long bstatus = jedis.sinterstore(bcar, bfoo, bbar);
+    long bstatus = jedis.sinterStore(bcar, bfoo, bbar);
     assertEquals(1, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -364,9 +364,9 @@ public void sintercard() {
     jedis.sadd("bar", "b");
     jedis.sadd("bar", "c");
 
-    long card = jedis.sintercard("foo", "bar");
+    long card = jedis.sinterCard("foo", "bar");
     assertEquals(2, card);
-    long limitedCard = jedis.sintercard(1, "foo", "bar");
+    long limitedCard = jedis.sinterCard(1, "foo", "bar");
     assertEquals(1, limitedCard);
 
     // Binary
@@ -377,9 +377,9 @@ public void sintercard() {
     jedis.sadd(bbar, bb);
     jedis.sadd(bbar, bc);
 
-    long bcard = jedis.sintercard(bfoo, bbar);
+    long bcard = jedis.sinterCard(bfoo, bbar);
     assertEquals(2, bcard);
-    long blimitedCard = jedis.sintercard(1, bfoo, bbar);
+    long blimitedCard = jedis.sinterCard(1, bfoo, bbar);
     assertEquals(1, blimitedCard);
   }
 
@@ -429,7 +429,7 @@ public void sunionstore() {
     expected.add("b");
     expected.add("c");
 
-    long status = jedis.sunionstore("car", "foo", "bar");
+    long status = jedis.sunionStore("car", "foo", "bar");
     assertEquals(3, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -446,7 +446,7 @@ public void sunionstore() {
     bexpected.add(bc);
     bexpected.add(ba);
 
-    long bstatus = jedis.sunionstore(bcar, bfoo, bbar);
+    long bstatus = jedis.sunionStore(bcar, bfoo, bbar);
     assertEquals(3, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -508,7 +508,7 @@ public void sdiffstore() {
     expected.add("x");
     expected.add("b");
 
-    long status = jedis.sdiffstore("tar", "foo", "bar", "car");
+    long status = jedis.sdiffStore("tar", "foo", "bar", "car");
     assertEquals(2, status);
     assertEquals(expected, jedis.smembers("tar"));
 
@@ -527,7 +527,7 @@ public void sdiffstore() {
     bexpected.add(bx);
     bexpected.add(bb);
 
-    long bstatus = jedis.sdiffstore("tar".getBytes(), bfoo, bbar, bcar);
+    long bstatus = jedis.sdiffStore("tar".getBytes(), bfoo, bbar, bcar);
     assertEquals(2, bstatus);
     assertByteArraySetEquals(bexpected, jedis.smembers("tar".getBytes()));
 
diff --git a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
index cf8ccba181..b586018414 100644
--- a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
+++ b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
@@ -1,5 +1,6 @@
 package redis.clients.jedis.commands.unified;
 
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.*;
 import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START;
 import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY;
@@ -10,10 +11,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.junit.Test;
 
@@ -326,7 +325,7 @@ public void zrangestore() {
     jedis.zadd("foo", 2, "c");
     jedis.zadd("foo", 3, "bb");
 
-    long stored = jedis.zrangestore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
+    long stored = jedis.zrangeStore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
     assertEquals(2, stored);
 
     List<String> range = jedis.zrange("bar", 0, -1);
@@ -341,7 +340,7 @@ public void zrangestore() {
     jedis.zadd(bfoo, 0.1d, bc);
     jedis.zadd(bfoo, 2d, ba);
 
-    long bstored = jedis.zrangestore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
+    long bstored = jedis.zrangeStore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
     assertEquals(2, bstored);
 
     List<byte[]> brange = jedis.zrevrange(bbar, 0, 1);
@@ -1234,12 +1233,12 @@ public void zunion() {
     ZParams params = new ZParams();
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
-    Set<String> expected = new LinkedHashSet<>();
+    List<String> expected = new ArrayList<>();
     expected.add("a");
     expected.add("b");
     assertEquals(expected, jedis.zunion(params, "foo", "bar"));
 
-    Set<Tuple> expectedTuple = new LinkedHashSet<>();
+    List<Tuple> expectedTuple = new ArrayList<>();
     expectedTuple.add(new Tuple("b", new Double(9)));
     expectedTuple.add(new Tuple("a", new Double(7)));
     assertEquals(expectedTuple, jedis.zunionWithScores(params, "foo", "bar"));
@@ -1253,12 +1252,12 @@ public void zunion() {
     ZParams bparams = new ZParams();
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
-    Set<byte[]> bexpected = new LinkedHashSet<>();
+    List<byte[]> bexpected = new ArrayList<>();
     bexpected.add(bb);
     bexpected.add(ba);
-    AssertUtil.assertByteArraySetEquals(bexpected, jedis.zunion(params, bfoo, bbar));
+    AssertUtil.assertByteArrayListEquals(bexpected, jedis.zunion(params, bfoo, bbar));
 
-    Set<Tuple> bexpectedTuple = new LinkedHashSet<>();
+    List<Tuple> bexpectedTuple = new ArrayList<>();
     bexpectedTuple.add(new Tuple(bb, new Double(9)));
     bexpectedTuple.add(new Tuple(ba, new Double(7)));
     assertEquals(bexpectedTuple, jedis.zunionWithScores(bparams, bfoo, bbar));
@@ -1271,7 +1270,7 @@ public void zunionstore() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 2, "b");
 
-    assertEquals(2, jedis.zunionstore("dst", "foo", "bar"));
+    assertEquals(2, jedis.zunionStore("dst", "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(3)));
@@ -1284,7 +1283,7 @@ public void zunionstore() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(3)));
@@ -1303,7 +1302,7 @@ public void zunionstoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionstore("dst", params, "foo", "bar"));
+    assertEquals(2, jedis.zunionStore("dst", params, "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(7)));
@@ -1320,7 +1319,7 @@ public void zunionstoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(7)));
@@ -1337,9 +1336,9 @@ public void zinter() {
     ZParams params = new ZParams();
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
-    assertEquals(Collections.singleton("a"), jedis.zinter(params, "foo", "bar"));
+    assertEquals(singletonList("a"), jedis.zinter(params, "foo", "bar"));
 
-    assertEquals(Collections.singleton(new Tuple("a", new Double(7))),
+    assertEquals(singletonList(new Tuple("a", new Double(7))),
       jedis.zinterWithScores(params, "foo", "bar"));
 
     // Binary
@@ -1350,9 +1349,9 @@ public void zinter() {
     ZParams bparams = new ZParams();
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
-    AssertUtil.assertByteArraySetEquals(Collections.singleton(ba), jedis.zinter(params, bfoo, bbar));
+    AssertUtil.assertByteArrayListEquals(singletonList(ba), jedis.zinter(params, bfoo, bbar));
 
-    assertEquals(Collections.singleton(new Tuple(ba, new Double(7))),
+    assertEquals(singletonList(new Tuple(ba, new Double(7))),
       jedis.zinterWithScores(bparams, bfoo, bbar));
   }
 
@@ -1362,9 +1361,9 @@ public void zinterstore() {
     jedis.zadd("foo", 2, "b");
     jedis.zadd("bar", 2, "a");
 
-    assertEquals(1, jedis.zinterstore("dst", "foo", "bar"));
+    assertEquals(1, jedis.zinterStore("dst", "foo", "bar"));
 
-    assertEquals(Collections.singletonList(new Tuple("a", new Double(3))),
+    assertEquals(singletonList(new Tuple("a", new Double(3))),
         jedis.zrangeWithScores("dst", 0, 100));
 
     // Binary
@@ -1372,9 +1371,9 @@ public void zinterstore() {
     jedis.zadd(bfoo, 2, bb);
     jedis.zadd(bbar, 2, ba);
 
-    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bfoo, bbar));
 
-    assertEquals(Collections.singletonList(new Tuple(ba, new Double(3))),
+    assertEquals(singletonList(new Tuple(ba, new Double(3))),
         jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100));
   }
 
@@ -1388,9 +1387,9 @@ public void zintertoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterstore("dst", params, "foo", "bar"));
+    assertEquals(1, jedis.zinterStore("dst", params, "foo", "bar"));
 
-    assertEquals(Collections.singletonList(new Tuple("a", new Double(7))),
+    assertEquals(singletonList(new Tuple("a", new Double(7))),
         jedis.zrangeWithScores("dst", 0, 100));
 
     // Binary
@@ -1402,9 +1401,9 @@ public void zintertoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
-    assertEquals(Collections.singletonList(new Tuple(ba, new Double(7))),
+    assertEquals(singletonList(new Tuple(ba, new Double(7))),
         jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100));
   }
 
@@ -1415,8 +1414,8 @@ public void zintercard() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 1, "b");
 
-    assertEquals(2, jedis.zintercard("foo", "bar"));
-    assertEquals(1, jedis.zintercard(1, "foo", "bar"));
+    assertEquals(2, jedis.zinterCard("foo", "bar"));
+    assertEquals(1, jedis.zinterCard(1, "foo", "bar"));
 
     // Binary
     jedis.zadd(bfoo, 1, ba);
@@ -1424,8 +1423,8 @@ public void zintercard() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zintercard(bfoo, bbar));
-    assertEquals(1, jedis.zintercard(1, bfoo, bbar));
+    assertEquals(2, jedis.zinterCard(bfoo, bbar));
+    assertEquals(1, jedis.zinterCard(1, bfoo, bbar));
   }
 
   @Test
@@ -1561,8 +1560,8 @@ public void zdiff() {
     jedis.zadd("bar", 1.0, "a");
 
     assertEquals(0, jedis.zdiff("bar1", "bar2").size());
-    assertEquals(Collections.singleton("b"), jedis.zdiff("foo", "bar"));
-    assertEquals(Collections.singleton(new Tuple("b", 2.0d)), jedis.zdiffWithScores("foo", "bar"));
+    assertEquals(singletonList("b"), jedis.zdiff("foo", "bar"));
+    assertEquals(singletonList(new Tuple("b", 2.0d)), jedis.zdiffWithScores("foo", "bar"));
 
     // binary
 
@@ -1571,10 +1570,10 @@ public void zdiff() {
     jedis.zadd(bbar, 1.0, ba);
 
     assertEquals(0, jedis.zdiff(bbar1, bbar2).size());
-    Set<byte[]> bactual = jedis.zdiff(bfoo, bbar);
+    List<byte[]> bactual = jedis.zdiff(bfoo, bbar);
     assertEquals(1, bactual.size());
     assertArrayEquals(bb, bactual.iterator().next());
-    assertEquals(Collections.singleton(new Tuple(bb, 2.0d)), jedis.zdiffWithScores(bfoo, bbar));
+    assertEquals(singletonList(new Tuple(bb, 2.0d)), jedis.zdiffWithScores(bfoo, bbar));
   }
 
   @Test
@@ -1585,7 +1584,7 @@ public void zdiffStore() {
 
     assertEquals(0, jedis.zdiffStore("bar3", "bar1", "bar2"));
     assertEquals(1, jedis.zdiffStore("bar3", "foo", "bar"));
-    assertEquals(Collections.singletonList("b"), jedis.zrange("bar3", 0, -1));
+    assertEquals(singletonList("b"), jedis.zrange("bar3", 0, -1));
 
     // binary
 

From e95e246966b31864e4db2cd46e688c31843d6360 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Mon, 22 May 2023 17:24:24 +0600
Subject: [PATCH 2/7] fix javadoc

---
 src/main/java/redis/clients/jedis/Jedis.java | 40 ++++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 701d3cd933..a3f6ccb7e0 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -3077,9 +3077,9 @@ public List<Tuple> zunionWithScores(final ZParams params, final byte[]... keys)
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][])} ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][])} ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(byte[], byte[][])} command inserts all elements across all inputs.
+   * {@link Jedis#zunionStore(byte[], byte[][])} command inserts all elements across all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
    * that the score of each element in the sorted set is first multiplied by this weight before
@@ -3108,9 +3108,9 @@ public long zunionStore(final byte[] dstkey, final byte[]... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][]) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][]) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionStore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -3167,9 +3167,9 @@ public List<Tuple> zinterWithScores(final ZParams params, final byte[]... keys)
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][]) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][]) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
+   * {@link Jedis#zunionStore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
    * inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -3199,9 +3199,9 @@ public long zinterStore(final byte[] dstkey, final byte[]... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][]) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][]) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
+   * {@link Jedis#zunionStore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
    * inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7449,7 +7449,7 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
    * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
@@ -7468,8 +7468,8 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
    * sorted sets, and M being the number of elements in the resulting sorted set
    * @see Jedis#zunionStore(String, String[])
    * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterstore(String, String...)
-   * @see Jedis#zinterstore(String, ZParams, String...)
+   * @see Jedis#zinterStore(String, String...)
+   * @see Jedis#zinterStore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @return The number of elements in the sorted set at dstkey
@@ -7485,7 +7485,7 @@ public long zunionStore(final String dstkey, final String... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
    * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
@@ -7504,8 +7504,8 @@ public long zunionStore(final String dstkey, final String... sets) {
    * sorted sets, and M being the number of elements in the resulting sorted set
    * @see Jedis#zunionStore(String, String[])
    * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterstore(String, String...)
-   * @see Jedis#zinterstore(String, ZParams, String...)
+   * @see Jedis#zinterStore(String, String...)
+   * @see Jedis#zinterStore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @param params
@@ -7560,7 +7560,7 @@ public long zinterCard(long limit, String... keys) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
    * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
@@ -7579,8 +7579,8 @@ public long zinterCard(long limit, String... keys) {
    * sorted sets, and M being the number of elements in the resulting sorted set
    * @see Jedis#zunionStore(String, String[])
    * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterstore(String, String...)
-   * @see Jedis#zinterstore(String, ZParams, String...)
+   * @see Jedis#zinterStore(String, String...)
+   * @see Jedis#zinterStore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @return The number of elements in the sorted set at dstkey
@@ -7596,7 +7596,7 @@ public long zinterStore(final String dstkey, final String... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
    * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
@@ -7615,8 +7615,8 @@ public long zinterStore(final String dstkey, final String... sets) {
    * sorted sets, and M being the number of elements in the resulting sorted set
    * @see Jedis#zunionStore(String, String[])
    * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterstore(String, String...)
-   * @see Jedis#zinterstore(String, ZParams, String...)
+   * @see Jedis#zinterStore(String, String...)
+   * @see Jedis#zinterStore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @param params

From 68d8bbe6f6df5d305b9fadd359a60d1f4ef08ce6 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Mon, 22 May 2023 17:36:27 +0600
Subject: [PATCH 3/7] fix zunion test

---
 .../jedis/commands/jedis/SortedSetCommandsTest.java  | 12 +++++-------
 .../commands/unified/SortedSetCommandsTestBase.java  | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
index 29ed36bec1..e18e06ff1e 100644
--- a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
@@ -1232,14 +1232,15 @@ public void zunion() {
     ZParams params = new ZParams();
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
+
     List<String> expected = new ArrayList<>();
     expected.add("a");
     expected.add("b");
     assertEquals(expected, jedis.zunion(params, "foo", "bar"));
 
     List<Tuple> expectedTuple = new ArrayList<>();
-    expectedTuple.add(new Tuple("b", new Double(9)));
     expectedTuple.add(new Tuple("a", new Double(7)));
+    expectedTuple.add(new Tuple("b", new Double(9)));
     assertEquals(expectedTuple, jedis.zunionWithScores(params, "foo", "bar"));
 
     // Binary
@@ -1248,18 +1249,15 @@ public void zunion() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    ZParams bparams = new ZParams();
-    bparams.weights(2, 2.5);
-    bparams.aggregate(ZParams.Aggregate.SUM);
     List<byte[]> bexpected = new ArrayList<>();
-    bexpected.add(bb);
     bexpected.add(ba);
+    bexpected.add(bb);
     AssertUtil.assertByteArrayListEquals(bexpected, jedis.zunion(params, bfoo, bbar));
 
     List<Tuple> bexpectedTuple = new ArrayList<>();
-    bexpectedTuple.add(new Tuple(bb, new Double(9)));
     bexpectedTuple.add(new Tuple(ba, new Double(7)));
-    assertEquals(bexpectedTuple, jedis.zunionWithScores(bparams, bfoo, bbar));
+    bexpectedTuple.add(new Tuple(bb, new Double(9)));
+    assertEquals(bexpectedTuple, jedis.zunionWithScores(params, bfoo, bbar));
   }
 
   @Test
diff --git a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
index b586018414..678646fea8 100644
--- a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
+++ b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
@@ -1233,14 +1233,15 @@ public void zunion() {
     ZParams params = new ZParams();
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
+
     List<String> expected = new ArrayList<>();
     expected.add("a");
     expected.add("b");
     assertEquals(expected, jedis.zunion(params, "foo", "bar"));
 
     List<Tuple> expectedTuple = new ArrayList<>();
-    expectedTuple.add(new Tuple("b", new Double(9)));
     expectedTuple.add(new Tuple("a", new Double(7)));
+    expectedTuple.add(new Tuple("b", new Double(9)));
     assertEquals(expectedTuple, jedis.zunionWithScores(params, "foo", "bar"));
 
     // Binary
@@ -1249,18 +1250,15 @@ public void zunion() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    ZParams bparams = new ZParams();
-    bparams.weights(2, 2.5);
-    bparams.aggregate(ZParams.Aggregate.SUM);
     List<byte[]> bexpected = new ArrayList<>();
-    bexpected.add(bb);
     bexpected.add(ba);
+    bexpected.add(bb);
     AssertUtil.assertByteArrayListEquals(bexpected, jedis.zunion(params, bfoo, bbar));
 
     List<Tuple> bexpectedTuple = new ArrayList<>();
-    bexpectedTuple.add(new Tuple(bb, new Double(9)));
     bexpectedTuple.add(new Tuple(ba, new Double(7)));
-    assertEquals(bexpectedTuple, jedis.zunionWithScores(bparams, bfoo, bbar));
+    bexpectedTuple.add(new Tuple(bb, new Double(9)));
+    assertEquals(bexpectedTuple, jedis.zunionWithScores(params, bfoo, bbar));
   }
 
   @Test

From 3c921d72a9f5d2cf55c94c5de813e920672fa3a1 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Mon, 22 May 2023 18:37:33 +0600
Subject: [PATCH 4/7] breaking change list

---
 docs/jedis5-breaking.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/jedis5-breaking.md b/docs/jedis5-breaking.md
index 01e2e2c882..7e4d3909c6 100644
--- a/docs/jedis5-breaking.md
+++ b/docs/jedis5-breaking.md
@@ -2,12 +2,34 @@
 
 - `StreamConsumersInfo` has been renamed to `StreamConsumerInfo`.
 
+- Following methods have been renamed:
+  - from `sdiffstore` to `sdiffStore`
+  - from `sinterstore` to `sinterStore`
+  - from `sintercard` to `sinterCard`
+  - from `sunionstore` to `sunionStore`
+  - from `zrangestore` to `zrangeStore`
+  - from `zinterstore` to `zinterStore`
+  - from `zintercard` to `zinterCard`
+  - from `zunionstore` to `zunionStore`
+
 - `bzpopmax(double timeout, byte[]... keys)` now returns `List<Object>` (instead of `List<byte[]>`).
   - This is a three element list where the last element is a `Double`.
 
 - `bzpopmin(double timeout, byte[]... keys)` now returns `List<Object>` (instead of `List<byte[]>`).
   - This is a three element list where the last element is a `Double`.
 
+- `zdiff(String... keys)` method now returns `List<String>` (instead of `Set<String>`).
+- `zdiff(byte[]... keys)` method now returns `List<byte[]>` (instead of `Set<byte[]>`).
+- Both `zdiffWithScores(String... keys)` and `zdiffWithScores(byte[]... keys)` methods now return `List<Tuple>` (instead of `Set<Tuple>`).
+
+- `zinter(ZParams params, String... keys)` method now returns `List<String>` (instead of `Set<String>`).
+- `zinter(ZParams params, byte[]... keys)` method now returns `List<byte[]>` (instead of `Set<byte[]>`).
+- Both `zinterWithScores(ZParams params, String... keys)` and `zinterWithScores(ZParams params, byte[]... keys)` methods now return `List<Tuple>` (instead of `Set<Tuple>`).
+
+- `zunion(ZParams params, String... keys)` method now returns `List<String>` (instead of `Set<String>`).
+- `zunion(ZParams params, byte[]... keys)` method now returns `List<byte[]>` (instead of `Set<byte[]>`).
+- Both `zunionWithScores(ZParams params, String... keys)` and `zunionWithScores(ZParams params, byte[]... keys)` methods now return `List<Tuple>` (instead of `Set<Tuple>`).
+
 - `getAgeSeconds()` in `AccessControlLogEntry` now returns `Double` instead of `String`.
 
 - `graphSlowlog(String graphName)` now returns `List<List<Object>>` (instead of `List<List<String>>`).
@@ -23,6 +45,7 @@
   - `BYTE_ARRAY` (use `BINARY`)
   - `BYTE_ARRAY_LIST` (use `BINARY_LIST`)
   - `BINARY_MAP_FROM_PAIRS`
+  - `STRING_ORDERED_SET`
 
 <!--- Deprecated in Jedis 4 --->
 

From 0fcce6884cfcb02093aed01d4206db9bd1ef2dae Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Sun, 28 May 2023 22:32:31 +0600
Subject: [PATCH 5/7] Undo method renames

---
 docs/jedis5-breaking.md                       |  10 --
 .../redis/clients/jedis/CommandObjects.java   |  48 +++---
 src/main/java/redis/clients/jedis/Jedis.java  | 160 +++++++++---------
 .../clients/jedis/MultiNodePipelineBase.java  |  96 +++++------
 .../java/redis/clients/jedis/Pipeline.java    |  96 +++++------
 .../redis/clients/jedis/TransactionBase.java  |  96 +++++------
 .../redis/clients/jedis/UnifiedJedis.java     |  96 +++++------
 .../jedis/commands/SetBinaryCommands.java     |  10 +-
 .../clients/jedis/commands/SetCommands.java   |  10 +-
 .../commands/SetPipelineBinaryCommands.java   |  10 +-
 .../jedis/commands/SetPipelineCommands.java   |   6 +-
 .../commands/SortedSetBinaryCommands.java     |  14 +-
 .../jedis/commands/SortedSetCommands.java     |  14 +-
 .../SortedSetPipelineBinaryCommands.java      |  14 +-
 .../commands/SortedSetPipelineCommands.java   |  14 +-
 .../clients/jedis/ClusterPipeliningTest.java  |   6 +-
 .../jedis/commands/jedis/SetCommandsTest.java |  20 +--
 .../commands/jedis/SortedSetCommandsTest.java |  28 +--
 .../commands/unified/SetCommandsTestBase.java |  20 +--
 .../unified/SortedSetCommandsTestBase.java    |  28 +--
 20 files changed, 393 insertions(+), 403 deletions(-)

diff --git a/docs/jedis5-breaking.md b/docs/jedis5-breaking.md
index 7e4d3909c6..6aeaf798e9 100644
--- a/docs/jedis5-breaking.md
+++ b/docs/jedis5-breaking.md
@@ -2,16 +2,6 @@
 
 - `StreamConsumersInfo` has been renamed to `StreamConsumerInfo`.
 
-- Following methods have been renamed:
-  - from `sdiffstore` to `sdiffStore`
-  - from `sinterstore` to `sinterStore`
-  - from `sintercard` to `sinterCard`
-  - from `sunionstore` to `sunionStore`
-  - from `zrangestore` to `zrangeStore`
-  - from `zinterstore` to `zinterStore`
-  - from `zintercard` to `zinterCard`
-  - from `zunionstore` to `zunionStore`
-
 - `bzpopmax(double timeout, byte[]... keys)` now returns `List<Object>` (instead of `List<byte[]>`).
   - This is a three element list where the last element is a `Double`.
 
diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
index 5b9f2d1bad..436cbf50db 100644
--- a/src/main/java/redis/clients/jedis/CommandObjects.java
+++ b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -1222,7 +1222,7 @@ public final CommandObject<Set<String>> sdiff(String... keys) {
     return new CommandObject<>(commandArguments(SDIFF).keys((Object[]) keys), BuilderFactory.STRING_SET);
   }
 
-  public final CommandObject<Long> sdiffStore(String dstkey, String... keys) {
+  public final CommandObject<Long> sdiffstore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(SDIFFSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1230,7 +1230,7 @@ public final CommandObject<Set<byte[]>> sdiff(byte[]... keys) {
     return new CommandObject<>(commandArguments(SDIFF).keys((Object[]) keys), BuilderFactory.BINARY_SET);
   }
 
-  public final CommandObject<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
+  public final CommandObject<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
     return new CommandObject<>(commandArguments(SDIFFSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1238,15 +1238,15 @@ public final CommandObject<Set<String>> sinter(String... keys) {
     return new CommandObject<>(commandArguments(SINTER).keys((Object[]) keys), BuilderFactory.STRING_SET);
   }
 
-  public final CommandObject<Long> sinterStore(String dstkey, String... keys) {
+  public final CommandObject<Long> sinterstore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(SINTERSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sinterCard(String... keys) {
+  public final CommandObject<Long> sintercard(String... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sinterCard(int limit, String... keys) {
+  public final CommandObject<Long> sintercard(int limit, String... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys).add(LIMIT).add(limit),BuilderFactory.LONG);
   }
 
@@ -1254,15 +1254,15 @@ public final CommandObject<Set<byte[]>> sinter(byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTER).keys((Object[]) keys), BuilderFactory.BINARY_SET);
   }
 
-  public final CommandObject<Long> sinterStore(byte[] dstkey, byte[]... keys) {
+  public final CommandObject<Long> sinterstore(byte[] dstkey, byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTERSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sinterCard(byte[]... keys) {
+  public final CommandObject<Long> sintercard(byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> sinterCard(int limit, byte[]... keys) {
+  public final CommandObject<Long> sintercard(int limit, byte[]... keys) {
     return new CommandObject<>(commandArguments(SINTERCARD).add(keys.length).keys((Object[]) keys).add(LIMIT).add(limit),BuilderFactory.LONG);
   }
 
@@ -1270,7 +1270,7 @@ public final CommandObject<Set<String>> sunion(String... keys) {
     return new CommandObject<>(commandArguments(SUNION).keys((Object[]) keys), BuilderFactory.STRING_SET);
   }
 
-  public final CommandObject<Long> sunionStore(String dstkey, String... keys) {
+  public final CommandObject<Long> sunionstore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(SUNIONSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1278,7 +1278,7 @@ public final CommandObject<Set<byte[]>> sunion(byte[]... keys) {
     return new CommandObject<>(commandArguments(SUNION).keys((Object[]) keys), BuilderFactory.BINARY_SET);
   }
 
-  public final CommandObject<Long> sunionStore(byte[] dstkey, byte[]... keys) {
+  public final CommandObject<Long> sunionstore(byte[] dstkey, byte[]... keys) {
     return new CommandObject<>(commandArguments(SUNIONSTORE).key(dstkey).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
@@ -1534,7 +1534,7 @@ public final CommandObject<List<Tuple>> zrangeWithScores(String key, ZRangeParam
     return new CommandObject<>(commandArguments(ZRANGE).key(key).addParams(zRangeParams).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
+  public final CommandObject<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
     return new CommandObject<>(commandArguments(ZRANGESTORE).key(dest).add(src).addParams(zRangeParams), BuilderFactory.LONG);
   }
 
@@ -1640,7 +1640,7 @@ public final CommandObject<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParam
     return new CommandObject<>(commandArguments(ZRANGE).key(key).addParams(zRangeParams).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+  public final CommandObject<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
     return new CommandObject<>(commandArguments(ZRANGESTORE).key(dest).add(src).addParams(zRangeParams), BuilderFactory.LONG);
   }
 
@@ -1843,42 +1843,42 @@ public final CommandObject<List<Tuple>> zinterWithScores(ZParams params, String.
         .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zinterStore(String dstkey, String... keys) {
+  public final CommandObject<Long> zinterstore(String dstkey, String... keys) {
     return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
         .add(keys.length).keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterStore(String dstkey, ZParams params, String... keys) {
+  public final CommandObject<Long> zinterstore(String dstkey, ZParams params, String... keys) {
     return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
         .add(keys.length).keys((Object[]) keys).addParams(params), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterCard(String... keys) {
+  public final CommandObject<Long> zintercard(String... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterCard(long limit, String... keys) {
+  public final CommandObject<Long> zintercard(long limit, String... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys).add(LIMIT).add(limit), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterStore(byte[] dstkey, byte[]... sets) {
+  public final CommandObject<Long> zinterstore(byte[] dstkey, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
+  public final CommandObject<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZINTERSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterCard(byte[]... keys) {
+  public final CommandObject<Long> zintercard(byte[]... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zinterCard(long limit, byte[]... keys) {
+  public final CommandObject<Long> zintercard(long limit, byte[]... keys) {
     return new CommandObject<>(commandArguments(ZINTERCARD).add(keys.length)
         .keys((Object[]) keys).add(LIMIT).add(limit), BuilderFactory.LONG);
   }
@@ -1893,12 +1893,12 @@ public final CommandObject<List<Tuple>> zinterWithScores(ZParams params, byte[].
         .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zunionStore(String dstkey, String... sets) {
+  public final CommandObject<Long> zunionstore(String dstkey, String... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zunionStore(String dstkey, ZParams params, String... sets) {
+  public final CommandObject<Long> zunionstore(String dstkey, ZParams params, String... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
   }
@@ -1913,12 +1913,12 @@ public final CommandObject<List<Tuple>> zunionWithScores(ZParams params, String.
         .addParams(params).add(WITHSCORES), getTupleListBuilder());
   }
 
-  public final CommandObject<Long> zunionStore(byte[] dstkey, byte[]... sets) {
+  public final CommandObject<Long> zunionstore(byte[] dstkey, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
+  public final CommandObject<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
     return new CommandObject<>(commandArguments(ZUNIONSTORE).key(dstkey)
         .add(sets.length).keys((Object[]) sets).addParams(params), BuilderFactory.LONG);
   }
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index a3f6ccb7e0..514084f2cf 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -1859,9 +1859,9 @@ public Set<byte[]> sinter(final byte[]... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sinterStore(final byte[] dstkey, final byte[]... keys) {
+  public long sinterstore(final byte[] dstkey, final byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterStore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   /**
@@ -1873,9 +1873,9 @@ public long sinterStore(final byte[] dstkey, final byte[]... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sinterCard(byte[]... keys) {
+  public long sintercard(byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterCard(keys));
+    return connection.executeCommand(commandObjects.sintercard(keys));
   }
 
   /**
@@ -1889,9 +1889,9 @@ public long sinterCard(byte[]... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sinterCard(int limit, byte[]... keys) {
+  public long sintercard(int limit, byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterCard(limit, keys));
+    return connection.executeCommand(commandObjects.sintercard(limit, keys));
   }
 
   /**
@@ -1924,9 +1924,9 @@ public Set<byte[]> sunion(final byte[]... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sunionStore(final byte[] dstkey, final byte[]... keys) {
+  public long sunionstore(final byte[] dstkey, final byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sunionStore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   /**
@@ -1963,9 +1963,9 @@ public Set<byte[]> sdiff(final byte[]... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sdiffStore(final byte[] dstkey, final byte[]... keys) {
+  public long sdiffstore(final byte[] dstkey, final byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sdiffStore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   /**
@@ -2189,9 +2189,9 @@ public List<Tuple> zrangeWithScores(byte[] key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+  public long zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+    return connection.executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -3077,9 +3077,9 @@ public List<Tuple> zunionWithScores(final ZParams params, final byte[]... keys)
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][])} ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][])} ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(byte[], byte[][])} command inserts all elements across all inputs.
+   * {@link Jedis#zunionstore(byte[], byte[][])} command inserts all elements across all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
    * that the score of each element in the sorted set is first multiplied by this weight before
@@ -3098,9 +3098,9 @@ public List<Tuple> zunionWithScores(final ZParams params, final byte[]... keys)
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionStore(final byte[] dstkey, final byte[]... sets) {
+  public long zunionstore(final byte[] dstkey, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionStore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   /**
@@ -3108,9 +3108,9 @@ public long zunionStore(final byte[] dstkey, final byte[]... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][]) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][]) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -3131,9 +3131,9 @@ public long zunionStore(final byte[] dstkey, final byte[]... sets) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionStore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
+  public long zunionstore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionStore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   /**
@@ -3167,9 +3167,9 @@ public List<Tuple> zinterWithScores(final ZParams params, final byte[]... keys)
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][]) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][]) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
+   * {@link Jedis#zunionstore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
    * inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -3189,9 +3189,9 @@ public List<Tuple> zinterWithScores(final ZParams params, final byte[]... keys)
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterStore(final byte[] dstkey, final byte[]... sets) {
+  public long zinterstore(final byte[] dstkey, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterStore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   /**
@@ -3199,9 +3199,9 @@ public long zinterStore(final byte[] dstkey, final byte[]... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(byte[], byte[][]) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(byte[], byte[][]) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
+   * {@link Jedis#zunionstore(byte[], byte[][]) ZUNIONSTORE} command inserts all elements across all
    * inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -3222,21 +3222,21 @@ public long zinterStore(final byte[] dstkey, final byte[]... sets) {
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterStore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
+  public long zinterstore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterStore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
-  public long zinterCard(byte[]... keys) {
+  public long zintercard(byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterCard(keys));
+    return connection.executeCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public long zinterCard(long limit, byte[]... keys) {
+  public long zintercard(long limit, byte[]... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterCard(limit, keys));
+    return connection.executeCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -6242,9 +6242,9 @@ public Set<String> sinter(final String... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sinterStore(final String dstkey, final String... keys) {
+  public long sinterstore(final String dstkey, final String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterStore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   /**
@@ -6256,9 +6256,9 @@ public long sinterStore(final String dstkey, final String... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sinterCard(String... keys) {
+  public long sintercard(String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterCard(keys));
+    return connection.executeCommand(commandObjects.sintercard(keys));
   }
 
   /**
@@ -6272,9 +6272,9 @@ public long sinterCard(String... keys) {
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
   @Override
-  public long sinterCard(int limit, String... keys) {
+  public long sintercard(int limit, String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sinterCard(limit, keys));
+    return connection.executeCommand(commandObjects.sintercard(limit, keys));
   }
 
   /**
@@ -6307,9 +6307,9 @@ public Set<String> sunion(final String... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sunionStore(final String dstkey, final String... keys) {
+  public long sunionstore(final String dstkey, final String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sunionStore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   /**
@@ -6346,9 +6346,9 @@ public Set<String> sdiff(final String... keys) {
    * @return The number of elements in the resulting set
    */
   @Override
-  public long sdiffStore(final String dstkey, final String... keys) {
+  public long sdiffstore(final String dstkey, final String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.sdiffStore(dstkey, keys));
+    return connection.executeCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   /**
@@ -6602,9 +6602,9 @@ public List<Tuple> zrangeWithScores(String key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
+  public long zrangestore(String dest, String src, ZRangeParams zRangeParams) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+    return connection.executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -7449,9 +7449,9 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7466,18 +7466,18 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionStore(String, String[])
-   * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterStore(String, String...)
-   * @see Jedis#zinterStore(String, ZParams, String...)
+   * @see Jedis#zunionstore(String, String[])
+   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zinterstore(String, String...)
+   * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionStore(final String dstkey, final String... sets) {
+  public long zunionstore(final String dstkey, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionStore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   /**
@@ -7485,9 +7485,9 @@ public long zunionStore(final String dstkey, final String... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7502,19 +7502,19 @@ public long zunionStore(final String dstkey, final String... sets) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionStore(String, String[])
-   * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterStore(String, String...)
-   * @see Jedis#zinterStore(String, ZParams, String...)
+   * @see Jedis#zunionstore(String, String[])
+   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zinterstore(String, String...)
+   * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @param params
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zunionStore(final String dstkey, final ZParams params, final String... sets) {
+  public long zunionstore(final String dstkey, final ZParams params, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zunionStore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   /**
@@ -7544,15 +7544,15 @@ public List<Tuple> zinterWithScores(final ZParams params, final String... keys)
   }
 
   @Override
-  public long zinterCard(String... keys) {
+  public long zintercard(String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterCard(keys));
+    return connection.executeCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public long zinterCard(long limit, String... keys) {
+  public long zintercard(long limit, String... keys) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterCard(limit, keys));
+    return connection.executeCommand(commandObjects.zintercard(limit, keys));
   }
 
   /**
@@ -7560,9 +7560,9 @@ public long zinterCard(long limit, String... keys) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7577,18 +7577,18 @@ public long zinterCard(long limit, String... keys) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionStore(String, String[])
-   * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterStore(String, String...)
-   * @see Jedis#zinterStore(String, ZParams, String...)
+   * @see Jedis#zunionstore(String, String[])
+   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zinterstore(String, String...)
+   * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterStore(final String dstkey, final String... sets) {
+  public long zinterstore(final String dstkey, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterStore(dstkey, sets));
+    return connection.executeCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   /**
@@ -7596,9 +7596,9 @@ public long zinterStore(final String dstkey, final String... sets) {
    * dstkey. It is mandatory to provide the number of input keys N, before passing the input keys
    * and the other (optional) arguments.
    * <p>
-   * As the terms imply, the {@link Jedis#zinterStore(String, String...) ZINTERSTORE} command
+   * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionStore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7613,19 +7613,19 @@ public long zinterStore(final String dstkey, final String... sets) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionStore(String, String[])
-   * @see Jedis#zunionStore(String, ZParams, String[])
-   * @see Jedis#zinterStore(String, String...)
-   * @see Jedis#zinterStore(String, ZParams, String...)
+   * @see Jedis#zunionstore(String, String[])
+   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zinterstore(String, String...)
+   * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
    * @param sets
    * @param params
    * @return The number of elements in the sorted set at dstkey
    */
   @Override
-  public long zinterStore(final String dstkey, final ZParams params, final String... sets) {
+  public long zinterstore(final String dstkey, final ZParams params, final String... sets) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.zinterStore(dstkey, params, sets));
+    return connection.executeCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
index b0c463dd8d..3b9d9eb24a 100644
--- a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
+++ b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
@@ -882,8 +882,8 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sdiffStore(dstKey, keys));
+  public Response<Long> sdiffstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 
   @Override
@@ -892,18 +892,18 @@ public Response<Set<String>> sinter(String... keys) {
   }
 
   @Override
-  public Response<Long> sinterStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sinterStore(dstKey, keys));
+  public Response<Long> sinterstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sinterstore(dstKey, keys));
   }
 
   @Override
-  public Response<Long> sinterCard(String... keys){
-    return appendCommand(commandObjects.sinterCard(keys));
+  public Response<Long> sintercard(String... keys){
+    return appendCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public Response<Long> sinterCard(int limit, String... keys){
-    return appendCommand(commandObjects.sinterCard(limit, keys));
+  public Response<Long> sintercard(int limit, String... keys){
+    return appendCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -912,8 +912,8 @@ public Response<Set<String>> sunion(String... keys) {
   }
 
   @Override
-  public Response<Long> sunionStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sunionStore(dstKey, keys));
+  public Response<Long> sunionstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sunionstore(dstKey, keys));
   }
 
   @Override
@@ -1012,8 +1012,8 @@ public Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -1253,13 +1253,13 @@ public Response<Long> zdiffStore(String dstKey, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterStore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zinterStore(dstKey, sets));
+  public Response<Long> zinterstore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zinterstore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zinterStore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zinterStore(dstKey, params, sets));
+  public Response<Long> zinterstore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zinterstore(dstKey, params, sets));
   }
 
   @Override
@@ -1273,13 +1273,13 @@ public Response<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterCard(String... keys) {
-    return appendCommand(commandObjects.zinterCard(keys));
+  public Response<Long> zintercard(String... keys) {
+    return appendCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public Response<Long> zinterCard(long limit, String... keys) {
-    return appendCommand(commandObjects.zinterCard(limit, keys));
+  public Response<Long> zintercard(long limit, String... keys) {
+    return appendCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -1293,13 +1293,13 @@ public Response<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public Response<Long> zunionStore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zunionStore(dstKey, sets));
+  public Response<Long> zunionstore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zunionstore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zunionStore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zunionStore(dstKey, params, sets));
+  public Response<Long> zunionstore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zunionstore(dstKey, params, sets));
   }
 
   @Override
@@ -2631,8 +2631,8 @@ public Response<Set<byte[]>> sdiff(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sdiffStore(dstkey, keys));
+  public Response<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   @Override
@@ -2641,18 +2641,18 @@ public Response<Set<byte[]>> sinter(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sinterStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sinterStore(dstkey, keys));
+  public Response<Long> sinterstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   @Override
-  public Response<Long> sinterCard(byte[]... keys){
-    return appendCommand(commandObjects.sinterCard(keys));
+  public Response<Long> sintercard(byte[]... keys){
+    return appendCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public Response<Long> sinterCard(int limit, byte[]... keys){
-    return appendCommand(commandObjects.sinterCard(limit, keys));
+  public Response<Long> sintercard(int limit, byte[]... keys){
+    return appendCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -2661,8 +2661,8 @@ public Response<Set<byte[]>> sunion(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sunionStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sunionStore(dstkey, keys));
+  public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   @Override
@@ -2761,8 +2761,8 @@ public Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -3011,23 +3011,23 @@ public Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public Response<Long> zinterStore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zinterStore(dstkey, sets));
+  public Response<Long> zinterstore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zinterStore(dstkey, params, sets));
+  public Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
-  public Response<Long> zinterCard(byte[]... keys) {
-    return appendCommand(commandObjects.zinterCard(keys));
+  public Response<Long> zintercard(byte[]... keys) {
+    return appendCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public Response<Long> zinterCard(long limit, byte[]... keys) {
-    return appendCommand(commandObjects.zinterCard(limit, keys));
+  public Response<Long> zintercard(long limit, byte[]... keys) {
+    return appendCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -3041,13 +3041,13 @@ public Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public Response<Long> zunionStore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zunionStore(dstkey, sets));
+  public Response<Long> zunionstore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zunionStore(dstkey, params, sets));
+  public Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
index 8c733cb245..2331ae52b0 100644
--- a/src/main/java/redis/clients/jedis/Pipeline.java
+++ b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -836,8 +836,8 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sdiffStore(dstKey, keys));
+  public Response<Long> sdiffstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 
   @Override
@@ -846,18 +846,18 @@ public Response<Set<String>> sinter(String... keys) {
   }
 
   @Override
-  public Response<Long> sinterStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sinterStore(dstKey, keys));
+  public Response<Long> sinterstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sinterstore(dstKey, keys));
   }
 
   @Override
-  public Response<Long> sinterCard(String... keys) {
-    return appendCommand(commandObjects.sinterCard(keys));
+  public Response<Long> sintercard(String... keys) {
+    return appendCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public Response<Long> sinterCard(int limit, String... keys) {
-    return appendCommand(commandObjects.sinterCard(limit, keys));
+  public Response<Long> sintercard(int limit, String... keys) {
+    return appendCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -866,8 +866,8 @@ public Response<Set<String>> sunion(String... keys) {
   }
 
   @Override
-  public Response<Long> sunionStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sunionStore(dstKey, keys));
+  public Response<Long> sunionstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sunionstore(dstKey, keys));
   }
 
   @Override
@@ -1107,8 +1107,8 @@ public Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -1207,13 +1207,13 @@ public Response<Long> zdiffStore(String dstKey, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterStore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zinterStore(dstKey, sets));
+  public Response<Long> zinterstore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zinterstore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zinterStore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zinterStore(dstKey, params, sets));
+  public Response<Long> zinterstore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zinterstore(dstKey, params, sets));
   }
 
   @Override
@@ -1226,13 +1226,13 @@ public Response<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
     return appendCommand(commandObjects.zinterWithScores(params, keys));
   }
   @Override
-  public Response<Long> zinterCard(String... keys) {
-    return appendCommand(commandObjects.zinterCard(keys));
+  public Response<Long> zintercard(String... keys) {
+    return appendCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public Response<Long> zinterCard(long limit, String... keys) {
-    return appendCommand(commandObjects.zinterCard(limit, keys));
+  public Response<Long> zintercard(long limit, String... keys) {
+    return appendCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -1246,13 +1246,13 @@ public Response<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public Response<Long> zunionStore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zunionStore(dstKey, sets));
+  public Response<Long> zunionstore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zunionstore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zunionStore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zunionStore(dstKey, params, sets));
+  public Response<Long> zunionstore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zunionstore(dstKey, params, sets));
   }
 
   @Override
@@ -2584,8 +2584,8 @@ public Response<Set<byte[]>> sdiff(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sdiffStore(dstkey, keys));
+  public Response<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   @Override
@@ -2594,18 +2594,18 @@ public Response<Set<byte[]>> sinter(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sinterStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sinterStore(dstkey, keys));
+  public Response<Long> sinterstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   @Override
-  public Response<Long> sinterCard(byte[]... keys) {
-    return appendCommand(commandObjects.sinterCard(keys));
+  public Response<Long> sintercard(byte[]... keys) {
+    return appendCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public Response<Long> sinterCard(int limit, byte[]... keys) {
-    return appendCommand(commandObjects.sinterCard(limit, keys));
+  public Response<Long> sintercard(int limit, byte[]... keys) {
+    return appendCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -2614,8 +2614,8 @@ public Response<Set<byte[]>> sunion(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sunionStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sunionStore(dstkey, keys));
+  public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   @Override
@@ -2894,8 +2894,8 @@ public Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2964,23 +2964,23 @@ public Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public Response<Long> zinterStore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zinterStore(dstkey, sets));
+  public Response<Long> zinterstore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zinterStore(dstkey, params, sets));
+  public Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
-  public Response<Long> zinterCard(byte[]... keys) {
-    return appendCommand(commandObjects.zinterCard(keys));
+  public Response<Long> zintercard(byte[]... keys) {
+    return appendCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public Response<Long> zinterCard(long limit, byte[]... keys) {
-    return appendCommand(commandObjects.zinterCard(limit, keys));
+  public Response<Long> zintercard(long limit, byte[]... keys) {
+    return appendCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -2994,13 +2994,13 @@ public Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public Response<Long> zunionStore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zunionStore(dstkey, sets));
+  public Response<Long> zunionstore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zunionStore(dstkey, params, sets));
+  public Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
index b975960dd2..09b75fd9f4 100644
--- a/src/main/java/redis/clients/jedis/TransactionBase.java
+++ b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -931,8 +931,8 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sdiffStore(dstKey, keys));
+  public Response<Long> sdiffstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 
   @Override
@@ -941,18 +941,18 @@ public Response<Set<String>> sinter(String... keys) {
   }
 
   @Override
-  public Response<Long> sinterStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sinterStore(dstKey, keys));
+  public Response<Long> sinterstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sinterstore(dstKey, keys));
   }
 
   @Override
-  public Response<Long> sinterCard(String... keys) {
-    return appendCommand(commandObjects.sinterCard(keys));
+  public Response<Long> sintercard(String... keys) {
+    return appendCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public Response<Long> sinterCard(int limit, String... keys) {
-    return appendCommand(commandObjects.sinterCard(limit, keys));
+  public Response<Long> sintercard(int limit, String... keys) {
+    return appendCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -961,8 +961,8 @@ public Response<Set<String>> sunion(String... keys) {
   }
 
   @Override
-  public Response<Long> sunionStore(String dstKey, String... keys) {
-    return appendCommand(commandObjects.sunionStore(dstKey, keys));
+  public Response<Long> sunionstore(String dstKey, String... keys) {
+    return appendCommand(commandObjects.sunionstore(dstKey, keys));
   }
 
   @Override
@@ -1061,8 +1061,8 @@ public Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -1302,13 +1302,13 @@ public Response<Long> zdiffStore(String dstKey, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterStore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zinterStore(dstKey, sets));
+  public Response<Long> zinterstore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zinterstore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zinterStore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zinterStore(dstKey, params, sets));
+  public Response<Long> zinterstore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zinterstore(dstKey, params, sets));
   }
 
   @Override
@@ -1322,13 +1322,13 @@ public Response<List<Tuple>> zinterWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public Response<Long> zinterCard(String... keys) {
-    return appendCommand(commandObjects.zinterCard(keys));
+  public Response<Long> zintercard(String... keys) {
+    return appendCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public Response<Long> zinterCard(long limit, String... keys) {
-    return appendCommand(commandObjects.zinterCard(limit, keys));
+  public Response<Long> zintercard(long limit, String... keys) {
+    return appendCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -1342,13 +1342,13 @@ public Response<List<Tuple>> zunionWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public Response<Long> zunionStore(String dstKey, String... sets) {
-    return appendCommand(commandObjects.zunionStore(dstKey, sets));
+  public Response<Long> zunionstore(String dstKey, String... sets) {
+    return appendCommand(commandObjects.zunionstore(dstKey, sets));
   }
 
   @Override
-  public Response<Long> zunionStore(String dstKey, ZParams params, String... sets) {
-    return appendCommand(commandObjects.zunionStore(dstKey, params, sets));
+  public Response<Long> zunionstore(String dstKey, ZParams params, String... sets) {
+    return appendCommand(commandObjects.zunionstore(dstKey, params, sets));
   }
 
   @Override
@@ -2681,8 +2681,8 @@ public Response<Set<byte[]>> sdiff(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sdiffStore(dstkey, keys));
+  public Response<Long> sdiffstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   @Override
@@ -2691,18 +2691,18 @@ public Response<Set<byte[]>> sinter(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sinterStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sinterStore(dstkey, keys));
+  public Response<Long> sinterstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   @Override
-  public Response<Long> sinterCard(byte[]... keys) {
-    return appendCommand(commandObjects.sinterCard(keys));
+  public Response<Long> sintercard(byte[]... keys) {
+    return appendCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public Response<Long> sinterCard(int limit, byte[]... keys) {
-    return appendCommand(commandObjects.sinterCard(limit, keys));
+  public Response<Long> sintercard(int limit, byte[]... keys) {
+    return appendCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -2711,8 +2711,8 @@ public Response<Set<byte[]>> sunion(byte[]... keys) {
   }
 
   @Override
-  public Response<Long> sunionStore(byte[] dstkey, byte[]... keys) {
-    return appendCommand(commandObjects.sunionStore(dstkey, keys));
+  public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
+    return appendCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   @Override
@@ -2811,8 +2811,8 @@ public Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangePar
   }
 
   @Override
-  public Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return appendCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return appendCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -3061,23 +3061,23 @@ public Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public Response<Long> zinterStore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zinterStore(dstkey, sets));
+  public Response<Long> zinterstore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zinterStore(dstkey, params, sets));
+  public Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
-  public Response<Long> zinterCard(byte[]... keys) {
-    return appendCommand(commandObjects.zinterCard(keys));
+  public Response<Long> zintercard(byte[]... keys) {
+    return appendCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public Response<Long> zinterCard(long limit, byte[]... keys) {
-    return appendCommand(commandObjects.zinterCard(limit, keys));
+  public Response<Long> zintercard(long limit, byte[]... keys) {
+    return appendCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -3091,13 +3091,13 @@ public Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public Response<Long> zunionStore(byte[] dstkey, byte[]... sets) {
-    return appendCommand(commandObjects.zunionStore(dstkey, sets));
+  public Response<Long> zunionstore(byte[] dstkey, byte[]... sets) {
+    return appendCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   @Override
-  public Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return appendCommand(commandObjects.zunionStore(dstkey, params, sets));
+  public Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return appendCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
index f27c6ea4d7..1e7a0b5978 100644
--- a/src/main/java/redis/clients/jedis/UnifiedJedis.java
+++ b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -1674,8 +1674,8 @@ public Set<String> sdiff(String... keys) {
   }
 
   @Override
-  public long sdiffStore(String dstkey, String... keys) {
-    return executeCommand(commandObjects.sdiffStore(dstkey, keys));
+  public long sdiffstore(String dstkey, String... keys) {
+    return executeCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   @Override
@@ -1684,18 +1684,18 @@ public Set<String> sinter(String... keys) {
   }
 
   @Override
-  public long sinterStore(String dstkey, String... keys) {
-    return executeCommand(commandObjects.sinterStore(dstkey, keys));
+  public long sinterstore(String dstkey, String... keys) {
+    return executeCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   @Override
-  public long sinterCard(String... keys) {
-    return executeCommand(commandObjects.sinterCard(keys));
+  public long sintercard(String... keys) {
+    return executeCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public long sinterCard(int limit, String... keys) {
-    return executeCommand(commandObjects.sinterCard(limit, keys));
+  public long sintercard(int limit, String... keys) {
+    return executeCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -1704,8 +1704,8 @@ public Set<String> sunion(String... keys) {
   }
 
   @Override
-  public long sunionStore(String dstkey, String... keys) {
-    return executeCommand(commandObjects.sunionStore(dstkey, keys));
+  public long sunionstore(String dstkey, String... keys) {
+    return executeCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   @Override
@@ -1719,8 +1719,8 @@ public Set<byte[]> sdiff(byte[]... keys) {
   }
 
   @Override
-  public long sdiffStore(byte[] dstkey, byte[]... keys) {
-    return executeCommand(commandObjects.sdiffStore(dstkey, keys));
+  public long sdiffstore(byte[] dstkey, byte[]... keys) {
+    return executeCommand(commandObjects.sdiffstore(dstkey, keys));
   }
 
   @Override
@@ -1729,18 +1729,18 @@ public Set<byte[]> sinter(byte[]... keys) {
   }
 
   @Override
-  public long sinterStore(byte[] dstkey, byte[]... keys) {
-    return executeCommand(commandObjects.sinterStore(dstkey, keys));
+  public long sinterstore(byte[] dstkey, byte[]... keys) {
+    return executeCommand(commandObjects.sinterstore(dstkey, keys));
   }
 
   @Override
-  public long sinterCard(byte[]... keys) {
-    return executeCommand(commandObjects.sinterCard(keys));
+  public long sintercard(byte[]... keys) {
+    return executeCommand(commandObjects.sintercard(keys));
   }
 
   @Override
-  public long sinterCard(int limit, byte[]... keys) {
-    return executeCommand(commandObjects.sinterCard(limit, keys));
+  public long sintercard(int limit, byte[]... keys) {
+    return executeCommand(commandObjects.sintercard(limit, keys));
   }
 
   @Override
@@ -1749,8 +1749,8 @@ public Set<byte[]> sunion(byte[]... keys) {
   }
 
   @Override
-  public long sunionStore(byte[] dstkey, byte[]... keys) {
-    return executeCommand(commandObjects.sunionStore(dstkey, keys));
+  public long sunionstore(byte[] dstkey, byte[]... keys) {
+    return executeCommand(commandObjects.sunionstore(dstkey, keys));
   }
 
   @Override
@@ -2031,8 +2031,8 @@ public List<Tuple> zrangeWithScores(String key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangeStore(String dest, String src, ZRangeParams zRangeParams) {
-    return executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public long zrangestore(String dest, String src, ZRangeParams zRangeParams) {
+    return executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2146,8 +2146,8 @@ public List<Tuple> zrangeWithScores(byte[] key, ZRangeParams zRangeParams) {
   }
 
   @Override
-  public long zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
-    return executeCommand(commandObjects.zrangeStore(dest, src, zRangeParams));
+  public long zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams) {
+    return executeCommand(commandObjects.zrangestore(dest, src, zRangeParams));
   }
 
   @Override
@@ -2381,13 +2381,13 @@ public long zdiffStore(byte[] dstkey, byte[]... keys) {
   }
 
   @Override
-  public long zinterStore(String dstkey, String... sets) {
-    return executeCommand(commandObjects.zinterStore(dstkey, sets));
+  public long zinterstore(String dstkey, String... sets) {
+    return executeCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   @Override
-  public long zinterStore(String dstkey, ZParams params, String... sets) {
-    return executeCommand(commandObjects.zinterStore(dstkey, params, sets));
+  public long zinterstore(String dstkey, ZParams params, String... sets) {
+    return executeCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
@@ -2401,33 +2401,33 @@ public List<Tuple> zinterWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public long zinterStore(byte[] dstkey, byte[]... sets) {
-    return executeCommand(commandObjects.zinterStore(dstkey, sets));
+  public long zinterstore(byte[] dstkey, byte[]... sets) {
+    return executeCommand(commandObjects.zinterstore(dstkey, sets));
   }
 
   @Override
-  public long zinterStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return executeCommand(commandObjects.zinterStore(dstkey, params, sets));
+  public long zinterstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return executeCommand(commandObjects.zinterstore(dstkey, params, sets));
   }
 
   @Override
-  public long zinterCard(byte[]... keys) {
-    return executeCommand(commandObjects.zinterCard(keys));
+  public long zintercard(byte[]... keys) {
+    return executeCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public long zinterCard(long limit, byte[]... keys) {
-    return executeCommand(commandObjects.zinterCard(limit, keys));
+  public long zintercard(long limit, byte[]... keys) {
+    return executeCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
-  public long zinterCard(String... keys) {
-    return executeCommand(commandObjects.zinterCard(keys));
+  public long zintercard(String... keys) {
+    return executeCommand(commandObjects.zintercard(keys));
   }
 
   @Override
-  public long zinterCard(long limit, String... keys) {
-    return executeCommand(commandObjects.zinterCard(limit, keys));
+  public long zintercard(long limit, String... keys) {
+    return executeCommand(commandObjects.zintercard(limit, keys));
   }
 
   @Override
@@ -2451,13 +2451,13 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
   }
 
   @Override
-  public long zunionStore(String dstkey, String... sets) {
-    return executeCommand(commandObjects.zunionStore(dstkey, sets));
+  public long zunionstore(String dstkey, String... sets) {
+    return executeCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   @Override
-  public long zunionStore(String dstkey, ZParams params, String... sets) {
-    return executeCommand(commandObjects.zunionStore(dstkey, params, sets));
+  public long zunionstore(String dstkey, ZParams params, String... sets) {
+    return executeCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   @Override
@@ -2471,13 +2471,13 @@ public List<Tuple> zunionWithScores(ZParams params, byte[]... keys) {
   }
 
   @Override
-  public long zunionStore(byte[] dstkey, byte[]... sets) {
-    return executeCommand(commandObjects.zunionStore(dstkey, sets));
+  public long zunionstore(byte[] dstkey, byte[]... sets) {
+    return executeCommand(commandObjects.zunionstore(dstkey, sets));
   }
 
   @Override
-  public long zunionStore(byte[] dstkey, ZParams params, byte[]... sets) {
-    return executeCommand(commandObjects.zunionStore(dstkey, params, sets));
+  public long zunionstore(byte[] dstkey, ZParams params, byte[]... sets) {
+    return executeCommand(commandObjects.zunionstore(dstkey, params, sets));
   }
 
   @Override
diff --git a/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java
index dce0a67876..7420d4fabf 100644
--- a/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetBinaryCommands.java
@@ -36,11 +36,11 @@ default ScanResult<byte[]> sscan(byte[] key, byte[] cursor) {
 
   Set<byte[]> sdiff(byte[]... keys);
 
-  long sdiffStore(byte[] dstkey, byte[]... keys);
+  long sdiffstore(byte[] dstkey, byte[]... keys);
 
   Set<byte[]> sinter(byte[]... keys);
 
-  long sinterStore(byte[] dstkey, byte[]... keys);
+  long sinterstore(byte[] dstkey, byte[]... keys);
 
   /**
    * This command works exactly like {@link SetBinaryCommands#sinter(byte[][]) SINTER} but instead of returning
@@ -50,7 +50,7 @@ default ScanResult<byte[]> sscan(byte[] key, byte[] cursor) {
    * @param keys
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sinterCard(byte[]... keys);
+  long sintercard(byte[]... keys);
 
   /**
    * This command works exactly like {@link SetBinaryCommands#sinter(byte[][]) SINTER} but instead of returning
@@ -62,11 +62,11 @@ default ScanResult<byte[]> sscan(byte[] key, byte[] cursor) {
    * @param keys
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sinterCard(int limit, byte[]... keys);
+  long sintercard(int limit, byte[]... keys);
 
   Set<byte[]> sunion(byte[]... keys);
 
-  long sunionStore(byte[] dstkey, byte[]... keys);
+  long sunionstore(byte[] dstkey, byte[]... keys);
 
   long smove(byte[] srckey, byte[] dstkey, byte[] member);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SetCommands.java b/src/main/java/redis/clients/jedis/commands/SetCommands.java
index f6c6aa464b..e412598e00 100644
--- a/src/main/java/redis/clients/jedis/commands/SetCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetCommands.java
@@ -159,7 +159,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting set
    */
-  long sdiffStore(String dstkey, String... keys);
+  long sdiffstore(String dstkey, String... keys);
 
   /**
    * Return the members of a set resulting from the intersection of all the sets hold at the
@@ -188,7 +188,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting set
    */
-  long sinterStore(String dstkey, String... keys);
+  long sinterstore(String dstkey, String... keys);
 
   /**
    * This command works exactly like {@link SetCommands#sinter(String[]) SINTER} but instead of returning
@@ -198,7 +198,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sinterCard(String... keys);
+  long sintercard(String... keys);
 
   /**
    * This command works exactly like {@link SetCommands#sinter(String[]) SINTER} but instead of returning
@@ -210,7 +210,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The cardinality of the set which would result from the intersection of all the given sets
    */
-  long sinterCard(int limit, String... keys);
+  long sintercard(int limit, String... keys);
 
   /**
    * Return the members of a set resulting from the union of all the sets hold at the specified
@@ -237,7 +237,7 @@ default ScanResult<String> sscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting set
    */
-  long sunionStore(String dstkey, String... keys);
+  long sunionstore(String dstkey, String... keys);
 
   /**
    * Move the specified member from the set at srckey to the set at dstkey. This operation is
diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java
index d298d62111..6268077203 100644
--- a/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetPipelineBinaryCommands.java
@@ -37,19 +37,19 @@ default Response<ScanResult<byte[]>> sscan(byte[] key, byte[] cursor) {
 
   Response<Set<byte[]>> sdiff(byte[]... keys);
 
-  Response<Long> sdiffStore(byte[] dstkey, byte[]... keys);
+  Response<Long> sdiffstore(byte[] dstkey, byte[]... keys);
 
   Response<Set<byte[]>> sinter(byte[]... keys);
 
-  Response<Long> sinterStore(byte[] dstkey, byte[]... keys);
+  Response<Long> sinterstore(byte[] dstkey, byte[]... keys);
 
-  Response<Long> sinterCard(byte[]... keys);
+  Response<Long> sintercard(byte[]... keys);
 
-  Response<Long> sinterCard(int limit, byte[]... keys);
+  Response<Long> sintercard(int limit, byte[]... keys);
 
   Response<Set<byte[]>> sunion(byte[]... keys);
 
-  Response<Long> sunionStore(byte[] dstkey, byte[]... keys);
+  Response<Long> sunionstore(byte[] dstkey, byte[]... keys);
 
   Response<Long> smove(byte[] srckey, byte[] dstkey, byte[] member);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
index d887e2ea3b..8d1a0ad1f3 100644
--- a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
@@ -41,11 +41,11 @@ default Response<ScanResult<String>> sscan(String key, String cursor) {
 
   Response<Set<String>> sinter(String... keys);
 
-  Response<Long> sinterStore(String dstKey, String... keys);
+  Response<Long> sinterstore(String dstKey, String... keys);
 
-  Response<Long> sinterCard(String... keys);
+  Response<Long> sintercard(String... keys);
 
-  Response<Long> sinterCard(int limit, String... keys);
+  Response<Long> sintercard(int limit, String... keys);
 
   Response<Set<String>> sunion(String... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java
index 9555547e61..12c437afdf 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetBinaryCommands.java
@@ -48,7 +48,7 @@ public interface SortedSetBinaryCommands {
 
   List<Tuple> zrangeWithScores(byte[] key, ZRangeParams zRangeParams);
 
-  long zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
+  long zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
 
   byte[] zrandmember(byte[] key);
 
@@ -144,9 +144,9 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
 
   List<Tuple> zinterWithScores(ZParams params, byte[]... keys);
 
-  long zinterStore(byte[] dstkey, byte[]... sets);
+  long zinterstore(byte[] dstkey, byte[]... sets);
 
-  long zinterStore(byte[] dstkey, ZParams params, byte[]... sets);
+  long zinterstore(byte[] dstkey, ZParams params, byte[]... sets);
 
   /**
    * Similar to {@link SortedSetBinaryCommands#zinter(ZParams, byte[]...) ZINTER}, but
@@ -158,7 +158,7 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zinterCard(byte[]... keys);
+  long zintercard(byte[]... keys);
 
   /**
    * Similar to {@link SortedSetBinaryCommands#zinter(ZParams, byte[]...) ZINTER}, but
@@ -172,15 +172,15 @@ default ScanResult<Tuple> zscan(byte[] key, byte[] cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zinterCard(long limit, byte[]... keys);
+  long zintercard(long limit, byte[]... keys);
 
   List<byte[]> zunion(ZParams params, byte[]... keys);
 
   List<Tuple> zunionWithScores(ZParams params, byte[]... keys);
 
-  long zunionStore(byte[] dstkey, byte[]... sets);
+  long zunionstore(byte[] dstkey, byte[]... sets);
 
-  long zunionStore(byte[] dstkey, ZParams params, byte[]... sets);
+  long zunionstore(byte[] dstkey, ZParams params, byte[]... sets);
 
   KeyValue<byte[], List<Tuple>> zmpop(SortedSetOption option, byte[]... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java
index fdafe3f302..f9e8476075 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetCommands.java
@@ -243,7 +243,7 @@ public interface SortedSetCommands {
    * @param zRangeParams {@link ZRangeParams}
    * @return The number of elements in the resulting sorted set
    */
-  long zrangeStore(String dest, String src, ZRangeParams zRangeParams);
+  long zrangestore(String dest, String src, ZRangeParams zRangeParams);
 
   /**
    * Return a random element from the sorted set value stored at key.
@@ -728,7 +728,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zinterStore(String dstkey, String... sets);
+  long zinterstore(String dstkey, String... sets);
 
   /**
    * Compute the intersection between all the sets in the given keys. Store the result in dstkey.
@@ -737,7 +737,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zinterStore(String dstkey, ZParams params, String... sets);
+  long zinterstore(String dstkey, ZParams params, String... sets);
 
   /**
    * Similar to {@link SortedSetCommands#zinter(ZParams, String...) ZINTER}, but
@@ -749,7 +749,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zinterCard(String... keys);
+  long zintercard(String... keys);
 
   /**
    * Similar to {@link SortedSetCommands#zinter(ZParams, String...) ZINTER}, but
@@ -763,7 +763,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param keys group of sets
    * @return The number of elements in the resulting intersection
    */
-  long zinterCard(long limit, String... keys);
+  long zintercard(long limit, String... keys);
 
   /**
    * Compute the union between all the sets in the given keys.
@@ -790,7 +790,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zunionStore(String dstkey, String... sets);
+  long zunionstore(String dstkey, String... sets);
 
   /**
    * Compute the union between all the sets in the given keys. Store the result in dstkey.
@@ -799,7 +799,7 @@ default ScanResult<Tuple> zscan(String key, String cursor) {
    * @param sets group of sets
    * @return The number of elements in the resulting sorted set at dstkey
    */
-  long zunionStore(String dstkey, ZParams params, String... sets);
+  long zunionstore(String dstkey, ZParams params, String... sets);
 
   KeyValue<String, List<Tuple>> zmpop(SortedSetOption option, String... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java
index 7397ea30f4..72fa9d348b 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineBinaryCommands.java
@@ -121,7 +121,7 @@ public interface SortedSetPipelineBinaryCommands {
 
   Response<List<Tuple>> zrangeWithScores(byte[] key, ZRangeParams zRangeParams);
 
-  Response<Long> zrangeStore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
+  Response<Long> zrangestore(byte[] dest, byte[] src, ZRangeParams zRangeParams);
 
   Response<Long> zremrangeByLex(byte[] key, byte[] min, byte[] max);
 
@@ -145,21 +145,21 @@ default Response<ScanResult<Tuple>> zscan(byte[] key, byte[] cursor) {
 
   Response<List<Tuple>> zinterWithScores(ZParams params, byte[]... keys);
 
-  Response<Long> zinterStore(byte[] dstkey, byte[]... sets);
+  Response<Long> zinterstore(byte[] dstkey, byte[]... sets);
 
-  Response<Long> zinterStore(byte[] dstkey, ZParams params, byte[]... sets);
+  Response<Long> zinterstore(byte[] dstkey, ZParams params, byte[]... sets);
 
-  Response<Long> zinterCard(byte[]... keys);
+  Response<Long> zintercard(byte[]... keys);
 
-  Response<Long> zinterCard(long limit, byte[]... keys);
+  Response<Long> zintercard(long limit, byte[]... keys);
 
   Response<List<byte[]>> zunion(ZParams params, byte[]... keys);
 
   Response<List<Tuple>> zunionWithScores(ZParams params, byte[]... keys);
 
-  Response<Long> zunionStore(byte[] dstkey, byte[]... sets);
+  Response<Long> zunionstore(byte[] dstkey, byte[]... sets);
 
-  Response<Long> zunionStore(byte[] dstkey, ZParams params, byte[]... sets);
+  Response<Long> zunionstore(byte[] dstkey, ZParams params, byte[]... sets);
 
   Response<KeyValue<byte[], List<Tuple>>> zmpop(SortedSetOption option, byte[]... keys);
 
diff --git a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java
index 4cfbccb56f..f98cc2a295 100644
--- a/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SortedSetPipelineCommands.java
@@ -106,7 +106,7 @@ public interface SortedSetPipelineCommands {
 
   Response<List<Tuple>> zrangeWithScores(String key, ZRangeParams zRangeParams);
 
-  Response<Long> zrangeStore(String dest, String src, ZRangeParams zRangeParams);
+  Response<Long> zrangestore(String dest, String src, ZRangeParams zRangeParams);
 
   Response<Long> zremrangeByRank(String key, long start, long stop);
 
@@ -142,25 +142,25 @@ default Response<ScanResult<Tuple>> zscan(String key, String cursor) {
 
   Response<Long> zdiffStore(String dstKey, String... keys);
 
-  Response<Long> zinterStore(String dstKey, String... sets);
+  Response<Long> zinterstore(String dstKey, String... sets);
 
-  Response<Long> zinterStore(String dstKey, ZParams params, String... sets);
+  Response<Long> zinterstore(String dstKey, ZParams params, String... sets);
 
   Response<List<String>> zinter(ZParams params, String... keys);
 
   Response<List<Tuple>> zinterWithScores(ZParams params, String... keys);
 
-  Response<Long> zinterCard(String... keys);
+  Response<Long> zintercard(String... keys);
 
-  Response<Long> zinterCard(long limit, String... keys);
+  Response<Long> zintercard(long limit, String... keys);
 
   Response<List<String>> zunion(ZParams params, String... keys);
 
   Response<List<Tuple>> zunionWithScores(ZParams params, String... keys);
 
-  Response<Long> zunionStore(String dstKey, String... sets);
+  Response<Long> zunionstore(String dstKey, String... sets);
 
-  Response<Long> zunionStore(String dstKey, ZParams params, String... sets);
+  Response<Long> zunionstore(String dstKey, ZParams params, String... sets);
 
   Response<KeyValue<String, List<Tuple>>> zmpop(SortedSetOption option, String... keys);
 
diff --git a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
index 56b6243246..44f2f2a279 100644
--- a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
+++ b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
@@ -519,13 +519,13 @@ public void clusterPipelineSet() {
     Response<Long> r1 = p.sadd("my{set}", "hello", "hello", "world", "foo", "bar");
     p.sadd("mynew{set}", "hello", "hello", "world");
     Response<Set<String>> r2 = p.sdiff("my{set}", "mynew{set}");
-    Response<Long> r3 = p.sdiffStore("diffset{set}", "my{set}", "mynew{set}");
+    Response<Long> r3 = p.sdiffstore("diffset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r4 = p.smembers("diffset{set}");
     Response<Set<String>> r5 = p.sinter("my{set}", "mynew{set}");
-    Response<Long> r6 = p.sinterStore("interset{set}", "my{set}", "mynew{set}");
+    Response<Long> r6 = p.sinterstore("interset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r7 = p.smembers("interset{set}");
     Response<Set<String>> r8 = p.sunion("my{set}", "mynew{set}");
-    Response<Long> r9 = p.sunionStore("unionset{set}", "my{set}", "mynew{set}");
+    Response<Long> r9 = p.sunionstore("unionset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r10 = p.smembers("unionset{set}");
     Response<Boolean> r11 = p.sismember("my{set}", "foo");
     Response<List<Boolean>> r12 = p.smismember("my{set}", "foo", "foobar");
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java
index 9735681486..4d29392fce 100644
--- a/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java
@@ -333,7 +333,7 @@ public void sinterstore() {
     Set<String> expected = new HashSet<String>();
     expected.add("b");
 
-    long status = jedis.sinterStore("car", "foo", "bar");
+    long status = jedis.sinterstore("car", "foo", "bar");
     assertEquals(1, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -348,7 +348,7 @@ public void sinterstore() {
     Set<byte[]> bexpected = new HashSet<byte[]>();
     bexpected.add(bb);
 
-    long bstatus = jedis.sinterStore(bcar, bfoo, bbar);
+    long bstatus = jedis.sinterstore(bcar, bfoo, bbar);
     assertEquals(1, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -364,9 +364,9 @@ public void sintercard() {
     jedis.sadd("bar", "b");
     jedis.sadd("bar", "c");
 
-    long card = jedis.sinterCard("foo", "bar");
+    long card = jedis.sintercard("foo", "bar");
     assertEquals(2, card);
-    long limitedCard = jedis.sinterCard(1, "foo", "bar");
+    long limitedCard = jedis.sintercard(1, "foo", "bar");
     assertEquals(1, limitedCard);
 
     // Binary
@@ -377,9 +377,9 @@ public void sintercard() {
     jedis.sadd(bbar, bb);
     jedis.sadd(bbar, bc);
 
-    long bcard = jedis.sinterCard(bfoo, bbar);
+    long bcard = jedis.sintercard(bfoo, bbar);
     assertEquals(2, bcard);
-    long blimitedCard = jedis.sinterCard(1, bfoo, bbar);
+    long blimitedCard = jedis.sintercard(1, bfoo, bbar);
     assertEquals(1, blimitedCard);
   }
 
@@ -429,7 +429,7 @@ public void sunionstore() {
     expected.add("b");
     expected.add("c");
 
-    long status = jedis.sunionStore("car", "foo", "bar");
+    long status = jedis.sunionstore("car", "foo", "bar");
     assertEquals(3, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -446,7 +446,7 @@ public void sunionstore() {
     bexpected.add(bc);
     bexpected.add(ba);
 
-    long bstatus = jedis.sunionStore(bcar, bfoo, bbar);
+    long bstatus = jedis.sunionstore(bcar, bfoo, bbar);
     assertEquals(3, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -508,7 +508,7 @@ public void sdiffstore() {
     expected.add("x");
     expected.add("b");
 
-    long status = jedis.sdiffStore("tar", "foo", "bar", "car");
+    long status = jedis.sdiffstore("tar", "foo", "bar", "car");
     assertEquals(2, status);
     assertEquals(expected, jedis.smembers("tar"));
 
@@ -527,7 +527,7 @@ public void sdiffstore() {
     bexpected.add(bx);
     bexpected.add(bb);
 
-    long bstatus = jedis.sdiffStore("tar".getBytes(), bfoo, bbar, bcar);
+    long bstatus = jedis.sdiffstore("tar".getBytes(), bfoo, bbar, bcar);
     assertEquals(2, bstatus);
     assertByteArraySetEquals(bexpected, jedis.smembers("tar".getBytes()));
 
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
index e18e06ff1e..99554f00bc 100644
--- a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java
@@ -1027,7 +1027,7 @@ public void zrangestore() {
     jedis.zadd("foo", 2, "c");
     jedis.zadd("foo", 3, "bb");
 
-    long stored = jedis.zrangeStore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
+    long stored = jedis.zrangestore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
     assertEquals(2, stored);
 
     List<String> range = jedis.zrange("bar", 0, -1);
@@ -1042,7 +1042,7 @@ public void zrangestore() {
     jedis.zadd(bfoo, 0.1d, bc);
     jedis.zadd(bfoo, 2d, ba);
 
-    long bstored = jedis.zrangeStore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
+    long bstored = jedis.zrangestore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
     assertEquals(2, bstored);
 
     List<byte[]> brange = jedis.zrevrange(bbar, 0, 1);
@@ -1267,7 +1267,7 @@ public void zunionstore() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 2, "b");
 
-    assertEquals(2, jedis.zunionStore("dst", "foo", "bar"));
+    assertEquals(2, jedis.zunionstore("dst", "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(3)));
@@ -1281,7 +1281,7 @@ public void zunionstore() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(3)));
@@ -1301,7 +1301,7 @@ public void zunionstoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionStore("dst", params, "foo", "bar"));
+    assertEquals(2, jedis.zunionstore("dst", params, "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(7)));
@@ -1319,7 +1319,7 @@ public void zunionstoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(7)));
@@ -1362,7 +1362,7 @@ public void zinterstore() {
     jedis.zadd("foo", 2, "b");
     jedis.zadd("bar", 2, "a");
 
-    assertEquals(1, jedis.zinterStore("dst", "foo", "bar"));
+    assertEquals(1, jedis.zinterstore("dst", "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(3)));
@@ -1374,7 +1374,7 @@ public void zinterstore() {
     jedis.zadd(bfoo, 2, bb);
     jedis.zadd(bbar, 2, ba);
 
-    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(3)));
@@ -1392,7 +1392,7 @@ public void zintertoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterStore("dst", params, "foo", "bar"));
+    assertEquals(1, jedis.zinterstore("dst", params, "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(7)));
@@ -1408,7 +1408,7 @@ public void zintertoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(7)));
@@ -1423,8 +1423,8 @@ public void zintercard() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 1, "b");
 
-    assertEquals(2, jedis.zinterCard("foo", "bar"));
-    assertEquals(1, jedis.zinterCard(1, "foo", "bar"));
+    assertEquals(2, jedis.zintercard("foo", "bar"));
+    assertEquals(1, jedis.zintercard(1, "foo", "bar"));
 
     // Binary
     jedis.zadd(bfoo, 1, ba);
@@ -1432,8 +1432,8 @@ public void zintercard() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zinterCard(bfoo, bbar));
-    assertEquals(1, jedis.zinterCard(1, bfoo, bbar));
+    assertEquals(2, jedis.zintercard(bfoo, bbar));
+    assertEquals(1, jedis.zintercard(1, bfoo, bbar));
   }
 
   @Test
diff --git a/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java
index 66472c856a..eed0801a86 100644
--- a/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java
+++ b/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java
@@ -333,7 +333,7 @@ public void sinterstore() {
     Set<String> expected = new HashSet<String>();
     expected.add("b");
 
-    long status = jedis.sinterStore("car", "foo", "bar");
+    long status = jedis.sinterstore("car", "foo", "bar");
     assertEquals(1, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -348,7 +348,7 @@ public void sinterstore() {
     Set<byte[]> bexpected = new HashSet<byte[]>();
     bexpected.add(bb);
 
-    long bstatus = jedis.sinterStore(bcar, bfoo, bbar);
+    long bstatus = jedis.sinterstore(bcar, bfoo, bbar);
     assertEquals(1, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -364,9 +364,9 @@ public void sintercard() {
     jedis.sadd("bar", "b");
     jedis.sadd("bar", "c");
 
-    long card = jedis.sinterCard("foo", "bar");
+    long card = jedis.sintercard("foo", "bar");
     assertEquals(2, card);
-    long limitedCard = jedis.sinterCard(1, "foo", "bar");
+    long limitedCard = jedis.sintercard(1, "foo", "bar");
     assertEquals(1, limitedCard);
 
     // Binary
@@ -377,9 +377,9 @@ public void sintercard() {
     jedis.sadd(bbar, bb);
     jedis.sadd(bbar, bc);
 
-    long bcard = jedis.sinterCard(bfoo, bbar);
+    long bcard = jedis.sintercard(bfoo, bbar);
     assertEquals(2, bcard);
-    long blimitedCard = jedis.sinterCard(1, bfoo, bbar);
+    long blimitedCard = jedis.sintercard(1, bfoo, bbar);
     assertEquals(1, blimitedCard);
   }
 
@@ -429,7 +429,7 @@ public void sunionstore() {
     expected.add("b");
     expected.add("c");
 
-    long status = jedis.sunionStore("car", "foo", "bar");
+    long status = jedis.sunionstore("car", "foo", "bar");
     assertEquals(3, status);
 
     assertEquals(expected, jedis.smembers("car"));
@@ -446,7 +446,7 @@ public void sunionstore() {
     bexpected.add(bc);
     bexpected.add(ba);
 
-    long bstatus = jedis.sunionStore(bcar, bfoo, bbar);
+    long bstatus = jedis.sunionstore(bcar, bfoo, bbar);
     assertEquals(3, bstatus);
 
     assertByteArraySetEquals(bexpected, jedis.smembers(bcar));
@@ -508,7 +508,7 @@ public void sdiffstore() {
     expected.add("x");
     expected.add("b");
 
-    long status = jedis.sdiffStore("tar", "foo", "bar", "car");
+    long status = jedis.sdiffstore("tar", "foo", "bar", "car");
     assertEquals(2, status);
     assertEquals(expected, jedis.smembers("tar"));
 
@@ -527,7 +527,7 @@ public void sdiffstore() {
     bexpected.add(bx);
     bexpected.add(bb);
 
-    long bstatus = jedis.sdiffStore("tar".getBytes(), bfoo, bbar, bcar);
+    long bstatus = jedis.sdiffstore("tar".getBytes(), bfoo, bbar, bcar);
     assertEquals(2, bstatus);
     assertByteArraySetEquals(bexpected, jedis.smembers("tar".getBytes()));
 
diff --git a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
index 678646fea8..983d3a2fbc 100644
--- a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
+++ b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java
@@ -325,7 +325,7 @@ public void zrangestore() {
     jedis.zadd("foo", 2, "c");
     jedis.zadd("foo", 3, "bb");
 
-    long stored = jedis.zrangeStore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
+    long stored = jedis.zrangestore("bar", "foo", ZRangeParams.zrangeByScoreParams(1, 2));
     assertEquals(2, stored);
 
     List<String> range = jedis.zrange("bar", 0, -1);
@@ -340,7 +340,7 @@ public void zrangestore() {
     jedis.zadd(bfoo, 0.1d, bc);
     jedis.zadd(bfoo, 2d, ba);
 
-    long bstored = jedis.zrangeStore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
+    long bstored = jedis.zrangestore(bbar, bfoo, ZRangeParams.zrangeParams(0, 1).rev());
     assertEquals(2, bstored);
 
     List<byte[]> brange = jedis.zrevrange(bbar, 0, 1);
@@ -1268,7 +1268,7 @@ public void zunionstore() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 2, "b");
 
-    assertEquals(2, jedis.zunionStore("dst", "foo", "bar"));
+    assertEquals(2, jedis.zunionstore("dst", "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(3)));
@@ -1281,7 +1281,7 @@ public void zunionstore() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(3)));
@@ -1300,7 +1300,7 @@ public void zunionstoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionStore("dst", params, "foo", "bar"));
+    assertEquals(2, jedis.zunionstore("dst", params, "foo", "bar"));
 
     List<Tuple> expected = new ArrayList<Tuple>();
     expected.add(new Tuple("a", new Double(7)));
@@ -1317,7 +1317,7 @@ public void zunionstoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(2, jedis.zunionStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(2, jedis.zunionstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     List<Tuple> bexpected = new ArrayList<Tuple>();
     bexpected.add(new Tuple(ba, new Double(7)));
@@ -1359,7 +1359,7 @@ public void zinterstore() {
     jedis.zadd("foo", 2, "b");
     jedis.zadd("bar", 2, "a");
 
-    assertEquals(1, jedis.zinterStore("dst", "foo", "bar"));
+    assertEquals(1, jedis.zinterstore("dst", "foo", "bar"));
 
     assertEquals(singletonList(new Tuple("a", new Double(3))),
         jedis.zrangeWithScores("dst", 0, 100));
@@ -1369,7 +1369,7 @@ public void zinterstore() {
     jedis.zadd(bfoo, 2, bb);
     jedis.zadd(bbar, 2, ba);
 
-    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bfoo, bbar));
+    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bfoo, bbar));
 
     assertEquals(singletonList(new Tuple(ba, new Double(3))),
         jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100));
@@ -1385,7 +1385,7 @@ public void zintertoreParams() {
     params.weights(2, 2.5);
     params.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterStore("dst", params, "foo", "bar"));
+    assertEquals(1, jedis.zinterstore("dst", params, "foo", "bar"));
 
     assertEquals(singletonList(new Tuple("a", new Double(7))),
         jedis.zrangeWithScores("dst", 0, 100));
@@ -1399,7 +1399,7 @@ public void zintertoreParams() {
     bparams.weights(2, 2.5);
     bparams.aggregate(ZParams.Aggregate.SUM);
 
-    assertEquals(1, jedis.zinterStore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
+    assertEquals(1, jedis.zinterstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar));
 
     assertEquals(singletonList(new Tuple(ba, new Double(7))),
         jedis.zrangeWithScores(SafeEncoder.encode("dst"), 0, 100));
@@ -1412,8 +1412,8 @@ public void zintercard() {
     jedis.zadd("bar", 2, "a");
     jedis.zadd("bar", 1, "b");
 
-    assertEquals(2, jedis.zinterCard("foo", "bar"));
-    assertEquals(1, jedis.zinterCard(1, "foo", "bar"));
+    assertEquals(2, jedis.zintercard("foo", "bar"));
+    assertEquals(1, jedis.zintercard(1, "foo", "bar"));
 
     // Binary
     jedis.zadd(bfoo, 1, ba);
@@ -1421,8 +1421,8 @@ public void zintercard() {
     jedis.zadd(bbar, 2, ba);
     jedis.zadd(bbar, 2, bb);
 
-    assertEquals(2, jedis.zinterCard(bfoo, bbar));
-    assertEquals(1, jedis.zinterCard(1, bfoo, bbar));
+    assertEquals(2, jedis.zintercard(bfoo, bbar));
+    assertEquals(1, jedis.zintercard(1, bfoo, bbar));
   }
 
   @Test

From 2f24884f5191f813d2fda3e6ab9293ac7291183d Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Sun, 28 May 2023 23:16:26 +0600
Subject: [PATCH 6/7] undo javadoc changes

---
 src/main/java/redis/clients/jedis/Jedis.java | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index a8478c18b9..4525e15d1d 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -6248,7 +6248,7 @@ public long sinterstore(final String dstkey, final String... keys) {
   }
 
   /**
-   * This command works exactly like {@link Jedis#sinter(String[]) SINTER} but instead of returning
+   * This command works exactly like {@link Jedis#sinter(String...) SINTER} but instead of returning
    * the result set, it returns just the cardinality of the result.
    * <p>
    * Time complexity O(N*M) worst case where N is the cardinality of the smallest
@@ -6262,7 +6262,7 @@ public long sintercard(String... keys) {
   }
 
   /**
-   * This command works exactly like {@link Jedis#sinter(String[]) SINTER} but instead of returning
+   * This command works exactly like {@link Jedis#sinter(String...) SINTER} but instead of returning
    * the result set, it returns just the cardinality of the result.
    * <p>
    * Time complexity O(N*M) worst case where N is the cardinality of the smallest
@@ -7451,7 +7451,7 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7466,8 +7466,8 @@ public List<Tuple> zunionWithScores(ZParams params, String... keys) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String[])
-   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zunionstore(String, String...)
+   * @see Jedis#zunionstore(String, ZParams, String...)
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7487,7 +7487,7 @@ public long zunionstore(final String dstkey, final String... sets) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7502,8 +7502,8 @@ public long zunionstore(final String dstkey, final String... sets) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String[])
-   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zunionstore(String, String...)
+   * @see Jedis#zunionstore(String, ZParams, String...)
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7562,7 +7562,7 @@ public long zintercard(long limit, String... keys) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7577,8 +7577,8 @@ public long zintercard(long limit, String... keys) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String[])
-   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zunionstore(String, String...)
+   * @see Jedis#zunionstore(String, ZParams, String...)
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey
@@ -7598,7 +7598,7 @@ public long zinterstore(final String dstkey, final String... sets) {
    * <p>
    * As the terms imply, the {@link Jedis#zinterstore(String, String...) ZINTERSTORE} command
    * requires an element to be present in each of the given inputs to be inserted in the result. The
-   * {@link Jedis#zunionstore(String, String[]) ZUNIONSTORE} command inserts all elements across
+   * {@link Jedis#zunionstore(String, String...) ZUNIONSTORE} command inserts all elements across
    * all inputs.
    * <p>
    * Using the WEIGHTS option, it is possible to add weight to each input sorted set. This means
@@ -7613,8 +7613,8 @@ public long zinterstore(final String dstkey, final String... sets) {
    * <p>
    * <b>Time complexity:</b> O(N) + O(M log(M)) with N being the sum of the sizes of the input
    * sorted sets, and M being the number of elements in the resulting sorted set
-   * @see Jedis#zunionstore(String, String[])
-   * @see Jedis#zunionstore(String, ZParams, String[])
+   * @see Jedis#zunionstore(String, String...)
+   * @see Jedis#zunionstore(String, ZParams, String...)
    * @see Jedis#zinterstore(String, String...)
    * @see Jedis#zinterstore(String, ZParams, String...)
    * @param dstkey

From 2ab2f211262ea5b8a1ca1d9afbf06161f565c992 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Sun, 28 May 2023 23:40:18 +0600
Subject: [PATCH 7/7] fix

---
 src/main/java/redis/clients/jedis/PipelineBase.java             | 2 +-
 src/main/java/redis/clients/jedis/TransactionBase.java          | 2 +-
 .../java/redis/clients/jedis/commands/SetPipelineCommands.java  | 2 +-
 src/test/java/redis/clients/jedis/ClusterPipeliningTest.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java
index fd5e547e04..73fb3f2315 100644
--- a/src/main/java/redis/clients/jedis/PipelineBase.java
+++ b/src/main/java/redis/clients/jedis/PipelineBase.java
@@ -781,7 +781,7 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(String dstKey, String... keys) {
+  public Response<Long> sdiffStore(String dstKey, String... keys) {
     return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 
diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
index 80d9b3eada..2b7e181166 100644
--- a/src/main/java/redis/clients/jedis/TransactionBase.java
+++ b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -938,7 +938,7 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffstore(String dstKey, String... keys) {
+  public Response<Long> sdiffStore(String dstKey, String... keys) {
     return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 
diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
index 8d1a0ad1f3..4d915e31e7 100644
--- a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
@@ -49,7 +49,7 @@ default Response<ScanResult<String>> sscan(String key, String cursor) {
 
   Response<Set<String>> sunion(String... keys);
 
-  Response<Long> sunionStore(String dstKey, String... keys);
+  Response<Long> sunionstore(String dstKey, String... keys);
 
   Response<Long> smove(String srckey, String dstKey, String member);
 
diff --git a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
index fd8e3e0d5f..51c7f41730 100644
--- a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
+++ b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
@@ -519,7 +519,7 @@ public void clusterPipelineSet() {
     Response<Long> r1 = p.sadd("my{set}", "hello", "hello", "world", "foo", "bar");
     p.sadd("mynew{set}", "hello", "hello", "world");
     Response<Set<String>> r2 = p.sdiff("my{set}", "mynew{set}");
-    Response<Long> r3 = p.sdiffstore("diffset{set}", "my{set}", "mynew{set}");
+    Response<Long> r3 = p.sdiffStore("diffset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r4 = p.smembers("diffset{set}");
     Response<Set<String>> r5 = p.sinter("my{set}", "mynew{set}");
     Response<Long> r6 = p.sinterstore("interset{set}", "my{set}", "mynew{set}");