diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md
index a70b8c85e..114321311 100644
--- a/doc/jsonrpc.md
+++ b/doc/jsonrpc.md
@@ -300,7 +300,7 @@ Example response:
     "delete_ftl_bdev",
     "construct_ftl_bdev",
     "bdev_lvol_get_lvstores",
-    "destroy_lvol_bdev",
+    "bdev_lvol_delete",
     "bdev_lvol_resize",
     "bdev_lvol_set_read_only",
     "bdev_lvol_decouple_parent",
@@ -5180,7 +5180,7 @@ Example response:
 }
 ~~~
 
-## destroy_lvol_bdev {#rpc_destroy_lvol_bdev}
+## bdev_lvol_delete {#rpc_bdev_lvol_delete}
 
 Destroy a logical volume.
 
@@ -5197,7 +5197,7 @@ Example request:
 ~~~
 {
   "jsonrpc": "2.0",
-  "method": "destroy_lvol_bdev",
+  "method": "bdev_lvol_delete",
   "id": 1,
   "params": {
     "name": "51638754-ca16-43a7-9f8f-294a0805ab0a"
diff --git a/doc/lvol.md b/doc/lvol.md
index ce3c9e527..5e2862bb8 100644
--- a/doc/lvol.md
+++ b/doc/lvol.md
@@ -94,7 +94,7 @@ destroy_lvol_store [-h] [-u UUID] [-l LVS_NAME]
     Destroy lvolstore on specified bdev. Removes lvolstore along with lvols on
     it. User can identify lvol store by UUID or its name. Note that destroying
     lvolstore requires using this call, while deleting single lvol requires
-    using destroy_lvol_bdev rpc call.
+    using bdev_lvol_delete rpc call.
     optional arguments:
     -h, --help  show help
 bdev_lvol_get_lvstores [-h] [-u UUID] [-l LVS_NAME]
@@ -125,7 +125,7 @@ get_bdevs [-h] [-b NAME]
     optional arguments:
     -h, --help  show help
     -b NAME, --name NAME  Name of the block device. Example: Nvme0n1
-destroy_lvol_bdev [-h] bdev_name
+bdev_lvol_delete [-h] bdev_name
     Deletes a logical volume previously created by construct_lvol_bdev.
     optional arguments:
     -h, --help  show help
diff --git a/module/bdev/lvol/vbdev_lvol_rpc.c b/module/bdev/lvol/vbdev_lvol_rpc.c
index 16814cd2e..128f8f073 100644
--- a/module/bdev/lvol/vbdev_lvol_rpc.c
+++ b/module/bdev/lvol/vbdev_lvol_rpc.c
@@ -918,22 +918,22 @@ cleanup:
 SPDK_RPC_REGISTER("bdev_lvol_set_read_only", spdk_rpc_bdev_lvol_set_read_only, SPDK_RPC_RUNTIME)
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_set_read_only, set_read_only_lvol_bdev)
 
-struct rpc_destroy_lvol_bdev {
+struct rpc_bdev_lvol_delete {
 	char *name;
 };
 
 static void
-free_rpc_destroy_lvol_bdev(struct rpc_destroy_lvol_bdev *req)
+free_rpc_bdev_lvol_delete(struct rpc_bdev_lvol_delete *req)
 {
 	free(req->name);
 }
 
-static const struct spdk_json_object_decoder rpc_destroy_lvol_bdev_decoders[] = {
-	{"name", offsetof(struct rpc_destroy_lvol_bdev, name), spdk_json_decode_string},
+static const struct spdk_json_object_decoder rpc_bdev_lvol_delete_decoders[] = {
+	{"name", offsetof(struct rpc_bdev_lvol_delete, name), spdk_json_decode_string},
 };
 
 static void
-_spdk_rpc_destroy_lvol_bdev_cb(void *cb_arg, int lvolerrno)
+_spdk_rpc_bdev_lvol_delete_cb(void *cb_arg, int lvolerrno)
 {
 	struct spdk_json_write_ctx *w;
 	struct spdk_jsonrpc_request *request = cb_arg;
@@ -953,15 +953,15 @@ invalid:
 }
 
 static void
-spdk_rpc_destroy_lvol_bdev(struct spdk_jsonrpc_request *request,
-			   const struct spdk_json_val *params)
+spdk_rpc_bdev_lvol_delete(struct spdk_jsonrpc_request *request,
+			  const struct spdk_json_val *params)
 {
-	struct rpc_destroy_lvol_bdev req = {};
+	struct rpc_bdev_lvol_delete req = {};
 	struct spdk_bdev *bdev;
 	struct spdk_lvol *lvol;
 
-	if (spdk_json_decode_object(params, rpc_destroy_lvol_bdev_decoders,
-				    SPDK_COUNTOF(rpc_destroy_lvol_bdev_decoders),
+	if (spdk_json_decode_object(params, rpc_bdev_lvol_delete_decoders,
+				    SPDK_COUNTOF(rpc_bdev_lvol_delete_decoders),
 				    &req)) {
 		SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "spdk_json_decode_object failed\n");
 		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
@@ -982,13 +982,14 @@ spdk_rpc_destroy_lvol_bdev(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	vbdev_lvol_destroy(lvol, _spdk_rpc_destroy_lvol_bdev_cb, request);
+	vbdev_lvol_destroy(lvol, _spdk_rpc_bdev_lvol_delete_cb, request);
 
 cleanup:
-	free_rpc_destroy_lvol_bdev(&req);
+	free_rpc_bdev_lvol_delete(&req);
 }
 
-SPDK_RPC_REGISTER("destroy_lvol_bdev", spdk_rpc_destroy_lvol_bdev, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("bdev_lvol_delete", spdk_rpc_bdev_lvol_delete, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_delete, destroy_lvol_bdev)
 
 struct rpc_bdev_lvol_get_lvstores {
 	char *uuid;
diff --git a/scripts/rpc.py b/scripts/rpc.py
index eee404d10..fb2e94e62 100755
--- a/scripts/rpc.py
+++ b/scripts/rpc.py
@@ -1267,13 +1267,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     p.add_argument('name', help='lvol bdev name')
     p.set_defaults(func=bdev_lvol_set_read_only)
 
-    def destroy_lvol_bdev(args):
-        rpc.lvol.destroy_lvol_bdev(args.client,
-                                   name=args.name)
+    def bdev_lvol_delete(args):
+        rpc.lvol.bdev_lvol_delete(args.client,
+                                  name=args.name)
 
-    p = subparsers.add_parser('destroy_lvol_bdev', help='Destroy a logical volume')
+    p = subparsers.add_parser('bdev_lvol_delete', aliases=['destroy_lvol_bdev'],
+                              help='Destroy a logical volume')
     p.add_argument('name', help='lvol bdev name')
-    p.set_defaults(func=destroy_lvol_bdev)
+    p.set_defaults(func=bdev_lvol_delete)
 
     def destroy_lvol_store(args):
         rpc.lvol.destroy_lvol_store(args.client,
diff --git a/scripts/rpc/lvol.py b/scripts/rpc/lvol.py
index e32f6b791..6809924e5 100644
--- a/scripts/rpc/lvol.py
+++ b/scripts/rpc/lvol.py
@@ -144,7 +144,8 @@ def bdev_lvol_set_read_only(client, name):
     return client.call('bdev_lvol_set_read_only', params)
 
 
-def destroy_lvol_bdev(client, name):
+@deprecated_alias('destroy_lvol_bdev')
+def bdev_lvol_delete(client, name):
     """Destroy a logical volume.
 
     Args:
@@ -153,7 +154,7 @@ def destroy_lvol_bdev(client, name):
     params = {
         'name': name,
     }
-    return client.call('destroy_lvol_bdev', params)
+    return client.call('bdev_lvol_delete', params)
 
 
 @deprecated_alias('inflate_lvol_bdev')
diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py
index 5e1f9a0fb..22e856f68 100644
--- a/scripts/spdkcli/ui_node.py
+++ b/scripts/spdkcli/ui_node.py
@@ -238,7 +238,7 @@ class UILvolBdev(UIBdev):
         UIBdev.__init__(self, "logical_volume", parent)
 
     def delete(self, name):
-        self.get_root().destroy_lvol_bdev(name=name)
+        self.get_root().bdev_lvol_delete(name=name)
 
     def ui_command_create(self, name, size, lvs, thin_provision=None):
         """
diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py
index 48354d908..2c3d9036d 100644
--- a/scripts/spdkcli/ui_root.py
+++ b/scripts/spdkcli/ui_root.py
@@ -158,8 +158,8 @@ class UIRoot(UINode):
         return response
 
     @verbose
-    def destroy_lvol_bdev(self, **kwargs):
-        response = rpc.lvol.destroy_lvol_bdev(self.client, **kwargs)
+    def bdev_lvol_delete(self, **kwargs):
+        response = rpc.lvol.bdev_lvol_delete(self.client, **kwargs)
         return response
 
     @verbose
diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh
index 413bfac3f..1642b36e6 100755
--- a/test/iscsi_tgt/filesystem/filesystem.sh
+++ b/test/iscsi_tgt/filesystem/filesystem.sh
@@ -16,7 +16,7 @@ rpc_py="$rootdir/scripts/rpc.py"
 # Remove lvol bdevs and stores.
 function remove_backends() {
 	echo "INFO: Removing lvol bdev"
-	$rpc_py destroy_lvol_bdev "lvs_0/lbd_0"
+	$rpc_py bdev_lvol_delete "lvs_0/lbd_0"
 
 	echo "INFO: Removing lvol stores"
 	$rpc_py destroy_lvol_store -l lvs_0
diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh
index 8f58a6ea0..b6c5073e7 100755
--- a/test/iscsi_tgt/multiconnection/multiconnection.sh
+++ b/test/iscsi_tgt/multiconnection/multiconnection.sh
@@ -19,7 +19,7 @@ function remove_backends() {
 	echo "INFO: Removing lvol bdevs"
 	for i in $(seq 1 $CONNECTION_NUMBER); do
 		lun="lvs0/lbd_$i"
-		$rpc_py destroy_lvol_bdev $lun
+		$rpc_py bdev_lvol_delete $lun
 		echo -e "\tINFO: lvol bdev $lun removed"
 	done
 	sleep 1
diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh
index de9bc4b22..a66ec8aeb 100755
--- a/test/json_config/json_config.sh
+++ b/test/json_config/json_config.sh
@@ -252,9 +252,9 @@ function cleanup_bdev_subsystem_config() {
 	timing_enter $FUNCNAME
 
 	if [[ $SPDK_TEST_BLOCKDEV -eq 1 ]]; then
-		tgt_rpc destroy_lvol_bdev     lvs_test/clone0
-		tgt_rpc destroy_lvol_bdev     lvs_test/lvol0
-		tgt_rpc destroy_lvol_bdev     lvs_test/snapshot0
+		tgt_rpc bdev_lvol_delete     lvs_test/clone0
+		tgt_rpc bdev_lvol_delete     lvs_test/lvol0
+		tgt_rpc bdev_lvol_delete     lvs_test/snapshot0
 		tgt_rpc destroy_lvol_store -l lvs_test
 	fi
 
diff --git a/test/lvol/rpc_commands_lib.py b/test/lvol/rpc_commands_lib.py
index 27ed2cd03..cdff5fc21 100644
--- a/test/lvol/rpc_commands_lib.py
+++ b/test/lvol/rpc_commands_lib.py
@@ -154,9 +154,9 @@ class Commands_Rpc(object):
         output, rc = self.rpc.delete_malloc_bdev(base_name)
         return rc
 
-    def destroy_lvol_bdev(self, bdev_name):
-        print("INFO: RPC COMMAND destroy_lvol_bdev")
-        output, rc = self.rpc.destroy_lvol_bdev(bdev_name)
+    def bdev_lvol_delete(self, bdev_name):
+        print("INFO: RPC COMMAND bdev_lvol_delete")
+        output, rc = self.rpc.bdev_lvol_delete(bdev_name)
         return rc
 
     def bdev_lvol_resize(self, uuid, new_size):
diff --git a/test/lvol/test_cases.py b/test/lvol/test_cases.py
index 8639a21cf..16822cf03 100644
--- a/test/lvol/test_cases.py
+++ b/test/lvol/test_cases.py
@@ -370,7 +370,7 @@ class TestCases(object):
         # Check correct uuid values in response get_bdevs command
         fail_count += self.c.check_get_bdevs_methods(uuid_bdev,
                                                      lvs_size)
-        self.c.destroy_lvol_bdev(uuid_bdev)
+        self.c.bdev_lvol_delete(uuid_bdev)
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
 
@@ -415,7 +415,7 @@ class TestCases(object):
                 fail_count += self.c.check_get_bdevs_methods(uuid_bdev, size)
 
             for uuid_bdev in uuid_bdevs:
-                self.c.destroy_lvol_bdev(uuid_bdev)
+                self.c.bdev_lvol_delete(uuid_bdev)
 
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
@@ -453,7 +453,7 @@ class TestCases(object):
         fail_count += self.c.check_get_bdevs_methods(uuid_bdev,
                                                      lvs_size)
 
-        fail_count += self.c.destroy_lvol_bdev(uuid_bdev)
+        fail_count += self.c.bdev_lvol_delete(uuid_bdev)
         fail_count += self.c.destroy_lvol_store(uuid_store)
         fail_count += self.c.delete_malloc_bdev(base_name)
 
@@ -501,8 +501,8 @@ class TestCases(object):
         fail_count += self.c.check_get_bdevs_methods(uuid_bdev_1, lvs_size)
         fail_count += self.c.check_get_bdevs_methods(uuid_bdev_2, lvs_size)
 
-        fail_count += self.c.destroy_lvol_bdev(uuid_bdev_1)
-        fail_count += self.c.destroy_lvol_bdev(uuid_bdev_2)
+        fail_count += self.c.bdev_lvol_delete(uuid_bdev_1)
+        fail_count += self.c.bdev_lvol_delete(uuid_bdev_2)
         fail_count += self.c.destroy_lvol_store(uuid_store_1)
         fail_count += self.c.destroy_lvol_store(uuid_store_2)
         fail_count += self.c.delete_malloc_bdev(base_name_1)
@@ -567,7 +567,7 @@ class TestCases(object):
                                       lvs_size) == 0:
             fail_count += 1
 
-        self.c.destroy_lvol_bdev(uuid_bdev)
+        self.c.bdev_lvol_delete(uuid_bdev)
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
 
@@ -610,7 +610,7 @@ class TestCases(object):
                                       size) == 0:
             fail_count += 1
 
-        self.c.destroy_lvol_bdev(uuid_bdev)
+        self.c.bdev_lvol_delete(uuid_bdev)
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
 
@@ -666,7 +666,7 @@ class TestCases(object):
         # Check size of the lvol bdev by rpc command get_bdevs
         fail_count += self.c.check_get_bdevs_methods(uuid_bdev, size)
 
-        self.c.destroy_lvol_bdev(uuid_bdev)
+        self.c.bdev_lvol_delete(uuid_bdev)
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
         # Expected result:
@@ -724,7 +724,7 @@ class TestCases(object):
         if self.c.bdev_lvol_resize(uuid_bdev, self.total_size + 1) == 0:
             fail_count += 1
 
-        self.c.destroy_lvol_bdev(uuid_bdev)
+        self.c.bdev_lvol_delete(uuid_bdev)
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
 
@@ -1201,7 +1201,7 @@ class TestCases(object):
     @case_message
     def test_case551(self):
         """
-        destroy_lvol_bdev_ordering
+        bdev_lvol_delete_ordering
 
         Test for destroying lvol bdevs in particular order.
         Check destroying wrong one is not possible and returns error.
@@ -1238,15 +1238,15 @@ class TestCases(object):
         clone_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + clone_name)
 
         # Try to destroy snapshot with clones and check if it fails
-        ret_value = self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        ret_value = self.c.bdev_lvol_delete(snapshot_bdev['name'])
         if ret_value == 0:
             print("ERROR: Delete snapshot should fail but didn't")
             fail_count += 1
 
         # Destroy clone and then snapshot
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
-        fail_count += self.c.destroy_lvol_bdev(clone_bdev['name'])
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(clone_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -1303,7 +1303,7 @@ class TestCases(object):
         snapshot_bdev2 = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name2)
 
         # Try to destroy snapshot with 2 clones and check if it fails
-        ret_value = self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        ret_value = self.c.bdev_lvol_delete(snapshot_bdev['name'])
         if ret_value == 0:
             print("ERROR: Delete snapshot should fail but didn't")
             fail_count += 1
@@ -1527,7 +1527,7 @@ class TestCases(object):
 
         fail_count += self.c.stop_nbd_disk(nbd_name)
         # destroy thin provisioned lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         lvs = self.c.bdev_lvol_get_lvstores(self.lvs_name)[0]
         free_clusters_end = int(lvs['free_clusters'])
         # check that saved number of free clusters equals to current free clusters
@@ -1589,8 +1589,8 @@ class TestCases(object):
         fail_count += self.c.stop_nbd_disk(nbd_name0)
         fail_count += self.c.stop_nbd_disk(nbd_name1)
         # destroy thin provisioned lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev0['name'])
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev1['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev0['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev1['name'])
         # destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # destroy malloc bdev
@@ -1632,7 +1632,7 @@ class TestCases(object):
 
         fail_count += self.c.stop_nbd_disk(nbd_name)
         # destroy thin provisioned lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # destroy malloc bdev
@@ -1706,7 +1706,7 @@ class TestCases(object):
         if free_clusters_expected != free_clusters_resize2:
             fail_count += 1
 
-        self.c.destroy_lvol_bdev(uuid_bdev)
+        self.c.bdev_lvol_delete(uuid_bdev)
         self.c.destroy_lvol_store(uuid_store)
         self.c.delete_malloc_bdev(base_name)
 
@@ -1776,8 +1776,8 @@ class TestCases(object):
         fail_count += self.c.stop_nbd_disk(nbd_name0)
         fail_count += self.c.stop_nbd_disk(nbd_name1)
         # destroy thin provisioned lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev0['name'])
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev1['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev0['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev1['name'])
         # destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # destroy malloc bdev
@@ -1834,8 +1834,8 @@ class TestCases(object):
         fail_count += self.c.stop_nbd_disk(nbd_name0)
         fail_count += self.c.stop_nbd_disk(nbd_name1)
         # destroy thin provisioned lvol bdevs
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev0['name'])
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev1['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev0['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev1['name'])
         # destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # destroy malloc bdev
@@ -1934,7 +1934,7 @@ class TestCases(object):
             fail_count += self.c.check_get_bdevs_methods(uuid_bdev, size)
 
         for uuid_bdev in uuid_bdevs:
-            self.c.destroy_lvol_bdev(uuid_bdev)
+            self.c.bdev_lvol_delete(uuid_bdev)
 
         if self.c.destroy_lvol_store(uuid_store) != 0:
             fail_count += 1
@@ -2108,7 +2108,7 @@ class TestCases(object):
             return fail_count
 
         for uuid_bdev in uuid_bdevs:
-            self.c.destroy_lvol_bdev(uuid_bdev)
+            self.c.bdev_lvol_delete(uuid_bdev)
 
         if self.c.destroy_lvol_store(uuid_store_1M) != 0:
             fail_count += 1
@@ -2159,9 +2159,9 @@ class TestCases(object):
 
         fail_count += self.c.stop_nbd_disk(nbd_name0)
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # Destroy snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Delete malloc bdev
@@ -2232,11 +2232,11 @@ class TestCases(object):
         for nbd in nbd_name:
             fail_count += self.c.stop_nbd_disk(nbd)
         # Delete lvol bdevs
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev0['name'])
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev1['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev0['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev1['name'])
         # Delete snapshots
-        fail_count += self.c.destroy_lvol_bdev(self.lvs_name + "/" + snapshot_name0)
-        fail_count += self.c.destroy_lvol_bdev(self.lvs_name + "/" + snapshot_name1)
+        fail_count += self.c.bdev_lvol_delete(self.lvs_name + "/" + snapshot_name0)
+        fail_count += self.c.bdev_lvol_delete(self.lvs_name + "/" + snapshot_name1)
         # Destroy snapshot
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Delete malloc bdev
@@ -2292,9 +2292,9 @@ class TestCases(object):
         fail_count += thread.rv
         fail_count += self.c.stop_nbd_disk(nbd_name)
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # Delete snapshot
-        fail_count += self.c.destroy_lvol_bdev(self.lvs_name + "/" + snapshot_name)
+        fail_count += self.c.bdev_lvol_delete(self.lvs_name + "/" + snapshot_name)
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Delete malloc bdevs
@@ -2337,9 +2337,9 @@ class TestCases(object):
             print("ERROR: Creating snapshot of snapshot should fail")
             fail_count += 1
         # Delete lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # Destroy snapshot
-        fail_count += self.c.destroy_lvol_bdev(self.lvs_name + "/" + snapshot_name0)
+        fail_count += self.c.bdev_lvol_delete(self.lvs_name + "/" + snapshot_name0)
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Delete malloc bdev
@@ -2397,11 +2397,11 @@ class TestCases(object):
         clone_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + clone_name)
 
         # Delete lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # Destroy clone
-        fail_count += self.c.destroy_lvol_bdev(clone_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(clone_bdev['name'])
         # Delete snapshot
-        fail_count += self.c.destroy_lvol_bdev(self.lvs_name + "/" + snapshot_name)
+        fail_count += self.c.bdev_lvol_delete(self.lvs_name + "/" + snapshot_name)
         # Delete lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Destroy malloc bdev
@@ -2468,12 +2468,12 @@ class TestCases(object):
         for nbd in nbd_name:
             fail_count += self.c.stop_nbd_disk(nbd)
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # Destroy two clones
-        fail_count += self.c.destroy_lvol_bdev(lvol_clone0['name'])
-        fail_count += self.c.destroy_lvol_bdev(lvol_clone1['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_clone0['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_clone1['name'])
         # Delete snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Delete malloc
@@ -2553,16 +2553,16 @@ class TestCases(object):
             fail_count += 1
 
         # Destroy first clone and check if it is deleted from snapshot
-        fail_count += self.c.destroy_lvol_bdev(lvol_clone0['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_clone0['name'])
         snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name)
         if [clone_name1] != snapshot_bdev['driver_specific']['lvol']['clones']:
             fail_count += 1
 
         # Destroy second clone
-        fail_count += self.c.destroy_lvol_bdev(lvol_clone1['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_clone1['name'])
 
         # Delete snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -2635,7 +2635,7 @@ class TestCases(object):
             fail_count += 1
 
         # Delete snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
 
         # Check data consistency
         fail_count += self.c.start_nbd_disk(lvol_clone['name'], nbd_name)
@@ -2652,7 +2652,7 @@ class TestCases(object):
         self.c.stop_nbd_disk(nbd_name)
 
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -2719,10 +2719,10 @@ class TestCases(object):
             fail_count += 1
 
         # Destroy snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
 
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -2813,7 +2813,7 @@ class TestCases(object):
                                             fill_range * MEGABYTE, "read", pattern[i])
 
         # Delete second snapshot
-        ret_value = self.c.destroy_lvol_bdev(snapshot_bdev2['name'])
+        ret_value = self.c.bdev_lvol_delete(snapshot_bdev2['name'])
 
         # Check data consistency
         for i in range(0, 5):
@@ -2822,10 +2822,10 @@ class TestCases(object):
                                             fill_range * MEGABYTE, "read", pattern[i])
 
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
 
         # Destroy snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -2889,9 +2889,9 @@ class TestCases(object):
         fail_count += self.c.stop_nbd_disk(nbd_name0)
         fail_count += self.c.stop_nbd_disk(nbd_name1)
         # Destroy clone lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(clone_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(clone_bdev['name'])
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
         # Delete malloc bdev
@@ -2957,7 +2957,7 @@ class TestCases(object):
 
         # Delete snapshot - should succeed
         fail_count += self.c.stop_nbd_disk(nbd_name1)
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
 
         # Check data consistency
         lvol_bdev = self.c.get_lvol_bdev_with_name(bdev_name)
@@ -2968,7 +2968,7 @@ class TestCases(object):
 
         # Destroy lvol bdev
         fail_count += self.c.stop_nbd_disk(nbd_name0)
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -3071,7 +3071,7 @@ class TestCases(object):
         fail_count += self.c.stop_nbd_disk(nbd_name2)
 
         # Delete snapshot - should succeed
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev2['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev2['name'])
 
         # Check data consistency
         snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name)
@@ -3087,9 +3087,9 @@ class TestCases(object):
         fail_count += self.c.stop_nbd_disk(nbd_name0)
 
         # Destroy snapshot
-        fail_count += self.c.destroy_lvol_bdev(snapshot_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(snapshot_bdev['name'])
         # Destroy lvol bdev
-        fail_count += self.c.destroy_lvol_bdev(lvol_bdev['name'])
+        fail_count += self.c.bdev_lvol_delete(lvol_bdev['name'])
 
         # Destroy lvol store
         fail_count += self.c.destroy_lvol_store(uuid_store)
@@ -3175,7 +3175,7 @@ class TestCases(object):
 
         # Delete configuration using names after rename operation
         for bdev in new_bdev_aliases:
-            fail_count += self.c.destroy_lvol_bdev(bdev)
+            fail_count += self.c.bdev_lvol_delete(bdev)
         fail_count += self.c.destroy_lvol_store(new_lvs_name)
         fail_count += self.c.delete_malloc_bdev(base_name)
 
@@ -3293,7 +3293,7 @@ class TestCases(object):
 
         # Clean configuration
         for lvol_uuid in bdev_uuids_1 + bdev_uuids_2:
-            fail_count += self.c.destroy_lvol_bdev(lvol_uuid)
+            fail_count += self.c.bdev_lvol_delete(lvol_uuid)
         fail_count += self.c.destroy_lvol_store(lvs_uuid_1)
         fail_count += self.c.destroy_lvol_store(lvs_uuid_2)
         fail_count += self.c.delete_malloc_bdev(base_bdev_1)
@@ -3367,8 +3367,8 @@ class TestCases(object):
                                                      bdev_size,
                                                      "/".join([self.lvs_name, self.lbd_name + "1"]))
 
-        fail_count += self.c.destroy_lvol_bdev(bdev_uuid_1)
-        fail_count += self.c.destroy_lvol_bdev(bdev_uuid_2)
+        fail_count += self.c.bdev_lvol_delete(bdev_uuid_1)
+        fail_count += self.c.bdev_lvol_delete(bdev_uuid_2)
         fail_count += self.c.destroy_lvol_store(lvs_uuid)
         fail_count += self.c.delete_malloc_bdev(base_bdev)
 
diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh
index e6a8aacbd..d4acb10d7 100755
--- a/test/nvmf/host/fio.sh
+++ b/test/nvmf/host/fio.sh
@@ -70,9 +70,9 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 
 	sync
 	# Delete lvol_bdev and destroy lvol_store.
-	$rpc_py destroy_lvol_bdev lvs_n_0/lbd_nest_0
+	$rpc_py bdev_lvol_delete lvs_n_0/lbd_nest_0
 	$rpc_py destroy_lvol_store -l lvs_n_0
-	$rpc_py destroy_lvol_bdev lvs_0/lbd_0
+	$rpc_py bdev_lvol_delete lvs_0/lbd_0
 	$rpc_py destroy_lvol_store -l lvs_0
 	$rpc_py delete_nvme_controller Nvme0
 fi
diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh
index c4ed24aeb..4b0f2afe6 100755
--- a/test/nvmf/host/perf.sh
+++ b/test/nvmf/host/perf.sh
@@ -77,9 +77,9 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 
 		# Delete subsystems, lvol_bdev and destroy lvol_store.
 		$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
-		$rpc_py destroy_lvol_bdev "$lb_nested_guid"
+		$rpc_py bdev_lvol_delete "$lb_nested_guid"
 		$rpc_py destroy_lvol_store -l lvs_n_0
-		$rpc_py destroy_lvol_bdev "$lb_guid"
+		$rpc_py bdev_lvol_delete "$lb_guid"
 		$rpc_py destroy_lvol_store -l lvs_0
 	fi
 fi
diff --git a/test/nvmf/target/nvmf_lvol.sh b/test/nvmf/target/nvmf_lvol.sh
index 59e21cdab..2b4b3f2fe 100755
--- a/test/nvmf/target/nvmf_lvol.sh
+++ b/test/nvmf/target/nvmf_lvol.sh
@@ -59,7 +59,7 @@ wait $perf_pid
 
 # Clean up
 $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode0
-$rpc_py destroy_lvol_bdev $lvol
+$rpc_py bdev_lvol_delete $lvol
 $rpc_py destroy_lvol_store -u $lvs
 
 rm -f ./local-job*
diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh
index 322c3a6d0..9aab2721c 100755
--- a/test/vhost/fiotest/fio.sh
+++ b/test/vhost/fiotest/fio.sh
@@ -245,7 +245,7 @@ if ! $no_shutdown; then
 					$rpc_py remove_vhost_controller naa.$disk.${conf[0]}
 					if [[ $disk == "RaidBdev2" ]]; then
 						notice "Removing lvol bdev and lvol store"
-						$rpc_py destroy_lvol_bdev lvs_0/lbd_0
+						$rpc_py bdev_lvol_delete lvs_0/lbd_0
 						$rpc_py destroy_lvol_store -l lvs_0
 					fi
 				done
diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh
index 9dd5d73c4..d2b13afd3 100755
--- a/test/vhost/integrity/integrity_start.sh
+++ b/test/vhost/integrity/integrity_start.sh
@@ -28,7 +28,7 @@ function usage()
 function clean_lvol_cfg()
 {
 	notice "Removing lvol bdev and lvol store"
-	$rpc_py destroy_lvol_bdev lvol_store/lvol_bdev
+	$rpc_py bdev_lvol_delete lvol_store/lvol_bdev
 	$rpc_py destroy_lvol_store -l lvol_store
 }
 
diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh
index a7f68b91f..31b7c67c9 100755
--- a/test/vhost/lvol/lvol_test.sh
+++ b/test/vhost/lvol/lvol_test.sh
@@ -51,7 +51,7 @@ function clean_lvol_cfg()
 {
     notice "Removing nested lvol bdevs"
     for lvol_bdev in "${nest_lvol_bdevs[@]}"; do
-        $rpc_py destroy_lvol_bdev $lvol_bdev
+        $rpc_py bdev_lvol_delete $lvol_bdev
         notice "nested lvol bdev $lvol_bdev removed"
     done
 
@@ -63,7 +63,7 @@ function clean_lvol_cfg()
 
     notice "Removing lvol bdevs"
     for lvol_bdev in "${lvol_bdevs[@]}"; do
-        $rpc_py destroy_lvol_bdev $lvol_bdev
+        $rpc_py bdev_lvol_delete $lvol_bdev
         notice "lvol bdev $lvol_bdev removed"
     done
 
diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh
index 3fe8f89a9..cbfef5e22 100755
--- a/test/vhost/perf_bench/vhost_perf.sh
+++ b/test/vhost/perf_bench/vhost_perf.sh
@@ -72,7 +72,7 @@ function cleanup_lvol_cfg()
 {
 	notice "Removing lvol bdevs"
 	for lvol_bdev in "${lvol_bdevs[@]}"; do
-		$rpc_py destroy_lvol_bdev $lvol_bdev
+		$rpc_py bdev_lvol_delete $lvol_bdev
 		notice "lvol bdev $lvol_bdev removed"
 	done
 
diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh
index 061ba2316..9e7646257 100755
--- a/test/vhost/vhost_boot/vhost_boot.sh
+++ b/test/vhost/vhost_boot/vhost_boot.sh
@@ -19,7 +19,7 @@ function err_clean
 	vm_kill_all
 	$rpc_py remove_vhost_scsi_target naa.vhost_vm.$vm_no 0
 	$rpc_py remove_vhost_controller naa.vhost_vm.$vm_no
-	$rpc_py destroy_lvol_bdev $lvb_u
+	$rpc_py bdev_lvol_delete $lvb_u
 	$rpc_py destroy_lvol_store -u $lvs_u
 	vhost_kill 0
 	exit 1
@@ -117,7 +117,7 @@ vm_shutdown_all
 timing_enter clean_vhost
 $rpc_py remove_vhost_scsi_target naa.vhost_vm.$vm_no 0
 $rpc_py remove_vhost_controller naa.vhost_vm.$vm_no
-$rpc_py destroy_lvol_bdev $lvb_u
+$rpc_py bdev_lvol_delete $lvb_u
 $rpc_py destroy_lvol_store -u $lvs_u
 vhost_kill 0
 timing_exit clean_vhost