diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
index 9852ac2..1f5c38a 100644
--- a/deployments/component-test/component-test.cmake
+++ b/deployments/component-test/component-test.cmake
@@ -179,9 +179,9 @@
 		"components/service/test_runner/provider"
 		"components/service/test_runner/provider/serializer/packed-c"
 		"components/service/test_runner/provider/backend/null"
-		"components/service/smm_variable/provider"
-		"components/service/smm_variable/backend"
-		"components/service/smm_variable/backend/test"
+		"components/service/uefi/smm_variable/provider"
+		"components/service/uefi/smm_variable/backend"
+		"components/service/uefi/smm_variable/backend/test"
 		"components/media/disk"
 		"components/media/disk/disk_images"
 		"components/media/disk/formatter"
diff --git a/deployments/libts/linux-pc/CMakeLists.txt b/deployments/libts/linux-pc/CMakeLists.txt
index 32ee621..d3e2912 100644
--- a/deployments/libts/linux-pc/CMakeLists.txt
+++ b/deployments/libts/linux-pc/CMakeLists.txt
@@ -123,8 +123,8 @@
 		"components/service/test_runner/provider/serializer/packed-c"
 		"components/service/test_runner/provider/backend/mock"
 		"components/service/test_runner/provider/backend/simple_c"
-		"components/service/smm_variable/backend"
-		"components/service/smm_variable/provider"
+		"components/service/uefi/smm_variable/backend"
+		"components/service/uefi/smm_variable/provider"
 		"components/media/disk"
 		"components/media/disk/disk_images"
 		"components/media/disk/formatter"
diff --git a/deployments/smm-gateway/common/smm_gateway.c b/deployments/smm-gateway/common/smm_gateway.c
index 86269fa..329c883 100644
--- a/deployments/smm-gateway/common/smm_gateway.c
+++ b/deployments/smm-gateway/common/smm_gateway.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <stddef.h>
 #include <protocols/rpc/common/packed-c/encoding.h>
-#include <service/smm_variable/provider/smm_variable_provider.h>
+#include <service/uefi/smm_variable/provider/smm_variable_provider.h>
 #include <service/secure_storage/backend/secure_storage_client/secure_storage_client.h>
 #include <service/secure_storage/backend/mock_store/mock_store.h>
 #include <service_locator.h>
diff --git a/deployments/smm-gateway/config/linux-pc/CMakeLists.txt b/deployments/smm-gateway/config/linux-pc/CMakeLists.txt
index 9ee6e49..aaec898 100644
--- a/deployments/smm-gateway/config/linux-pc/CMakeLists.txt
+++ b/deployments/smm-gateway/config/linux-pc/CMakeLists.txt
@@ -52,4 +52,4 @@
 
 include(${TS_ROOT}/components/rpc/common/tests.cmake)
 include(${TS_ROOT}/components/rpc/mm_communicate/endpoint/sp/tests.cmake)
-include(${TS_ROOT}/components/service/smm_variable/frontend/mm_communicate/tests.cmake)
+include(${TS_ROOT}/components/service/uefi/smm_variable/frontend/mm_communicate/tests.cmake)
diff --git a/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c b/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c
index 65f5d01..c87e73e 100644
--- a/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c
+++ b/deployments/smm-gateway/env/commonsp/smm_gateway_sp.c
@@ -8,7 +8,7 @@
 #include "config/interface/config_store.h"
 #include "config/loader/sp/sp_config_loader.h"
 #include "components/rpc/mm_communicate/endpoint/sp/mm_communicate_call_ep.h"
-#include "components/service/smm_variable/frontend/mm_communicate/smm_variable_mm_service.h"
+#include "components/service/uefi/smm_variable/frontend/mm_communicate/smm_variable_mm_service.h"
 #include "platform/interface/memory_region.h"
 #include "protocols/common/mm/mm_smc.h"
 #include "ffa_api.h"
diff --git a/deployments/smm-gateway/env/commonsp/smm_gateway_sp.cmake b/deployments/smm-gateway/env/commonsp/smm_gateway_sp.cmake
index 4976bdf..0dc7549 100644
--- a/deployments/smm-gateway/env/commonsp/smm_gateway_sp.cmake
+++ b/deployments/smm-gateway/env/commonsp/smm_gateway_sp.cmake
@@ -26,7 +26,7 @@
 		"components/rpc/mm_communicate/endpoint/sp"
 		"components/service/locator/sp"
 		"components/service/locator/sp/ffa"
-		"components/service/smm_variable/frontend/mm_communicate"
+		"components/service/uefi/smm_variable/frontend/mm_communicate"
 )
 
 target_sources(smm-gateway PRIVATE
diff --git a/deployments/smm-gateway/smm-gateway.cmake b/deployments/smm-gateway/smm-gateway.cmake
index e3eca34..7921d59 100644
--- a/deployments/smm-gateway/smm-gateway.cmake
+++ b/deployments/smm-gateway/smm-gateway.cmake
@@ -12,8 +12,8 @@
 		"components/rpc/common/interface"
 		"components/service/common/include"
 		"components/service/common/provider"
-		"components/service/smm_variable/backend"
-		"components/service/smm_variable/provider"
+		"components/service/uefi/smm_variable/backend"
+		"components/service/uefi/smm_variable/provider"
 		"components/service/secure_storage/include"
 		"components/service/secure_storage/backend/mock_store"
 		"protocols/rpc/common/packed-c"
diff --git a/deployments/ts-service-test/linux-pc/CMakeLists.txt b/deployments/ts-service-test/linux-pc/CMakeLists.txt
index 51b7ccb..ed4c363 100644
--- a/deployments/ts-service-test/linux-pc/CMakeLists.txt
+++ b/deployments/ts-service-test/linux-pc/CMakeLists.txt
@@ -88,8 +88,8 @@
 		"components/common/crc32"
 		"components/service/test_runner/client/cpp"
 		"components/service/test_runner/test/service"
-		"components/service/smm_variable/client/cpp"
-		"components/service/smm_variable/test/service"
+		"components/service/uefi/smm_variable/client/cpp"
+		"components/service/uefi/smm_variable/test/service"
 		"components/service/block_storage/block_store"
 		"components/service/block_storage/block_store/client"
 		"components/service/block_storage/block_store/partitioned"
diff --git a/deployments/uefi-test/uefi-test.cmake b/deployments/uefi-test/uefi-test.cmake
index 2f47891..841127d 100644
--- a/deployments/uefi-test/uefi-test.cmake
+++ b/deployments/uefi-test/uefi-test.cmake
@@ -28,8 +28,8 @@
 	TARGET "uefi-test"
 	BASE_DIR ${TS_ROOT}
 	COMPONENTS
-		"components/service/smm_variable/client/cpp"
-		"components/service/smm_variable/test/service"
+		"components/service/uefi/smm_variable/client/cpp"
+		"components/service/uefi/smm_variable/test/service"
 )
 
 #-------------------------------------------------------------------------------