diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
index 2f5e4d16a0..1de7affa6a 100644
--- a/src/main/java/redis/clients/jedis/CommandObjects.java
+++ b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -447,8 +447,8 @@ public final CommandObject<String> setGet(String key, String value) {
   }
 
   public final CommandObject<String> setGet(String key, String value, SetParams params) {
-    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params)
-        .add(Keyword.GET), BuilderFactory.STRING);
+    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params).add(Keyword.GET),
+        BuilderFactory.STRING);
   }
 
   public final CommandObject<String> getDel(String key) {
@@ -468,8 +468,8 @@ public final CommandObject<byte[]> setGet(byte[] key, byte[] value) {
   }
 
   public final CommandObject<byte[]> setGet(byte[] key, byte[] value, SetParams params) {
-    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params)
-        .add(Keyword.GET), BuilderFactory.BINARY);
+    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params).add(Keyword.GET),
+        BuilderFactory.BINARY);
   }
 
   public final CommandObject<byte[]> getDel(byte[] key) {
@@ -480,10 +480,18 @@ public final CommandObject<byte[]> getEx(byte[] key, GetExParams params) {
     return new CommandObject<>(commandArguments(Command.GETEX).key(key).addParams(params), BuilderFactory.BINARY);
   }
 
+  /**
+   * @deprecated Use {@link CommandObjects#setGet(java.lang.String, java.lang.String)}.
+   */
+  @Deprecated
   public final CommandObject<String> getSet(String key, String value) {
     return new CommandObject<>(commandArguments(Command.GETSET).key(key).add(value), BuilderFactory.STRING);
   }
 
+  /**
+   * @deprecated Use {@link CommandObjects#setGet(byte[], byte[])}.
+   */
+  @Deprecated
   public final CommandObject<byte[]> getSet(byte[] key, byte[] value) {
     return new CommandObject<>(commandArguments(Command.GETSET).key(key).add(value), BuilderFactory.BINARY);
   }
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 4e91ed1ca2..a9f6ceafe7 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -871,7 +871,9 @@ public long move(final byte[] key, final int dbIndex) {
    * @param key
    * @param value
    * @return Bulk reply
+   * @deprecated Use {@link Jedis#setGet(byte[], byte[])}.
    */
+  @Deprecated
   @Override
   public byte[] getSet(final byte[] key, final byte[] value) {
     checkIsInMultiOrPipeline();
@@ -5316,7 +5318,9 @@ public long move(final String key, final int dbIndex) {
    * @param key
    * @param value
    * @return Bulk reply
+   * @deprecated Use {@link Jedis#setGet(java.lang.String, java.lang.String)}.
    */
+  @Deprecated
   @Override
   public String getSet(final String key, final String value) {
     checkIsInMultiOrPipeline();
diff --git a/src/main/java/redis/clients/jedis/PipeliningBase.java b/src/main/java/redis/clients/jedis/PipeliningBase.java
index bf6711b632..e9b6d49b73 100644
--- a/src/main/java/redis/clients/jedis/PipeliningBase.java
+++ b/src/main/java/redis/clients/jedis/PipeliningBase.java
@@ -280,6 +280,11 @@ public Response<String> get(String key) {
     return appendCommand(commandObjects.get(key));
   }
 
+  @Override
+  public Response<String> setGet(String key, String value) {
+    return appendCommand(commandObjects.setGet(key, value));
+  }
+
   @Override
   public Response<String> setGet(String key, String value, SetParams params) {
     return appendCommand(commandObjects.setGet(key, value, params));
@@ -315,6 +320,10 @@ public Response<String> getrange(String key, long startOffset, long endOffset) {
     return appendCommand(commandObjects.getrange(key, startOffset, endOffset));
   }
 
+  /**
+   * @deprecated Use {@link PipeliningBase#setGet(java.lang.String, java.lang.String)}.
+   */
+  @Deprecated
   @Override
   public Response<String> getSet(String key, String value) {
     return appendCommand(commandObjects.getSet(key, value));
@@ -3114,6 +3123,11 @@ public Response<byte[]> get(byte[] key) {
     return appendCommand(commandObjects.get(key));
   }
 
+  @Override
+  public Response<byte[]> setGet(byte[] key, byte[] value) {
+    return appendCommand(commandObjects.setGet(key, value));
+  }
+
   @Override
   public Response<byte[]> setGet(byte[] key, byte[] value, SetParams params) {
     return appendCommand(commandObjects.setGet(key, value, params));
@@ -3149,6 +3163,10 @@ public Response<byte[]> getrange(byte[] key, long startOffset, long endOffset) {
     return appendCommand(commandObjects.getrange(key, startOffset, endOffset));
   }
 
+  /**
+   * @deprecated Use {@link PipeliningBase#setGet(byte[], byte[])}.
+   */
+  @Deprecated
   @Override
   public Response<byte[]> getSet(byte[] key, byte[] value) {
     return appendCommand(commandObjects.getSet(key, value));
diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
index a43ffc1090..14e67a0fa1 100644
--- a/src/main/java/redis/clients/jedis/UnifiedJedis.java
+++ b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -825,6 +825,10 @@ public byte[] getrange(byte[] key, long startOffset, long endOffset) {
     return executeCommand(commandObjects.getrange(key, startOffset, endOffset));
   }
 
+  /**
+   * @deprecated Use {@link UnifiedJedis#setGet(java.lang.String, java.lang.String)}.
+   */
+  @Deprecated
   @Override
   public String getSet(String key, String value) {
     return executeCommand(commandObjects.getSet(key, value));
@@ -845,6 +849,10 @@ public String psetex(String key, long milliseconds, String value) {
     return executeCommand(commandObjects.psetex(key, milliseconds, value));
   }
 
+  /**
+   * @deprecated Use {@link UnifiedJedis#setGet(byte[], byte[])}.
+   */
+  @Deprecated
   @Override
   public byte[] getSet(byte[] key, byte[] value) {
     return executeCommand(commandObjects.getSet(key, value));
diff --git a/src/main/java/redis/clients/jedis/commands/StringBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/StringBinaryCommands.java
index ca51b1a1af..0d087bc1b3 100644
--- a/src/main/java/redis/clients/jedis/commands/StringBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/StringBinaryCommands.java
@@ -27,6 +27,10 @@ public interface StringBinaryCommands extends BitBinaryCommands {
 
   byte[] getrange(byte[] key, long startOffset, long endOffset);
 
+  /**
+   * @deprecated Use {@link StringBinaryCommands#setGet(byte[], byte[])}.
+   */
+  @Deprecated
   byte[] getSet(byte[] key, byte[] value);
 
   long setnx(byte[] key, byte[] value);
diff --git a/src/main/java/redis/clients/jedis/commands/StringCommands.java b/src/main/java/redis/clients/jedis/commands/StringCommands.java
index 0621bc9334..c4ea21fea7 100644
--- a/src/main/java/redis/clients/jedis/commands/StringCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/StringCommands.java
@@ -116,7 +116,9 @@ public interface StringCommands extends BitCommands {
    * @param key
    * @param value
    * @return The old value that was stored in key
+   * @deprecated Use {@link StringCommands#setGet(java.lang.String, java.lang.String)}.
    */
+  @Deprecated
   String getSet(String key, String value);
 
   /**
diff --git a/src/main/java/redis/clients/jedis/commands/StringPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/StringPipelineBinaryCommands.java
index b4a114d565..13a4075986 100644
--- a/src/main/java/redis/clients/jedis/commands/StringPipelineBinaryCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/StringPipelineBinaryCommands.java
@@ -16,6 +16,8 @@ public interface StringPipelineBinaryCommands extends BitPipelineBinaryCommands
 
   Response<byte[]> get(byte[] key);
 
+  Response<byte[]> setGet(byte[] key, byte[] value);
+
   Response<byte[]> setGet(byte[] key, byte[] value, SetParams params);
 
   Response<byte[]> getDel(byte[] key);
@@ -26,6 +28,10 @@ public interface StringPipelineBinaryCommands extends BitPipelineBinaryCommands
 
   Response<byte[]> getrange(byte[] key, long startOffset, long endOffset);
 
+  /**
+   * @deprecated {@link StringPipelineBinaryCommands#setGet(byte[], byte[], redis.clients.jedis.params.SetParams)}.
+   */
+  @Deprecated
   Response<byte[]> getSet(byte[] key, byte[] value);
 
   Response<Long> setnx(byte[] key, byte[] value);
diff --git a/src/main/java/redis/clients/jedis/commands/StringPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/StringPipelineCommands.java
index 6af9968ebe..c037ed6fde 100644
--- a/src/main/java/redis/clients/jedis/commands/StringPipelineCommands.java
+++ b/src/main/java/redis/clients/jedis/commands/StringPipelineCommands.java
@@ -16,6 +16,8 @@ public interface StringPipelineCommands extends BitPipelineCommands {
 
   Response<String> get(String key);
 
+  Response<String> setGet(String key, String value);
+
   Response<String> setGet(String key, String value, SetParams params);
 
   Response<String> getDel(String key);
@@ -26,6 +28,10 @@ public interface StringPipelineCommands extends BitPipelineCommands {
 
   Response<String> getrange(String key, long startOffset, long endOffset);
 
+  /**
+   * @deprecated Use {@link StringPipelineCommands#setGet(java.lang.String, java.lang.String)}.
+   */
+  @Deprecated
   Response<String> getSet(String key, String value);
 
   Response<Long> setnx(String key, String value);