diff --git a/deployments/block-storage/infra/semihosted.cmake b/deployments/block-storage/infra/semihosted.cmake
index c58e7e5..ec10a0e 100644
--- a/deployments/block-storage/infra/semihosted.cmake
+++ b/deployments/block-storage/infra/semihosted.cmake
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2022-2023, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -21,9 +21,10 @@
 		"components/service/block_storage/factory/semihosting"
 		"components/service/block_storage/config/gpt"
 		"components/media/disk"
+		"components/media/volume"
 		"components/media/volume/index"
 		"components/media/volume/base_io_dev"
-		"components/media/volume/block_io_dev"
+		"components/media/volume/block_volume"
 		"components/common/crc32/native"
 )
 
diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
index f8ffe9f..32d4748 100644
--- a/deployments/component-test/component-test.cmake
+++ b/deployments/component-test/component-test.cmake
@@ -167,10 +167,11 @@
 		"components/media/disk/disk_images"
 		"components/media/disk/formatter"
 		"components/media/disk/test"
+		"components/media/volume"
 		"components/media/volume/index"
 		"components/media/volume/base_io_dev"
-		"components/media/volume/block_io_dev"
-		"components/media/volume/block_io_dev/test"
+		"components/media/volume/block_volume"
+		"components/media/volume/block_volume/test"
 		"protocols/rpc/common/protobuf"
 		"protocols/rpc/common/packed-c"
 		"protocols/service/crypto/packed-c"
diff --git a/deployments/libts/linux-pc/CMakeLists.txt b/deployments/libts/linux-pc/CMakeLists.txt
index ecc72ef..44b3b9a 100644
--- a/deployments/libts/linux-pc/CMakeLists.txt
+++ b/deployments/libts/linux-pc/CMakeLists.txt
@@ -117,9 +117,10 @@
 		"components/media/disk"
 		"components/media/disk/disk_images"
 		"components/media/disk/formatter"
+		"components/media/volume"
 		"components/media/volume/index"
 		"components/media/volume/base_io_dev"
-		"components/media/volume/block_io_dev"
+		"components/media/volume/block_volume"
 		"protocols/rpc/common/packed-c"
 		"protocols/service/crypto/packed-c"
 		"protocols/service/crypto/protobuf"