diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md
index b81c8399e..9a51ddc44 100644
--- a/doc/jsonrpc.md
+++ b/doc/jsonrpc.md
@@ -2653,7 +2653,7 @@ Example response:
   }
 }
 ~~~
-## set_iscsi_discovery_auth method {#rpc_set_iscsi_discovery_auth}
+## iscsi_set_discovery_auth method {#rpc_iscsi_set_discovery_auth}
 
 Set CHAP authentication for sessions dynamically.
 
@@ -2681,7 +2681,7 @@ request:
     "mutual_chap": true
   },
   "jsonrpc": "2.0",
-  "method": "set_iscsi_discovery_auth",
+  "method": "iscsi_set_discovery_auth",
   "id": 1
 }
 ~~~
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index 1c15a42b0..f236e494d 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -1121,7 +1121,7 @@ static const struct spdk_json_object_decoder rpc_discovery_auth_decoders[] = {
 };
 
 static void
-spdk_rpc_set_iscsi_discovery_auth(struct spdk_jsonrpc_request *request,
+spdk_rpc_iscsi_set_discovery_auth(struct spdk_jsonrpc_request *request,
 				  const struct spdk_json_val *params)
 {
 	struct rpc_discovery_auth req = {};
@@ -1148,8 +1148,8 @@ spdk_rpc_set_iscsi_discovery_auth(struct spdk_jsonrpc_request *request,
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
-SPDK_RPC_REGISTER("set_iscsi_discovery_auth", spdk_rpc_set_iscsi_discovery_auth, SPDK_RPC_RUNTIME)
-
+SPDK_RPC_REGISTER("iscsi_set_discovery_auth", spdk_rpc_iscsi_set_discovery_auth, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_discovery_auth, set_iscsi_discovery_auth)
 
 #define MAX_AUTH_SECRETS	64
 
diff --git a/scripts/rpc.py b/scripts/rpc.py
index fa09fcae0..a5028d792 100755
--- a/scripts/rpc.py
+++ b/scripts/rpc.py
@@ -730,15 +730,16 @@ if __name__ == "__main__":
     p.add_argument('-p', '--allow-duplicated-isid', help='Allow duplicated initiator session ID.', action='store_true')
     p.set_defaults(func=iscsi_set_options)
 
-    def set_iscsi_discovery_auth(args):
-        rpc.iscsi.set_iscsi_discovery_auth(
+    def iscsi_set_discovery_auth(args):
+        rpc.iscsi.iscsi_set_discovery_auth(
             args.client,
             disable_chap=args.disable_chap,
             require_chap=args.require_chap,
             mutual_chap=args.mutual_chap,
             chap_group=args.chap_group)
 
-    p = subparsers.add_parser('set_iscsi_discovery_auth', help="""Set CHAP authentication for discovery session.""")
+    p = subparsers.add_parser('iscsi_set_discovery_auth', aliases=['set_iscsi_discovery_auth'],
+                              help="""Set CHAP authentication for discovery session.""")
     p.add_argument('-d', '--disable-chap', help="""CHAP for discovery session should be disabled.
     *** Mutually exclusive with --require-chap""", action='store_true')
     p.add_argument('-r', '--require-chap', help="""CHAP for discovery session should be required.
@@ -746,7 +747,7 @@ if __name__ == "__main__":
     p.add_argument('-m', '--mutual-chap', help='CHAP for discovery session should be mutual', action='store_true')
     p.add_argument('-g', '--chap-group', help="""Authentication group ID for discovery session.
     *** Authentication group must be precreated ***""", type=int)
-    p.set_defaults(func=set_iscsi_discovery_auth)
+    p.set_defaults(func=iscsi_set_discovery_auth)
 
     def add_iscsi_auth_group(args):
         secrets = None
diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py
index 1900c5971..4db0cee86 100644
--- a/scripts/rpc/iscsi.py
+++ b/scripts/rpc/iscsi.py
@@ -85,7 +85,8 @@ def iscsi_set_options(
     return client.call('iscsi_set_options', params)
 
 
-def set_iscsi_discovery_auth(
+@deprecated_alias('set_iscsi_discovery_auth')
+def iscsi_set_discovery_auth(
         client,
         disable_chap=None,
         require_chap=None,
@@ -113,7 +114,7 @@ def set_iscsi_discovery_auth(
     if chap_group:
         params['chap_group'] = chap_group
 
-    return client.call('set_iscsi_discovery_auth', params)
+    return client.call('iscsi_set_discovery_auth', params)
 
 
 def get_iscsi_auth_groups(client):
diff --git a/scripts/spdkcli/ui_node_iscsi.py b/scripts/spdkcli/ui_node_iscsi.py
index c1bcab209..b5dc87457 100644
--- a/scripts/spdkcli/ui_node_iscsi.py
+++ b/scripts/spdkcli/ui_node_iscsi.py
@@ -44,7 +44,7 @@ class UIISCSIGlobalParams(UINode):
         disable_chap = self.ui_eval_param(d, "bool", None)
         require_chap = self.ui_eval_param(r, "bool", None)
         mutual_chap = self.ui_eval_param(m, "bool", None)
-        self.get_root().set_iscsi_discovery_auth(
+        self.get_root().iscsi_set_discovery_auth(
             chap_group=chap_group, disable_chap=disable_chap,
             require_chap=require_chap, mutual_chap=mutual_chap)
 
diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py
index 841dcd98f..c84545671 100644
--- a/scripts/spdkcli/ui_root.py
+++ b/scripts/spdkcli/ui_root.py
@@ -473,8 +473,8 @@ class UIRoot(UINode):
         rpc.iscsi.iscsi_target_node_add_lun(self.client, **kwargs)
 
     @verbose
-    def set_iscsi_discovery_auth(self, **kwargs):
-        rpc.iscsi.set_iscsi_discovery_auth(self.client, **kwargs)
+    def iscsi_set_discovery_auth(self, **kwargs):
+        rpc.iscsi.iscsi_set_discovery_auth(self.client, **kwargs)
 
     @verbose
     @is_method_available
diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index 175c61870..cbd1db34a 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -44,7 +44,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py add_iscsi_auth_group 1 -c 'user:root secret:tester'
-$rpc_py set_iscsi_discovery_auth -g 1
+$rpc_py iscsi_set_discovery_auth -g 1
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
 $rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE