diff --git a/doc/iscsi.md b/doc/iscsi.md
index 62e11939d..f97603de3 100644
--- a/doc/iscsi.md
+++ b/doc/iscsi.md
@@ -104,7 +104,7 @@ In addition to the configuration file, the iSCSI target may also be configured v
 ### Target nodes
 
  - iscsi_create_target_node -- Add a iSCSI target node.
- - delete_target_node -- Delete a iSCSI target node.
+ - iscsi_delete_target_node -- Delete a iSCSI target node.
  - iscsi_target_node_add_lun -- Add an LUN to an existing iSCSI target node.
  - iscsi_get_target_nodes -- Show information about all available iSCSI target nodes.
 
diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md
index 534aeed24..bb808c328 100644
--- a/doc/jsonrpc.md
+++ b/doc/jsonrpc.md
@@ -260,7 +260,7 @@ Example response:
     "iscsi_delete_portal_group",
     "iscsi_create_portal_group",
     "iscsi_get_portal_groups",
-    "delete_target_node",
+    "iscsi_delete_target_node",
     "iscsi_target_node_remove_pg_ig_maps",
     "iscsi_target_node_add_pg_ig_maps",
     "iscsi_create_target_node",
@@ -3398,7 +3398,7 @@ Example response:
 }
 ~~~
 
-## delete_target_node method {#rpc_delete_target_node}
+## iscsi_delete_target_node method {#rpc_iscsi_delete_target_node}
 
 Delete a iSCSI target node.
 
@@ -3418,7 +3418,7 @@ Example request:
     "name": "iqn.2016-06.io.spdk:target1"
   },
   "jsonrpc": "2.0",
-  "method": "delete_target_node",
+  "method": "iscsi_delete_target_node",
   "id": 1
 }
 ~~~
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index e2d0d2256..a07e7cdd5 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -624,32 +624,32 @@ SPDK_RPC_REGISTER("iscsi_target_node_remove_pg_ig_maps",
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_remove_pg_ig_maps,
 				   delete_pg_ig_maps)
 
-struct rpc_delete_target_node {
+struct rpc_iscsi_delete_target_node {
 	char *name;
 };
 
 static void
-free_rpc_delete_target_node(struct rpc_delete_target_node *r)
+free_rpc_iscsi_delete_target_node(struct rpc_iscsi_delete_target_node *r)
 {
 	free(r->name);
 }
 
-static const struct spdk_json_object_decoder rpc_delete_target_node_decoders[] = {
-	{"name", offsetof(struct rpc_delete_target_node, name), spdk_json_decode_string},
+static const struct spdk_json_object_decoder rpc_iscsi_delete_target_node_decoders[] = {
+	{"name", offsetof(struct rpc_iscsi_delete_target_node, name), spdk_json_decode_string},
 };
 
-struct rpc_delete_target_node_ctx {
-	struct rpc_delete_target_node req;
+struct rpc_iscsi_delete_target_node_ctx {
+	struct rpc_iscsi_delete_target_node req;
 	struct spdk_jsonrpc_request *request;
 };
 
 static void
-rpc_delete_target_node_done(void *cb_arg, int rc)
+rpc_iscsi_delete_target_node_done(void *cb_arg, int rc)
 {
-	struct rpc_delete_target_node_ctx *ctx = cb_arg;
+	struct rpc_iscsi_delete_target_node_ctx *ctx = cb_arg;
 	struct spdk_json_write_ctx *w;
 
-	free_rpc_delete_target_node(&ctx->req);
+	free_rpc_iscsi_delete_target_node(&ctx->req);
 
 	w = spdk_jsonrpc_begin_result(ctx->request);
 	spdk_json_write_bool(w, rc == 0);
@@ -659,10 +659,10 @@ rpc_delete_target_node_done(void *cb_arg, int rc)
 }
 
 static void
-spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,
-			    const struct spdk_json_val *params)
+spdk_rpc_iscsi_delete_target_node(struct spdk_jsonrpc_request *request,
+				  const struct spdk_json_val *params)
 {
-	struct rpc_delete_target_node_ctx *ctx;
+	struct rpc_iscsi_delete_target_node_ctx *ctx;
 
 	ctx = calloc(1, sizeof(*ctx));
 	if (!ctx) {
@@ -671,8 +671,8 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,
 		return;
 	}
 
-	if (spdk_json_decode_object(params, rpc_delete_target_node_decoders,
-				    SPDK_COUNTOF(rpc_delete_target_node_decoders),
+	if (spdk_json_decode_object(params, rpc_iscsi_delete_target_node_decoders,
+				    SPDK_COUNTOF(rpc_iscsi_delete_target_node_decoders),
 				    &ctx->req)) {
 		SPDK_ERRLOG("spdk_json_decode_object failed\n");
 		goto invalid;
@@ -686,15 +686,16 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,
 	ctx->request = request;
 
 	spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name,
-					     rpc_delete_target_node_done, ctx);
+					     rpc_iscsi_delete_target_node_done, ctx);
 	return;
 
 invalid:
 	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
-	free_rpc_delete_target_node(&ctx->req);
+	free_rpc_iscsi_delete_target_node(&ctx->req);
 	free(ctx);
 }
-SPDK_RPC_REGISTER("delete_target_node", spdk_rpc_delete_target_node, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("iscsi_delete_target_node", spdk_rpc_iscsi_delete_target_node, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_target_node, delete_target_node)
 
 static void
 spdk_rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request,
diff --git a/scripts/rpc.py b/scripts/rpc.py
index 2f67354e7..738bc6a4c 100755
--- a/scripts/rpc.py
+++ b/scripts/rpc.py
@@ -1074,15 +1074,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     This parameter can be omitted.  Example: '255.255.0.0 255.248.0.0' etc""", required=False)
     p.set_defaults(func=iscsi_initiator_group_remove_initiators)
 
-    def delete_target_node(args):
-        rpc.iscsi.delete_target_node(
+    def iscsi_delete_target_node(args):
+        rpc.iscsi.iscsi_delete_target_node(
             args.client, target_node_name=args.target_node_name)
 
-    p = subparsers.add_parser('delete_target_node',
+    p = subparsers.add_parser('iscsi_delete_target_node', aliases=['delete_target_node'],
                               help='Delete a target node')
     p.add_argument('target_node_name',
                    help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.')
-    p.set_defaults(func=delete_target_node)
+    p.set_defaults(func=iscsi_delete_target_node)
 
     def iscsi_delete_portal_group(args):
         rpc.iscsi.iscsi_delete_portal_group(args.client, tag=args.tag)
diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py
index e4779e1a0..d44de11c3 100644
--- a/scripts/rpc/iscsi.py
+++ b/scripts/rpc/iscsi.py
@@ -452,7 +452,8 @@ def iscsi_initiator_group_remove_initiators(
     return client.call('iscsi_initiator_group_remove_initiators', params)
 
 
-def delete_target_node(client, target_node_name):
+@deprecated_alias('delete_target_node')
+def iscsi_delete_target_node(client, target_node_name):
     """Delete a target node.
 
     Args:
@@ -462,7 +463,7 @@ def delete_target_node(client, target_node_name):
         True or False
     """
     params = {'name': target_node_name}
-    return client.call('delete_target_node', params)
+    return client.call('iscsi_delete_target_node', params)
 
 
 @deprecated_alias('delete_portal_group')
diff --git a/scripts/spdkcli/ui_node_iscsi.py b/scripts/spdkcli/ui_node_iscsi.py
index 9ab0a2e5c..287c87c12 100644
--- a/scripts/spdkcli/ui_node_iscsi.py
+++ b/scripts/spdkcli/ui_node_iscsi.py
@@ -71,7 +71,7 @@ class UIISCSIDevices(UINode):
                     UIISCSIDevice(device, node, self)
 
     def delete(self, name):
-        self.get_root().delete_target_node(target_node_name=name)
+        self.get_root().iscsi_delete_target_node(target_node_name=name)
 
     def ui_command_create(self, name, alias_name, bdev_name_id_pairs,
                           pg_ig_mappings, queue_depth, g=None, d=None, r=None,
diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py
index 2304cbcd9..95f862886 100644
--- a/scripts/spdkcli/ui_root.py
+++ b/scripts/spdkcli/ui_root.py
@@ -387,8 +387,8 @@ class UIRoot(UINode):
         rpc.iscsi.iscsi_create_target_node(self.client, **kwargs)
 
     @verbose
-    def delete_target_node(self, **kwargs):
-        rpc.iscsi.delete_target_node(self.client, **kwargs)
+    def iscsi_delete_target_node(self, **kwargs):
+        rpc.iscsi.iscsi_delete_target_node(self.client, **kwargs)
 
     @verbose
     @is_method_available
diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh
index 2ad71c145..d1045021a 100755
--- a/test/iscsi_tgt/ext4test/ext4test.sh
+++ b/test/iscsi_tgt/ext4test/ext4test.sh
@@ -67,7 +67,7 @@ set -e
 
 iscsicleanup
 $rpc_py bdev_error_inject_error EE_Malloc0 'clear' 'failure'
-$rpc_py delete_target_node $node_base:Target0
+$rpc_py iscsi_delete_target_node $node_base:Target0
 echo "Error injection test done"
 
 if [ -z "$NO_NVME" ]; then
diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh
index ecbfb6b8f..bff2dfc90 100755
--- a/test/iscsi_tgt/fio/fio.sh
+++ b/test/iscsi_tgt/fio/fio.sh
@@ -142,7 +142,7 @@ else
 fi
 
 iscsicleanup
-$rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target3'
+$rpc_py iscsi_delete_target_node 'iqn.2016-06.io.spdk:Target3'
 
 delete_tmp_files
 
diff --git a/test/iscsi_tgt/qos/qos.sh b/test/iscsi_tgt/qos/qos.sh
index 4acee4dcd..6da04cb9e 100755
--- a/test/iscsi_tgt/qos/qos.sh
+++ b/test/iscsi_tgt/qos/qos.sh
@@ -133,7 +133,7 @@ verify_qos_limits $BANDWIDTH_RESULT $READ_BANDWIDTH_LIMIT
 echo "I/O bandwidth limiting tests successful"
 
 iscsicleanup
-$rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target1'
+$rpc_py iscsi_delete_target_node 'iqn.2016-06.io.spdk:Target1'
 
 rm -f ./local-job0-0-verify.state
 trap - SIGINT SIGTERM EXIT
diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py
index a3e127d50..2fc73ad36 100755
--- a/test/iscsi_tgt/rpc_config/rpc_config.py
+++ b/test/iscsi_tgt/rpc_config/rpc_config.py
@@ -127,7 +127,7 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
     check_output('iscsiadm -m node -o delete', shell=True)
     rpc.iscsi_delete_initiator_group(initiator_tag)
     rpc.iscsi_delete_portal_group(portal_tag)
-    rpc.delete_target_node(name)
+    rpc.iscsi_delete_target_node(name)
     output = rpc.iscsi_get_connections()
     jsonvalues = json.loads(output)
     verify(not jsonvalues, 1,
@@ -168,7 +168,7 @@ def verify_scsi_devices_rpc_methods(rpc_py):
     check_output('iscsiadm -m node -o delete', shell=True)
     rpc.iscsi_delete_initiator_group(initiator_tag)
     rpc.iscsi_delete_portal_group(portal_tag)
-    rpc.delete_target_node(name)
+    rpc.iscsi_delete_target_node(name)
     output = rpc.get_scsi_devices()
     jsonvalues = json.loads(output)
     verify(not jsonvalues, 1,
@@ -381,7 +381,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
     verify(jsonvalues[0]['luns'][1]['lun_id'] == 1, 1,
            "lun id value is {}, expected 1".format(jsonvalues[0]['luns'][1]['lun_id']))
 
-    rpc.delete_target_node(name)
+    rpc.iscsi_delete_target_node(name)
     output = rpc.iscsi_get_target_nodes()
     jsonvalues = json.loads(output)
     verify(not jsonvalues, 1,
@@ -392,7 +392,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
 
     rpc.iscsi_delete_portal_group(portal_tag)
     rpc.iscsi_delete_initiator_group(initiator_tag)
-    rpc.delete_target_node(name)
+    rpc.iscsi_delete_target_node(name)
     output = rpc.iscsi_get_target_nodes()
     jsonvalues = json.loads(output)
     if not jsonvalues:
diff --git a/test/iscsi_tgt/trace_record/trace_record.sh b/test/iscsi_tgt/trace_record/trace_record.sh
index 384250f3c..5e6f231db 100755
--- a/test/iscsi_tgt/trace_record/trace_record.sh
+++ b/test/iscsi_tgt/trace_record/trace_record.sh
@@ -85,7 +85,7 @@ iscsicleanup
 RPCS=
 # Delete Malloc blockdevs and targets
 for i in $(seq 0 $CONNECTION_NUMBER); do
-	RPCS+="delete_target_node iqn.2016-06.io.spdk:Target$i\n"
+	RPCS+="iscsi_delete_target_node iqn.2016-06.io.spdk:Target$i\n"
 	RPCS+="bdev_malloc_delete Malloc$i\n"
 done
 echo -e $RPCS | $rpc_py
diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py
index ee679841f..fef3216f4 100755
--- a/test/json_config/clear_config.py
+++ b/test/json_config/clear_config.py
@@ -88,7 +88,7 @@ def clear_nvmf_subsystem(args, nvmf_config):
 def get_iscsi_destroy_method(iscsi):
     delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
                          'iscsi_create_initiator_group': "iscsi_delete_initiator_group",
-                         'iscsi_create_target_node': "delete_target_node",
+                         'iscsi_create_target_node': "iscsi_delete_target_node",
                          'iscsi_set_options': None
                          }
     return delete_method_map[iscsi['method']]